diff options
Diffstat (limited to 'src')
719 files changed, 19392 insertions, 7810 deletions
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index cb8b888a6a..068764c726 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -1,5 +1,5 @@ CONFIG(release, debug|release):DEFINES *= NDEBUG -DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE +DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE SQLITE_ENABLE_JSON1 !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS qtConfig(posix_fallocate): DEFINES += HAVE_POSIX_FALLOCATE=1 winrt { diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro index bda15a0a00..ac6fc79968 100644 --- a/src/android/jar/jar.pro +++ b/src/android/jar/jar.pro @@ -2,7 +2,6 @@ TARGET = QtAndroid CONFIG += java DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar -API_VERSION = android-16 PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/ diff --git a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java index 3f74383a82..e6de354ac4 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java +++ b/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java @@ -89,8 +89,6 @@ import android.view.inputmethod.EditorInfo; public class ExtractStyle { - native static int[] extractChunkInfo(byte[] chunkData); - native static int[] extractNativeChunkInfo(int nativeChunk); native static int[] extractChunkInfo20(byte[] chunkData); native static int[] extractNativeChunkInfo20(long nativeChunk); @@ -345,10 +343,7 @@ public class ExtractStyle { } public void drawPatch(Bitmap bmp, byte[] chunks, RectF dst, Paint paint) { - if (Build.VERSION.SDK_INT > 19) - chunkData = extractChunkInfo20(chunks); - else - chunkData = extractChunkInfo(chunks); + chunkData = extractChunkInfo20(chunks); } } @@ -698,10 +693,6 @@ public class ExtractStyle { json.put("thicknessRatio",gradientStateClass.getField("mThicknessRatio").getFloat(obj)); json.put("innerRadius",gradientStateClass.getField("mInnerRadius").getInt(obj)); json.put("thickness",gradientStateClass.getField("mThickness").getInt(obj)); - if (Build.VERSION.SDK_INT < 20) { - json.put("solidColor",gradientStateClass.getField("mSolidColor").getInt(obj)); - json.put("strokeColor",gradientStateClass.getField("mStrokeColor").getInt(obj)); - } } catch (Exception e) { e.printStackTrace(); } @@ -802,14 +793,7 @@ public class ExtractStyle { Object state = getAccessibleField(NinePatchDrawable.class, "mNinePatchState").get(d); np = (NinePatch) getAccessibleField(state.getClass(), "mNinePatch").get(state); } - if (Build.VERSION.SDK_INT < 19) - return getJsonChunkInfo(extractChunkInfo((byte[]) getAccessibleField(np.getClass(), "mChunk").get(np))); - else - { - if (Build.VERSION.SDK_INT > 19) - return getJsonChunkInfo(extractNativeChunkInfo20(getAccessibleField(np.getClass(), "mNativeChunk").getLong(np))); - return getJsonChunkInfo(extractNativeChunkInfo(getAccessibleField(np.getClass(), "mNativeChunk").getInt(np))); - } + return getJsonChunkInfo(extractNativeChunkInfo20(getAccessibleField(np.getClass(), "mNativeChunk").getLong(np))); } class DrawableCache @@ -1016,16 +1000,12 @@ public class ExtractStyle { json.put("gravity", bitmapDrawable.getGravity()); json.put("tileModeX", bitmapDrawable.getTileModeX()); json.put("tileModeY", bitmapDrawable.getTileModeY()); - if (Build.VERSION.SDK_INT >= 18) { - json.put("antialias", (Boolean) BitmapDrawable.class.getMethod("hasAntiAlias").invoke(bitmapDrawable)); - json.put("mipMap", (Boolean) BitmapDrawable.class.getMethod("hasMipMap").invoke(bitmapDrawable)); - } - if (Build.VERSION.SDK_INT >= 21) { - json.put("tintMode", (PorterDuff.Mode) BitmapDrawable.class.getMethod("getTintMode").invoke(bitmapDrawable)); - ColorStateList tintList = (ColorStateList) BitmapDrawable.class.getMethod("getTint").invoke(bitmapDrawable); - if (tintList != null) - json.put("tintList", getColorStateList(tintList)); - } + json.put("antialias", (Boolean) BitmapDrawable.class.getMethod("hasAntiAlias").invoke(bitmapDrawable)); + json.put("mipMap", (Boolean) BitmapDrawable.class.getMethod("hasMipMap").invoke(bitmapDrawable)); + json.put("tintMode", (PorterDuff.Mode) BitmapDrawable.class.getMethod("getTintMode").invoke(bitmapDrawable)); + ColorStateList tintList = (ColorStateList) BitmapDrawable.class.getMethod("getTint").invoke(bitmapDrawable); + if (tintList != null) + json.put("tintList", getColorStateList(tintList)); } catch (Exception e) { e.printStackTrace(); } @@ -1758,10 +1738,8 @@ public class ExtractStyle { json.put("Switch_switchPadding", a.getDimensionPixelSize(getField(styleableClass, "Switch_switchPadding"), 0)); json.put("Switch_thumbTextPadding", a.getDimensionPixelSize(getField(styleableClass, "Switch_thumbTextPadding"), 0)); - if (Build.VERSION.SDK_INT >= 21) { - json.put("Switch_showText", a.getBoolean(getField(styleableClass, "Switch_showText"), true)); - json.put("Switch_splitTrack", a.getBoolean(getField(styleableClass, "Switch_splitTrack"), false)); - } + json.put("Switch_showText", a.getBoolean(getField(styleableClass, "Switch_showText"), true)); + json.put("Switch_splitTrack", a.getBoolean(getField(styleableClass, "Switch_splitTrack"), false)); a.recycle(); jsonWriter.name(styleName).value(json); diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 02033859e9..4485ed6338 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -161,15 +161,13 @@ public class QtActivityDelegate m_activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); m_activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); try { - if (Build.VERSION.SDK_INT >= 19) { - int flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; - flags |= View.SYSTEM_UI_FLAG_LAYOUT_STABLE; - flags |= View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION; - flags |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; - flags |= View.SYSTEM_UI_FLAG_FULLSCREEN; - flags |= View.class.getDeclaredField("SYSTEM_UI_FLAG_IMMERSIVE_STICKY").getInt(null); - m_activity.getWindow().getDecorView().setSystemUiVisibility(flags | View.INVISIBLE); - } + int flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; + flags |= View.SYSTEM_UI_FLAG_LAYOUT_STABLE; + flags |= View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION; + flags |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; + flags |= View.SYSTEM_UI_FLAG_FULLSCREEN; + flags |= View.class.getDeclaredField("SYSTEM_UI_FLAG_IMMERSIVE_STICKY").getInt(null); + m_activity.getWindow().getDecorView().setSystemUiVisibility(flags | View.INVISIBLE); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java index 759daf4393..6beb5e3161 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java @@ -132,7 +132,7 @@ public class QtActivityLoader extends QtLoader { return; } - if (Build.VERSION.SDK_INT < 16) { + if (Build.VERSION.SDK_INT < 21) { // fatal error, show the error and quit AlertDialog errorDialog = new AlertDialog.Builder(m_activity).create(); if (m_contextInfo.metaData.containsKey("android.app.unsupported_android_version")) diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml index cb97002560..f4b99e0895 100644 --- a/src/android/templates/AndroidManifest.xml +++ b/src/android/templates/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='utf-8'?> <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto"> - <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. Remove the comment if you do not require these default permissions. --> diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 9dd81b2ecd..9d7a256191 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -773,6 +773,7 @@ QAnimationDriver::~QAnimationDriver() } +#if QT_DEPRECATED_SINCE(5, 13) /*! Sets the time at which an animation driver should start at. @@ -799,6 +800,7 @@ qint64 QAnimationDriver::startTime() const { return 0; } +#endif /*! diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 25b5726d56..7f2577d7f7 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -147,9 +147,10 @@ public: virtual qint64 elapsed() const; - // ### Qt6: Remove these two functions - void setStartTime(qint64 startTime); - qint64 startTime() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED void setStartTime(qint64 startTime); + QT_DEPRECATED qint64 startTime() const; +#endif Q_SIGNALS: void started(); diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 28c03553c5..271be248ec 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -303,6 +303,6 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, } } -#include "moc_qpropertyanimation.cpp" - QT_END_NAMESPACE + +#include "moc_qpropertyanimation.cpp" diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index 466c575c3e..804e0b2935 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -505,9 +505,9 @@ QTextCodec::~QTextCodec() globalData->allCodecs.removeOne(this); - auto it = globalData->codecCache.cbegin(); + auto it = globalData->codecCache.begin(); - while (it != globalData->codecCache.cend()) { + while (it != globalData->codecCache.end()) { if (it.value() == this) it = globalData->codecCache.erase(it); else @@ -695,11 +695,9 @@ void QTextCodec::setCodecForLocale(QTextCodec *c) \threadsafe Returns a pointer to the codec most suitable for this locale. - On Windows, the codec will be based on a system locale. On Unix - systems, the codec will might fall back to using the \e iconv - library if no builtin codec for the locale can be found. - - Note that in these cases the codec's name will be "System". + The codec will be retrieved from ICU where that backend is in use, otherwise + it may be obtained from an OS-specific API. In the latter case, the codec's + name may be "System". */ QTextCodec* QTextCodec::codecForLocale() diff --git a/src/corelib/configure.json b/src/corelib/configure.json index a22a7459bd..948aa0829b 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -876,6 +876,20 @@ "condition": "features.proxymodel", "output": [ "publicFeature", "feature" ] }, + "transposeproxymodel": { + "label": "QTransposeProxyModel", + "purpose": "Provides a proxy to swap rows and columns of a model.", + "section": "ItemViews", + "condition": "features.proxymodel", + "output": [ "publicFeature", "feature" ] + }, + "concatenatetablesproxymodel": { + "label": "QConcatenateTablesProxyModel", + "purpose": "Supports concatenating source models.", + "section": "ItemViews", + "condition": "features.proxymodel", + "output": [ "publicFeature", "feature" ] + }, "stringlistmodel": { "label": "QStringListModel", "purpose": "Provides a model that supplies strings to views.", diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 181780c475..4b758532e6 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -44,6 +44,7 @@ include(codecs/codecs.pri) include(serialization/serialization.pri) include(statemachine/statemachine.pri) include(mimetypes/mimetypes.pri) +include(platform/platform.pri) win32 { LIBS_PRIVATE += -lws2_32 diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp index cc3f689710..0e746cd6e6 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp @@ -146,7 +146,7 @@ list.move(1, 4); //! [12] QList<QString> list; list << "A" << "B" << "C" << "D" << "E" << "F"; -list.swap(1, 4); +list.swapItemsAt(1, 4); // list: ["A", "E", "C", "D", "B", "F"] //! [12] diff --git a/src/corelib/doc/snippets/resource-system/mainwindow.cpp b/src/corelib/doc/snippets/resource-system/mainwindow.cpp index bbeeec64ac..86e93aaa62 100644 --- a/src/corelib/doc/snippets/resource-system/mainwindow.cpp +++ b/src/corelib/doc/snippets/resource-system/mainwindow.cpp @@ -338,11 +338,11 @@ void MainWindow::loadFile(const QString &fileName) QTextStream in(&file); #ifndef QT_NO_CURSOR - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); #endif textEdit->setPlainText(in.readAll()); #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif setCurrentFile(fileName); @@ -365,11 +365,11 @@ bool MainWindow::saveFile(const QString &fileName) QTextStream out(&file); #ifndef QT_NO_CURSOR - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); #endif out << textEdit->toPlainText(); #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif setCurrentFile(fileName); diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc index a1c32bb007..e6c95129db 100644 --- a/src/corelib/doc/src/containers.qdoc +++ b/src/corelib/doc/src/containers.qdoc @@ -171,8 +171,9 @@ The values stored in the various containers can be of any \e{assignable data type}. To qualify, a type must provide a - default constructor, a copy constructor, and an assignment - operator. This covers most data types you are likely to want to + copy constructor, and an assignment operator. For some + operations a default constructor is also required. This + covers most data types you are likely to want to store in a container, including basic types such as \c int and \c double, pointer types, and Qt data types such as QString, QDate, and QTime, but it doesn't cover QObject or any QObject subclass diff --git a/src/corelib/doc/src/objectmodel/metaobjects.qdoc b/src/corelib/doc/src/objectmodel/metaobjects.qdoc index 5b3d8f9863..53b34fe120 100644 --- a/src/corelib/doc/src/objectmodel/metaobjects.qdoc +++ b/src/corelib/doc/src/objectmodel/metaobjects.qdoc @@ -86,7 +86,7 @@ that it doesn't require RTTI support and it works across dynamic library boundaries. It attempts to cast its argument to the pointer type specified in angle-brackets, returning a non-zero pointer if the - object is of the correct type (determined at run-time), or 0 + object is of the correct type (determined at run-time), or \nullptr if the object's type is incompatible. For example, let's assume \c MyWidget inherits from QWidget and diff --git a/src/corelib/doc/src/resource-system.qdoc b/src/corelib/doc/src/resource-system.qdoc index 9b6b613f79..69ec5e556b 100644 --- a/src/corelib/doc/src/resource-system.qdoc +++ b/src/corelib/doc/src/resource-system.qdoc @@ -100,6 +100,9 @@ See the QLocale documentation for a description of the format to use for locale strings. + See QFileSelector for an additional mechanism to select locale-specific + resources, in addition to the ability to select OS-specific and other + features. \section2 External Binary Resources @@ -143,24 +146,70 @@ \section1 Compression - Resources are compressed by default (in the \c ZIP format). It is - possible to turn off compression. This can be useful if your - resources already contain a compressed format, such as \c .png - files. You do this by giving the \c {-no-compress} command line - argument. + \c rcc attempts to compress the content to optimize disk space usage in the + final binaries. By default, it will perform a heuristic check to determine + whether compressing is worth it and will store the content uncompressed if + it fails to sufficiently compress. To control the threshold, you can use + the \c {-threshold} option, which tells \c rcc the percentage of the + original file size that must be gained for it to store the file in + compressed form. + + \code + rcc -threshold 25 myresources.qrc + \endcode + + The default value is "70", indicating that the compressed file must be 70% + smaller than the original (no more than 30% of the original file size). + + It is possible to turn off compression, if desired. This can be useful if + your resources already contain a compressed format, such as \c .png files, + and you do not want to incur the CPU cost at build time to confirm that it + can't be compressed. Another reason is if disk usage is not a problem and + the application would prefer to keep the content as clean memory pages at + runtime. You do this by giving the \c {-no-compress} command line argument. \code rcc -no-compress myresources.qrc \endcode - \c rcc also gives you some control over the compression. You can - specify the compression level and the threshold level to consider - while compressing files, for example: + \c rcc also gives you some control over the compression level and + compression algorithm, for example: \code - rcc -compress 2 -threshold 3 myresources.qrc + rcc -compress 2 -compress-algo zlib myresources.qrc \endcode + \c rcc supports the following compression algorithms and compression + levels: + + \list + \li \c{best}: use the best algorithm among the ones below, at its highest + compression level, to achieve the most compression at the expense of + using a lot of CPU time during compilation. This value is useful in the + XML file to indicate a file should be most compressed, regardless of + which algorithms \c rcc supports. + + \li \c{zstd}: use the \l{Zstandard}{https://zstd.net} library to compress + contents. Valid compression levels range from 1 to 19, 1 is least + compression (least CPU time) and 19 is the most compression (most CPU + time). The default level is 14. A special value of 0 tells the \c{zstd} + library to choose an implementation-defined default. + + \li \c{zlib}: use the \l{zlib}{https://zlib.net} library to compress + contents. Valid compression levels range from 1 to 9, with 1the least + compression (least CPU time) and 9 the most compression (most CPU time). + The special value 0 means "no compression" and should not be used. The + default is implementation-defined, but usually is level 6. + + \li \c{none}: no compression. This is the same as the \c{-no-compress} + option. + \endlist + + Support for both Zstandard and zlib are optional. If a given library was + not detected at compile time, attempting to pass \c {-compress-algo} for + that library will result in an error. The default compression algorithm is + \c zstd if it is enabled, \c zlib if not. + \section1 Using Resources in the Application In the application, resource paths can be used in most places diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index dfcc3c9c7f..10458e41d7 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -122,6 +122,11 @@ #define QT_NO_TRANSLATION #define QT_FEATURE_translation -1 +// rcc.pro will DEFINES+= this +#ifndef QT_FEATURE_zstd +#define QT_FEATURE_zstd -1 +#endif + #ifdef QT_BUILD_QMAKE #define QT_FEATURE_commandlineparser -1 #define QT_NO_COMPRESS diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h index 3e50ad8467..42cb1357f1 100644 --- a/src/corelib/global/qfloat16.h +++ b/src/corelib/global/qfloat16.h @@ -67,11 +67,9 @@ QT_BEGIN_NAMESPACE class qfloat16 { public: -#ifndef Q_QDOC Q_DECL_CONSTEXPR inline qfloat16() Q_DECL_NOTHROW : b16(0) { } inline qfloat16(float f) Q_DECL_NOTHROW; inline operator float() const Q_DECL_NOTHROW; -#endif private: quint16 b16; diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 8d80a32ad5..7879109930 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -525,6 +525,31 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value)); made private. In that case, no error would be reported, but your application would probably crash when you called a member function of \c{w}. + + \sa Q_DISABLE_COPY_MOVE, Q_DISABLE_MOVE +*/ + +/*! + \macro Q_DISABLE_MOVE(Class) + \relates QObject + + Disables the use of move constructors and move assignment operators + for the given \a Class. + + \sa Q_DISABLE_COPY, Q_DISABLE_COPY_MOVE + \since 5.13 +*/ + +/*! + \macro Q_DISABLE_COPY_MOVE(Class) + \relates QObject + + A convenience macro that disables the use of copy constructors, assignment + operators, move constructors and move assignment operators for the given + \a Class, combining Q_DISABLE_COPY and Q_DISABLE_MOVE. + + \sa Q_DISABLE_COPY, Q_DISABLE_MOVE + \since 5.13 */ /*! @@ -1954,11 +1979,11 @@ bool qSharedBuild() Q_DECL_NOTHROW a specified version of Qt or any earlier version. The default version number is 5.0, meaning that functions deprecated in or before Qt 5.0 will not be included. - Examples: - When using a future release of Qt 5, set QT_DISABLE_DEPRECATED_BEFORE=0x050100 to - disable functions deprecated in Qt 5.1 and earlier. In any release, set - QT_DISABLE_DEPRECATED_BEFORE=0x000000 to enable any functions, including the ones - deprecated in Qt 5.0 + For instance, when using a future release of Qt 5, set + \c{QT_DISABLE_DEPRECATED_BEFORE=0x050100} to disable functions deprecated in + Qt 5.1 and earlier. In any release, set + \c{QT_DISABLE_DEPRECATED_BEFORE=0x000000} to enable all functions, including + the ones deprecated in Qt 5.0. \sa QT_DEPRECATED_WARNINGS */ @@ -1968,12 +1993,24 @@ bool qSharedBuild() Q_DECL_NOTHROW \macro QT_DEPRECATED_WARNINGS \relates <QtGlobal> - If this macro is defined, the compiler will generate warnings if API declared as + Since Qt 5.13, this macro has no effect. In Qt 5.12 and before, if this macro + is defined, the compiler will generate warnings if any API declared as deprecated by Qt is used. - \sa QT_DISABLE_DEPRECATED_BEFORE + \sa QT_DISABLE_DEPRECATED_BEFORE, QT_NO_DEPRECATED_WARNINGS */ +/*! + \macro QT_NO_DEPRECATED_WARNINGS + \relates <QtGlobal> + \since 5.13 + + This macro can be used to suppress deprecation warnings that would otherwise + be generated when using deprecated APIs. + + \sa QT_DISABLE_DEPRECATED_BEFORE +*/ + #if defined(QT_BUILD_QMAKE) // needed to bootstrap qmake static const unsigned int qt_one = 1; @@ -2144,11 +2181,20 @@ struct QUnixOSVersion static QString unquote(const char *begin, const char *end) { + // man os-release says: + // Variable assignment values must be enclosed in double + // or single quotes if they include spaces, semicolons or + // other special characters outside of A–Z, a–z, 0–9. Shell + // special characters ("$", quotes, backslash, backtick) + // must be escaped with backslashes, following shell style. + // All strings should be in UTF-8 format, and non-printable + // characters should not be used. It is not supported to + // concatenate multiple individually quoted strings. if (*begin == '"') { Q_ASSERT(end[-1] == '"'); - return QString::fromLatin1(begin + 1, end - begin - 2); + return QString::fromUtf8(begin + 1, end - begin - 2); } - return QString::fromLatin1(begin, end - begin); + return QString::fromUtf8(begin, end - begin); } static QByteArray getEtcFileContent(const char *filename) { @@ -3245,6 +3291,34 @@ void *qMemSet(void *dest, int c, size_t n) { return memset(dest, c, n); } // add thread-safety for the Qt wrappers. static QBasicMutex environmentMutex; +/* + Wraps tzset(), which accesses the environment, so should only be called while + we hold the lock on the environment mutex. +*/ +void qTzSet() +{ + QMutexLocker locker(&environmentMutex); +#if defined(Q_OS_WIN) + _tzset(); +#else + tzset(); +#endif // Q_OS_WIN +} + +/* + Wrap mktime(), which is specified to behave as if it called tzset(), hence + shares its implicit environment-dependence. +*/ +time_t qMkTime(struct tm *when) +{ + QMutexLocker locker(&environmentMutex); + return mktime(when); +} + +// Also specified to behave as if they call tzset(): +// localtime() -- but not localtime_r(), which we use when threaded +// strftime() -- not used (except in tests) + /*! \relates <QtGlobal> \threadsafe @@ -4043,6 +4117,13 @@ bool qunsetenv(const char *varName) Example of a movable type: \snippet code/src_corelib_global_qglobal.cpp 39 + + Qt will try to detect the class of a type using std::is_trivial or + std::is_trivially_copyable. Use this macro to tune the behavior. + For instance many types would be candidates for Q_MOVABLE_TYPE despite + not being trivially-copyable. For binary compatibility reasons, QList + optimizations are only enabled if there is an explicit + Q_DECLARE_TYPEINFO even for trivially-copyable types. */ /*! diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index ccab228804..223ebbcabe 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -287,7 +287,7 @@ typedef double qreal; # undef QT_DEPRECATED_X # undef QT_DEPRECATED_VARIABLE # undef QT_DEPRECATED_CONSTRUCTOR -#elif defined(QT_DEPRECATED_WARNINGS) +#elif !defined(QT_NO_DEPRECATED_WARNINGS) # undef QT_DEPRECATED # define QT_DEPRECATED Q_DECL_DEPRECATED # undef QT_DEPRECATED_X @@ -372,6 +372,14 @@ typedef double qreal; Class(const Class &) Q_DECL_EQ_DELETE;\ Class &operator=(const Class &) Q_DECL_EQ_DELETE; +#define Q_DISABLE_MOVE(Class) \ + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; + +#define Q_DISABLE_COPY_MOVE(Class) \ + Q_DISABLE_COPY(Class) \ + Q_DISABLE_MOVE(Class) + /* No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols for Qt's internal unit tests. If you want slower loading times and more @@ -591,11 +599,11 @@ Q_DECL_CONSTEXPR inline qint64 qRound64(float d) { return d >= 0.0f ? qint64(d + 0.5f) : qint64(d - float(qint64(d-1)) + 0.5f) + qint64(d-1); } template <typename T> -Q_DECL_CONSTEXPR inline const T &qMin(const T &a, const T &b) { return (a < b) ? a : b; } +constexpr inline const T &qMin(const T &a, const T &b) { return (a < b) ? a : b; } template <typename T> -Q_DECL_CONSTEXPR inline const T &qMax(const T &a, const T &b) { return (a < b) ? b : a; } +constexpr inline const T &qMax(const T &a, const T &b) { return (a < b) ? b : a; } template <typename T> -Q_DECL_CONSTEXPR inline const T &qBound(const T &min, const T &val, const T &max) +constexpr inline const T &qBound(const T &min, const T &val, const T &max) { return qMax(min, qMin(max, val)); } #ifndef Q_FORWARD_DECLARE_OBJC_CLASS @@ -1005,6 +1013,15 @@ QForeachContainer<typename std::decay<T>::type> qMakeForeachContainer(T &&t) } } + +#if __cplusplus >= 201703L +// Use C++17 if statement with initializer. User's code ends up in a else so +// scoping of different ifs is not broken +#define Q_FOREACH(variable, container) \ +for (auto _container_ = QtPrivate::qMakeForeachContainer(container); \ + _container_.i != _container_.e; ++_container_.i) \ + if (variable = *_container_.i; false) {} else +#else // Explanation of the control word: // - it's initialized to 1 // - that means both the inner and outer loops start @@ -1019,7 +1036,7 @@ for (auto _container_ = QtPrivate::qMakeForeachContainer(container); \ _container_.control && _container_.i != _container_.e; \ ++_container_.i, _container_.control ^= 1) \ for (variable = *_container_.i; _container_.control; _container_.control = 0) - +#endif #endif // QT_NO_FOREACH #define Q_FOREVER for(;;) @@ -1192,9 +1209,6 @@ namespace QtPrivate { //like std::enable_if template <bool B, typename T = void> struct QEnableIf; template <typename T> struct QEnableIf<true, T> { typedef T Type; }; - -template <bool B, typename T, typename F> struct QConditional { typedef T Type; }; -template <typename T, typename F> struct QConditional<false, T, F> { typedef F Type; }; } QT_END_NAMESPACE diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h index 0f092e9006..d52f6268e4 100644 --- a/src/corelib/global/qglobal_p.h +++ b/src/corelib/global/qglobal_p.h @@ -61,6 +61,16 @@ #endif #if defined(__cplusplus) +#include <time.h> + +QT_BEGIN_NAMESPACE + +// These behave as if they consult the environment, so need to share its locking: +Q_CORE_EXPORT void qTzSet(); +Q_CORE_EXPORT time_t qMkTime(struct tm *when); + +QT_END_NAMESPACE + #if !QT_HAS_BUILTIN(__builtin_available) #include <initializer_list> #include <QtCore/qoperatingsystemversion.h> diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index 16e01183bd..dded09999b 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -153,9 +153,9 @@ private: #endif #ifdef QT_MESSAGELOGCONTEXT - #define QT_MESSAGELOG_FILE __FILE__ + #define QT_MESSAGELOG_FILE static_cast<const char *>(__FILE__) #define QT_MESSAGELOG_LINE __LINE__ - #define QT_MESSAGELOG_FUNC Q_FUNC_INFO + #define QT_MESSAGELOG_FUNC static_cast<const char *>(Q_FUNC_INFO) #else #define QT_MESSAGELOG_FILE nullptr #define QT_MESSAGELOG_LINE 0 diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index dec2c44637..41b94bf15a 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -516,7 +516,7 @@ public: AA_SetPalette = 19, AA_EnableHighDpiScaling = 20, AA_DisableHighDpiScaling = 21, - AA_UseStyleSheetPropagationInWidgetStyles = 22, // ### Qt 6: remove me + AA_UseStyleSheetPropagationInWidgetStyles = 22, AA_DontUseNativeDialogs = 23, AA_SynthesizeMouseForUnhandledTabletEvents = 24, AA_CompressHighFrequencyEvents = 25, @@ -1504,9 +1504,11 @@ public: // Metadata FontRole = 6, TextAlignmentRole = 7, +#if QT_DEPRECATED_SINCE(5, 13) BackgroundColorRole = 8, - BackgroundRole = 8, TextColorRole = 9, +#endif + BackgroundRole = 8, ForegroundRole = 9, CheckStateRole = 10, // Accessibility diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index 4f79c48c51..567ff5c08e 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -49,6 +49,26 @@ QT_BEGIN_NAMESPACE QTypeInfo - type trait functionality */ +template <typename T> +static constexpr bool qIsRelocatable() +{ +#if defined(Q_CC_CLANG) || !defined(Q_CC_GNU) || Q_CC_GNU >= 501 + return std::is_trivially_copyable<T>::value && std::is_trivially_destructible<T>::value; +#else + return std::is_enum<T>::value || std::is_integral<T>::value; +#endif +} + +template <typename T> +static constexpr bool qIsTrivial() +{ +#if defined(Q_CC_CLANG) || !defined(Q_CC_GNU) || Q_CC_GNU >= 501 + return std::is_trivial<T>::value; +#else + return std::is_enum<T>::value || std::is_integral<T>::value; +#endif +} + /* The catch-all template. */ @@ -61,9 +81,9 @@ public: isSpecialized = std::is_enum<T>::value, // don't require every enum to be marked manually isPointer = false, isIntegral = std::is_integral<T>::value, - isComplex = !isIntegral && !std::is_enum<T>::value, + isComplex = !qIsTrivial<T>(), isStatic = true, - isRelocatable = std::is_enum<T>::value, + isRelocatable = qIsRelocatable<T>(), isLarge = (sizeof(T)>sizeof(void*)), isDummy = false, //### Qt6: remove sizeOf = sizeof(T) @@ -248,9 +268,9 @@ class QTypeInfo<TYPE > \ public: \ enum { \ isSpecialized = true, \ - isComplex = (((FLAGS) & Q_PRIMITIVE_TYPE) == 0), \ + isComplex = (((FLAGS) & Q_PRIMITIVE_TYPE) == 0) && !qIsTrivial<TYPE>(), \ isStatic = (((FLAGS) & (Q_MOVABLE_TYPE | Q_PRIMITIVE_TYPE)) == 0), \ - isRelocatable = !isStatic || ((FLAGS) & Q_RELOCATABLE_TYPE), \ + isRelocatable = !isStatic || ((FLAGS) & Q_RELOCATABLE_TYPE) || qIsRelocatable<TYPE>(), \ isLarge = (sizeof(TYPE)>sizeof(void*)), \ isPointer = false, \ isIntegral = std::is_integral< TYPE >::value, \ diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 086d642c26..9b6044752f 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -79,6 +79,8 @@ SOURCES += \ io/qloggingcategory.cpp \ io/qloggingregistry.cpp +qtConfig(zstd): QMAKE_USE_PRIVATE += zstd + qtConfig(filesystemwatcher) { HEADERS += \ io/qfilesystemwatcher.h \ diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 00c415b521..4a7fe7bff5 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -208,7 +208,7 @@ protected: QScopedPointer<QAbstractFileEnginePrivate> d_ptr; private: Q_DECLARE_PRIVATE(QAbstractFileEngine) - Q_DISABLE_COPY(QAbstractFileEngine) + Q_DISABLE_COPY_MOVE(QAbstractFileEngine) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractFileEngine::FileFlags) @@ -245,7 +245,7 @@ protected: virtual QVariant entryInfo(EntryInfoType type) const; private: - Q_DISABLE_COPY(QAbstractFileEngineIterator) + Q_DISABLE_COPY_MOVE(QAbstractFileEngineIterator) friend class QDirIterator; friend class QDirIteratorPrivate; void setPath(const QString &path); diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp index e0b9c41323..7b3fa2ccad 100644 --- a/src/corelib/io/qbuffer.cpp +++ b/src/corelib/io/qbuffer.cpp @@ -60,8 +60,8 @@ public: QByteArray *buf; QByteArray defaultBuf; - virtual qint64 peek(char *data, qint64 maxSize) override; - virtual QByteArray peek(qint64 maxSize) override; + qint64 peek(char *data, qint64 maxSize) override; + QByteArray peek(qint64 maxSize) override; #ifndef QT_NO_QOBJECT // private slots diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 4d56d1a179..15c5e0ce96 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -356,7 +356,7 @@ QDebug &QDebug::resetFormat() stream->space = true; if (stream->context.version > 1) stream->flags = 0; - stream->setVerbosity(Stream::DefaultVerbosity); + stream->setVerbosity(DefaultVerbosity); return *this; } @@ -461,7 +461,7 @@ QDebug &QDebug::resetFormat() The allowed range is from 0 to 7. The default value is 2. - \sa setVerbosity() + \sa setVerbosity(), VerbosityLevel */ /*! @@ -472,7 +472,31 @@ QDebug &QDebug::resetFormat() The allowed range is from 0 to 7. The default value is 2. - \sa verbosity() + \sa verbosity(), VerbosityLevel +*/ + +/*! + \fn QDebug &QDebug::verbosity(int verbosityLevel) + \since 5.13 + + Sets the verbosity of the stream to \a verbosityLevel and returns a reference to the stream. + + The allowed range is from 0 to 7. The default value is 2. + + \sa verbosity(), setVerbosity(), VerbosityLevel +*/ + +/*! + \enum QDebug::VerbosityLevel + \since 5.13 + + This enum describes the range of verbosity levels. + + \value MinimumVerbosity + \value DefaultVerbosity + \value MaximumVerbosity + + \sa verbosity(), setVerbosity() */ /*! @@ -892,37 +916,127 @@ void qt_QMetaEnum_flagDebugOperator(QDebug &debug, size_t sizeofT, int value) #ifndef QT_NO_QOBJECT /*! + \fn QDebug qt_QMetaEnum_debugOperator(QDebug &, int value, const QMetaObject *, const char *name) \internal + + Formats the given enum \a value for debug output. + + The supported verbosity are: + + 0: Just the key, or value with enum name if no key is found: + + MyEnum2 + MyEnum(123) + MyScopedEnum::Enum3 + MyScopedEnum(456) + + 1: Same as 0, but treating all enums as scoped: + + MyEnum::MyEnum2 + MyEnum(123) + MyScopedEnum::Enum3 + MyScopedEnum(456) + + 2: The QDebug default. Same as 0, and includes class/namespace scope: + + MyNamespace::MyClass::MyEnum2 + MyNamespace::MyClass::MyEnum(123) + MyNamespace::MyClass::MyScopedEnum::Enum3 + MyNamespace::MyClass::MyScopedEnum(456) + + 3: Same as 2, but treating all enums as scoped: + + MyNamespace::MyClass::MyEnum::MyEnum2 + MyNamespace::MyClass::MyEnum(123) + MyNamespace::MyClass::MyScopedEnum::Enum3 + MyNamespace::MyClass::MyScopedEnum(456) */ QDebug qt_QMetaEnum_debugOperator(QDebug &dbg, int value, const QMetaObject *meta, const char *name) { QDebugStateSaver saver(dbg); dbg.nospace(); QMetaEnum me = meta->enumerator(meta->indexOfEnumerator(name)); - const char *key = me.valueToKey(value); - if (key) { + + const int verbosity = dbg.verbosity(); + if (verbosity >= QDebug::DefaultVerbosity) { if (const char *scope = me.scope()) dbg << scope << "::"; - if (me.isScoped()) - dbg << me.enumName() << "::"; - dbg << key; - } else { - dbg << meta->className() << "::" << name << "(" << value << ")"; } + + const char *key = me.valueToKey(value); + const bool scoped = me.isScoped() || verbosity & 1; + if (scoped || !key) + dbg << me.enumName() << (!key ? "(" : "::"); + + if (key) + dbg << key; + else + dbg << value << ")"; + return dbg; } +/*! + \fn QDebug qt_QMetaEnum_flagDebugOperator(QDebug &, quint64 value, const QMetaObject *, const char *name) + \internal + + Formats the given flag \a value for debug output. + + The supported verbosity are: + + 0: Just the key(s): + + MyFlag1 + MyFlag2|MyFlag3 + MyScopedFlag(MyFlag2) + MyScopedFlag(MyFlag2|MyFlag3) + + 1: Same as 0, but treating all flags as scoped: + + MyFlag(MyFlag1) + MyFlag(MyFlag2|MyFlag3) + MyScopedFlag(MyFlag2) + MyScopedFlag(MyFlag2|MyFlag3) + + 2: The QDebug default. Same as 1, and includes class/namespace scope: + + QFlags<MyNamespace::MyClass::MyFlag>(MyFlag1) + QFlags<MyNamespace::MyClass::MyFlag>(MyFlag2|MyFlag3) + QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2) + QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2|MyFlag3) + */ QDebug qt_QMetaEnum_flagDebugOperator(QDebug &debug, quint64 value, const QMetaObject *meta, const char *name) { + const int verbosity = debug.verbosity(); + QDebugStateSaver saver(debug); debug.resetFormat(); debug.noquote(); debug.nospace(); - debug << "QFlags<"; + const QMetaEnum me = meta->enumerator(meta->indexOfEnumerator(name)); - if (const char *scope = me.scope()) - debug << scope << "::"; - debug << me.enumName() << ">(" << me.valueToKeys(value) << ')'; + + const bool classScope = verbosity >= QDebug::DefaultVerbosity; + if (classScope) { + debug << "QFlags<"; + + if (const char *scope = me.scope()) + debug << scope << "::"; + } + + const bool enumScope = me.isScoped() || verbosity > QDebug::MinimumVerbosity; + if (enumScope) { + debug << me.enumName(); + if (classScope) + debug << ">"; + debug << "("; + } + + debug << me.valueToKeys(value); + + if (enumScope) + debug << ')'; + return debug; } #endif // !QT_NO_QOBJECT diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 9d1ce51da5..91fde75fa5 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -67,7 +67,7 @@ class Q_CORE_EXPORT QDebug friend class QMessageLogger; friend class QDebugStateSaverPrivate; struct Stream { - enum { DefaultVerbosity = 2, VerbosityShift = 29, VerbosityMask = 0x7 }; + enum { VerbosityShift = 29, VerbosityMask = 0x7 }; Stream(QIODevice *device) : ts(device), ref(1), type(QtDebugMsg), space(true), message_output(false), flags(DefaultVerbosity << VerbosityShift) {} @@ -92,7 +92,7 @@ class Q_CORE_EXPORT QDebug void setFlag(FormatFlag flag) { if (context.version > 1) { flags |= flag; } } void unsetFlag(FormatFlag flag) { if (context.version > 1) { flags &= ~flag; } } int verbosity() const - { return context.version > 1 ? (flags >> VerbosityShift) & VerbosityMask : int(Stream::DefaultVerbosity); } + { return context.version > 1 ? (flags >> VerbosityShift) & VerbosityMask : int(DefaultVerbosity); } void setVerbosity(int v) { if (context.version > 1) { @@ -123,8 +123,10 @@ public: inline QDebug &space() { stream->space = true; stream->ts << ' '; return *this; } inline QDebug &nospace() { stream->space = false; return *this; } inline QDebug &maybeSpace() { if (stream->space) stream->ts << ' '; return *this; } + inline QDebug &verbosity(int verbosityLevel) { setVerbosity(verbosityLevel); return *this; } int verbosity() const { return stream->verbosity(); } void setVerbosity(int verbosityLevel) { stream->setVerbosity(verbosityLevel); } + enum VerbosityLevel { MinimumVerbosity = 0, DefaultVerbosity = 2, MaximumVerbosity = 7 }; bool autoInsertSpaces() const { return stream->space; } void setAutoInsertSpaces(bool b) { stream->space = b; } @@ -195,6 +197,7 @@ public: inline QNoDebug "e() { return *this; } inline QNoDebug &noquote() { return *this; } inline QNoDebug &maybeQuote(const char = '"') { return *this; } + inline QNoDebug &verbosity(int) { return *this; } template<typename T> inline QNoDebug &operator<<(const T &) { return *this; } diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index f7778943c9..671913e92f 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -1069,6 +1069,7 @@ void QDir::setNameFilters(const QStringList &nameFilters) d->nameFilters = nameFilters; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -1083,11 +1084,15 @@ void QDir::setNameFilters(const QStringList &nameFilters) void QDir::addResourceSearchPath(const QString &path) { #ifdef QT_BUILD_CORE_LIB +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QResource::addSearchPath(path); +QT_WARNING_POP #else Q_UNUSED(path) #endif } +#endif #ifdef QT_BUILD_CORE_LIB /*! @@ -1815,6 +1820,7 @@ QDir &QDir::operator=(const QDir &dir) return *this; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \overload \obsolete @@ -1828,6 +1834,7 @@ QDir &QDir::operator=(const QString &path) d_ptr->setPath(path); return *this; } +#endif /*! \fn void QDir::swap(QDir &other) diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index 45c59d9e1d..9abb833ab1 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -105,7 +105,10 @@ public: ~QDir(); QDir &operator=(const QDir &); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDir::setPath() instead") QDir &operator=(const QString &path); +#endif #ifdef Q_COMPILER_RVALUE_REFS QDir &operator=(QDir &&other) Q_DECL_NOTHROW { swap(other); return *this; } #endif @@ -118,7 +121,10 @@ public: QString absolutePath() const; QString canonicalPath() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDir::addSearchPath() instead") static void addResourceSearchPath(const QString &path); +#endif static void setSearchPaths(const QString &prefix, const QStringList &searchPaths); static void addSearchPath(const QString &prefix, const QString &path); diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 3166fa1b83..ef97d67653 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -454,7 +454,13 @@ QFile::exists(const QString &fileName) \sa fileName(), setFileName() */ +QString QFile::symLinkTarget() const +{ + Q_D(const QFile); + return d->engine()->fileName(QAbstractFileEngine::LinkName); +} +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -463,9 +469,9 @@ QFile::exists(const QString &fileName) QString QFile::readLink() const { - Q_D(const QFile); - return d->engine()->fileName(QAbstractFileEngine::LinkName); + return symLinkTarget(); } +#endif /*! \fn static QString QFile::symLinkTarget(const QString &fileName) @@ -478,7 +484,12 @@ QFile::readLink() const This name may not represent an existing file; it is only a string. QFile::exists() returns \c true if the symlink points to an existing file. */ +QString QFile::symLinkTarget(const QString &fileName) +{ + return QFileInfo(fileName).symLinkTarget(); +} +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -487,8 +498,9 @@ QFile::readLink() const QString QFile::readLink(const QString &fileName) { - return QFileInfo(fileName).readLink(); + return symLinkTarget(fileName); } +#endif /*! Removes the file specified by fileName(). Returns \c true if successful; @@ -808,7 +820,7 @@ QFile::copy(const QString &newName) if (error) { out.close(); close(); - d->setError(QFile::CopyError, tr("Cannot open for output")); + d->setError(QFile::CopyError, tr("Cannot open for output: %1").arg(out.errorString())); } else { if (!d->engine()->cloneTo(out.d_func()->engine())) { char block[4096]; diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index e6f3d942fe..cf1465ec70 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -107,10 +107,14 @@ public: bool exists() const; static bool exists(const QString &fileName); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QFile::symLinkTarget() instead") QString readLink() const; + QT_DEPRECATED_X("Use QFile::symLinkTarget(QString) instead") static QString readLink(const QString &fileName); - inline QString symLinkTarget() const { return readLink(); } - inline static QString symLinkTarget(const QString &fileName) { return readLink(fileName); } +#endif + QString symLinkTarget() const; + static QString symLinkTarget(const QString &fileName); bool remove(); static bool remove(const QString &fileName); diff --git a/src/corelib/io/qfiledevice.cpp b/src/corelib/io/qfiledevice.cpp index 2f99775c65..0689118f3e 100644 --- a/src/corelib/io/qfiledevice.cpp +++ b/src/corelib/io/qfiledevice.cpp @@ -700,7 +700,7 @@ bool QFileDevice::setPermissions(Permissions permissions) Any mapping options can be passed through \a flags. - Returns a pointer to the memory or 0 if there is an error. + Returns a pointer to the memory or \nullptr if there is an error. \sa unmap() */ @@ -711,11 +711,11 @@ uchar *QFileDevice::map(qint64 offset, qint64 size, MemoryMapFlags flags) && d->fileEngine->supportsExtension(QAbstractFileEngine::MapExtension)) { unsetError(); uchar *address = d->fileEngine->map(offset, size, flags); - if (address == 0) + if (address == nullptr) d->setError(d->fileEngine->error(), d->fileEngine->errorString()); return address; } - return 0; + return nullptr; } /*! diff --git a/src/corelib/io/qfiledevice.h b/src/corelib/io/qfiledevice.h index af41bec2f6..2d524193c5 100644 --- a/src/corelib/io/qfiledevice.h +++ b/src/corelib/io/qfiledevice.h @@ -100,7 +100,7 @@ public: FileError error() const; void unsetError(); - virtual void close() override; + void close() override; bool isSequential() const override; diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 185e061d8f..998382021d 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -1107,6 +1107,7 @@ bool QFileInfo::isRoot() const \sa exists(), isSymLink(), isDir(), isFile() */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -1114,6 +1115,12 @@ bool QFileInfo::isRoot() const */ QString QFileInfo::readLink() const { + return symLinkTarget(); +} +#endif + +QString QFileInfo::symLinkTarget() const +{ Q_D(const QFileInfo); if (d->isDefaultConstructed) return QLatin1String(""); diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index f295a86015..baea18fab1 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -116,8 +116,11 @@ public: bool isRoot() const; bool isBundle() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QFileInfo::symLinkTarget() instead") QString readLink() const; - inline QString symLinkTarget() const { return readLink(); } +#endif + QString symLinkTarget() const; QString owner() const; uint ownerId() const; diff --git a/src/corelib/io/qfilesystemiterator_p.h b/src/corelib/io/qfilesystemiterator_p.h index 081487e66e..5e4e424e69 100644 --- a/src/corelib/io/qfilesystemiterator_p.h +++ b/src/corelib/io/qfilesystemiterator_p.h @@ -96,7 +96,7 @@ private: int lastError; #endif - Q_DISABLE_COPY(QFileSystemIterator) + Q_DISABLE_COPY_MOVE(QFileSystemIterator) }; QT_END_NAMESPACE diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h index ebed1120db..bbc4ea5ae2 100644 --- a/src/corelib/io/qnoncontiguousbytedevice_p.h +++ b/src/corelib/io/qnoncontiguousbytedevice_p.h @@ -179,13 +179,13 @@ class QByteDeviceWrappingIoDevice : public QIODevice public: QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd); ~QByteDeviceWrappingIoDevice (); - virtual bool isSequential () const override; - virtual bool atEnd () const override; - virtual bool reset () override; - virtual qint64 size () const override; + bool isSequential() const override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; protected: - virtual qint64 readData ( char * data, qint64 maxSize ) override; - virtual qint64 writeData ( const char * data, qint64 maxSize ) override; + qint64 readData(char *data, qint64 maxSize) override; + qint64 writeData(const char *data, qint64 maxSize) override; QNonContiguousByteDevice *byteDevice; }; diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index e1f4a3a311..d5d67d86f3 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -813,6 +813,7 @@ void QProcessPrivate::Channel::clear() \a newState argument is the state QProcess changed to. */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn void QProcess::finished(int exitCode) \obsolete @@ -820,6 +821,7 @@ void QProcessPrivate::Channel::clear() Use finished(int exitCode, QProcess::ExitStatus status) instead. */ +#endif /*! \fn void QProcess::finished(int exitCode, QProcess::ExitStatus exitStatus) @@ -1172,7 +1174,12 @@ bool QProcessPrivate::_q_processDied() //emit q->standardOutputClosed(); //emit q->standardErrorClosed(); +#if QT_DEPRECATED_SINCE(5, 13) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit q->finished(exitCode); +QT_WARNING_POP +#endif emit q->finished(exitCode, exitStatus); } #if defined QPROCESS_DEBUG @@ -1264,6 +1271,7 @@ QProcess::~QProcess() d->cleanup(); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete Returns the read channel mode of the QProcess. This function is @@ -1287,6 +1295,7 @@ void QProcess::setReadChannelMode(ProcessChannelMode mode) { setProcessChannelMode(mode); } +#endif /*! \since 4.2 @@ -2473,7 +2482,7 @@ QProcess::ExitStatus QProcess::exitStatus() const int QProcess::execute(const QString &program, const QStringList &arguments) { QProcess process; - process.setReadChannelMode(ForwardedChannels); + process.setProcessChannelMode(ForwardedChannels); process.start(program, arguments); if (!process.waitForFinished(-1) || process.error() == FailedToStart) return -2; @@ -2496,7 +2505,7 @@ int QProcess::execute(const QString &program, const QStringList &arguments) int QProcess::execute(const QString &command) { QProcess process; - process.setReadChannelMode(ForwardedChannels); + process.setProcessChannelMode(ForwardedChannels); process.start(command); if (!process.waitForFinished(-1) || process.error() == FailedToStart) return -2; diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 474fc87de8..42cf769698 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QProcessPrivate; -#if !defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if !defined(Q_OS_WIN) typedef qint64 Q_PID; #else QT_END_NAMESPACE @@ -172,8 +172,12 @@ public: QStringList arguments() const; void setArguments(const QStringList & arguments); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QProcess::processChannelMode() instead") ProcessChannelMode readChannelMode() const; + QT_DEPRECATED_X("Use QProcess::setProcessChannelMode() instead") void setReadChannelMode(ProcessChannelMode mode); +#endif ProcessChannelMode processChannelMode() const; void setProcessChannelMode(ProcessChannelMode mode); InputChannelMode inputChannelMode() const; @@ -269,7 +273,10 @@ public Q_SLOTS: Q_SIGNALS: void started(QPrivateSignal); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QProcess::finished(int, QProcess::ExitStatus) instead") void finished(int exitCode); // ### Qt 6: merge the two signals with a default value +#endif void finished(int exitCode, QProcess::ExitStatus exitStatus); #if QT_DEPRECATED_SINCE(5,6) void error(QProcess::ProcessError error); diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 564a3e5f51..1077e31797 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -56,16 +57,46 @@ #include "private/qabstractfileengine_p.h" #include "private/qnumeric_p.h" #include "private/qsimd_p.h" +#include "private/qtools_p.h" #include "private/qsystemerror_p.h" +#if QT_CONFIG(zstd) +# include <zstd.h> +#endif + #ifdef Q_OS_UNIX # include "private/qcore_unix_p.h" #endif +#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY) +# define QT_USE_MMAP +# include <sys/mman.h> +#endif + //#define DEBUG_RESOURCE_MATCH QT_BEGIN_NAMESPACE +// Symbols used by code generated by RCC. +// They cause compilation errors if the RCC content couldn't +// be interpreted by this QtCore version. +#if defined(__ELF__) || defined(__APPLE__) // same as RCC generates +# define RCC_FEATURE_SYMBOL(feature) \ + extern Q_CORE_EXPORT const quint8 qt_resourceFeature ## feature; \ + const quint8 qt_resourceFeature ## feature = 0; +#else +# define RCC_FEATURE_SYMBOL(feature) \ + Q_CORE_EXPORT quint8 qResourceFeature ## feature() { return 0; } +#endif + +#ifndef QT_NO_COMPRESS +RCC_FEATURE_SYMBOL(Zlib) +#endif +#if QT_CONFIG(zstd) +RCC_FEATURE_SYMBOL(Zstd) +#endif + +#undef RCC_FEATURE_SYMBOL class QStringSplitter { @@ -98,11 +129,15 @@ public: //resource glue class QResourceRoot { +public: enum Flags { + // must match rcc.h Compressed = 0x01, - Directory = 0x02 + Directory = 0x02, + CompressedZstd = 0x04 }; +private: const uchar *tree, *names, *payloads; int version; inline int findOffset(int node) const { return node * (14 + (version >= 0x02 ? 8 : 0)); } //sizeof each tree element @@ -117,7 +152,15 @@ public: virtual ~QResourceRoot() { } int findNode(const QString &path, const QLocale &locale=QLocale()) const; inline bool isContainer(int node) const { return flags(node) & Directory; } - inline bool isCompressed(int node) const { return flags(node) & Compressed; } + QResource::Compression compressionAlgo(int node) + { + uint compressionFlags = flags(node) & (Compressed | CompressedZstd); + if (compressionFlags == Compressed) + return QResource::ZlibCompression; + if (compressionFlags == CompressedZstd) + return QResource::ZstdCompression; + return QResource::NoCompression; + } const uchar *data(int node, qint64 *size) const; quint64 lastModified(int node) const; QStringList children(int node) const; @@ -229,6 +272,23 @@ static inline QStringList *resourceSearchPaths() \sa {The Qt Resource System}, QFile, QDir, QFileInfo */ +/*! + \enum QResource::Compression + \since 5.13 + + This enum is used by compressionAlgorithm() to indicate which algorithm the + RCC tool used to compress the payload. + + \value NoCompression Contents are not compressed (isCompressed() is false). + \value ZlibCompression Contents are compressed using \l{zlib}{https://zlib.net} and can + be decompressed using the qUncompress() function. + \value ZstdCompression Contents are compressed using \l{zstd}{https://zstd.net}. To + decompress, use the \c{ZSTD_decompress} function from the zstd + library. + + \sa compressionAlgorithm(), isCopressed() +*/ + class QResourcePrivate { public: inline QResourcePrivate(QResource *_q) : q_ptr(_q) { clear(); } @@ -243,12 +303,13 @@ public: QLocale locale; QString fileName, absoluteFilePath; QList<QResourceRoot*> related; - uint container : 1; - mutable uint compressed : 1; mutable qint64 size; + mutable quint64 lastModified; mutable const uchar *data; mutable QStringList children; - mutable quint64 lastModified; + mutable quint8 compressionAlgo; + bool container; + /* 2 or 6 padding bytes */ QResource *q_ptr; Q_DECLARE_PUBLIC(QResource) @@ -258,7 +319,7 @@ void QResourcePrivate::clear() { absoluteFilePath.clear(); - compressed = 0; + compressionAlgo = QResource::NoCompression; data = 0; size = 0; children.clear(); @@ -287,11 +348,11 @@ QResourcePrivate::load(const QString &file) container = res->isContainer(node); if(!container) { data = res->data(node, &size); - compressed = res->isCompressed(node); + compressionAlgo = res->compressionAlgo(node); } else { - data = 0; + data = nullptr; size = 0; - compressed = 0; + compressionAlgo = QResource::NoCompression; } lastModified = res->lastModified(node); } else if(res->isContainer(node) != container) { @@ -301,9 +362,9 @@ QResourcePrivate::load(const QString &file) related.append(res); } else if(res->mappingRootSubdir(file)) { container = true; - data = 0; + data = nullptr; size = 0; - compressed = 0; + compressionAlgo = QResource::NoCompression; lastModified = 0; res->ref.ref(); related.append(res); @@ -493,16 +554,41 @@ bool QResource::isValid() const /*! Returns \c true if the resource represents a file and the data backing it - is in a compressed format, false otherwise. + is in a compressed format, false otherwise. If the data is compressed, + check compressionAlgorithm() to verify what algorithm to use to decompress + the data. - \sa data(), isFile() + \sa data(), compressionType(), isFile() */ bool QResource::isCompressed() const { + return compressionAlgorithm() != NoCompression; +} + +/*! + \since 5.13 + + Returns the compression type that this resource is compressed with, if any. + If it is not compressed, this function returns QResource::NoCompression. + + If this function returns QResource::ZlibCompression, you may decompress the + data using the qUncompress() function. Up until Qt 5.13, this was the only + possible compression algorithm. + + If this function returns QResource::ZstdCompression, you need to use the + Zstandard library functios (\c{<zstd.h> header). Qt does not provide a + wrapper. + + See \l{http://facebook.github.io/zstd/zstd_manual.html}{Zstandard manual}. + + \sa isCompressed(), data(), isFile() +*/ +QResource::Compression QResource::compressionAlgorithm() const +{ Q_D(const QResource); d->ensureInitialized(); - return d->compressed; + return Compression(d->compressionAlgo); } /*! @@ -522,7 +608,7 @@ qint64 QResource::size() const Returns direct access to a read only segment of data that this resource represents. If the resource is compressed the data returns is compressed and qUncompress() must be used to access the data. If the - resource is a directory 0 is returned. + resource is a directory \nullptr is returned. \sa size(), isCompressed(), isFile() */ @@ -573,6 +659,7 @@ QStringList QResource::children() const return d->children; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -614,6 +701,7 @@ QResource::searchPaths() QMutexLocker lock(resourceMutex()); return *resourceSearchPaths(); } +#endif inline uint QResourceRoot::hash(int node) const { @@ -853,7 +941,7 @@ Q_CORE_EXPORT bool qRegisterResourceData(int version, const unsigned char *tree, const unsigned char *name, const unsigned char *data) { QMutexLocker lock(resourceMutex()); - if ((version == 0x01 || version == 0x2) && resourceList()) { + if (version >= 0x01 && version <= 0x3 && resourceList()) { bool found = false; QResourceRoot res(version, tree, name, data); for(int i = 0; i < resourceList()->size(); ++i) { @@ -879,7 +967,7 @@ Q_CORE_EXPORT bool qUnregisterResourceData(int version, const unsigned char *tre return false; QMutexLocker lock(resourceMutex()); - if ((version == 0x01 || version == 0x02) && resourceList()) { + if (version >= 0x01 && version <= 0x3 && resourceList()) { QResourceRoot res(version, tree, name, data); for(int i = 0; i < resourceList()->size(); ) { if(*resourceList()->at(i) == res) { @@ -906,11 +994,11 @@ public: inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { } inline ~QDynamicBufferResourceRoot() { } inline const uchar *mappingBuffer() const { return buffer; } - virtual QString mappingRoot() const override { return root; } - virtual ResourceRootType type() const override { return Resource_Buffer; } + QString mappingRoot() const override { return root; } + ResourceRootType type() const override { return Resource_Buffer; } // size == -1 means "unknown" - bool registerSelf(const uchar *b, int size) + bool registerSelf(const uchar *b, qsizetype size) { // 5 int "pointers" if (size >= 0 && size < 20) @@ -938,11 +1026,27 @@ public: const int name_offset = qFromBigEndian<qint32>(b + offset); offset += 4; + quint32 file_flags = 0; + if (version >= 3) { + file_flags = qFromBigEndian<qint32>(b + offset); + offset += 4; + } + // Some sanity checking for sizes. This is _not_ a security measure. if (size >= 0 && (tree_offset >= size || data_offset >= size || name_offset >= size)) return false; - if (version == 0x01 || version == 0x02) { + // And some sanity checking for features + quint32 acceptableFlags = 0; +#ifndef QT_NO_COMPRESS + acceptableFlags |= Compressed; +#endif + if (QT_CONFIG(zstd)) + acceptableFlags |= CompressedZstd; + if (file_flags & ~acceptableFlags) + return false; + + if (version >= 0x01 && version <= 0x03) { buffer = b; setSource(version, b+tree_offset, b+name_offset, b+data_offset); return true; @@ -951,28 +1055,12 @@ public: } }; -#if defined(Q_OS_UNIX) && !defined (Q_OS_NACL) && !defined(Q_OS_INTEGRITY) -#define QT_USE_MMAP -#endif - -// most of the headers below are already included in qplatformdefs.h -// also this lacks Large File support but that's probably irrelevant -#if defined(QT_USE_MMAP) -// for mmap -QT_BEGIN_INCLUDE_NAMESPACE -#include <sys/mman.h> -#include <errno.h> -QT_END_INCLUDE_NAMESPACE -#endif - - - class QDynamicFileResourceRoot: public QDynamicBufferResourceRoot { QString fileName; // for mmap'ed files, this is what needs to be unmapped. uchar *unmapPointer; - unsigned int unmapLength; + qsizetype unmapLength; public: inline QDynamicFileResourceRoot(const QString &_root) : QDynamicBufferResourceRoot(_root), unmapPointer(0), unmapLength(0) { } @@ -989,76 +1077,78 @@ public: } } QString mappingFile() const { return fileName; } - virtual ResourceRootType type() const override { return Resource_File; } - - bool registerSelf(const QString &f) { - bool fromMM = false; - uchar *data = 0; - unsigned int data_len = 0; + ResourceRootType type() const override { return Resource_File; } -#ifdef QT_USE_MMAP + bool registerSelf(const QString &f); +}; #ifndef MAP_FILE -#define MAP_FILE 0 +# define MAP_FILE 0 #endif #ifndef MAP_FAILED -#define MAP_FAILED -1 +# define MAP_FAILED reinterpret_cast<void *>(-1) #endif - int fd = QT_OPEN(QFile::encodeName(f), O_RDONLY, +bool QDynamicFileResourceRoot::registerSelf(const QString &f) +{ + bool fromMM = false; + uchar *data = nullptr; + qsizetype data_len = 0; + +#ifdef QT_USE_MMAP + int fd = QT_OPEN(QFile::encodeName(f), O_RDONLY, #if defined(Q_OS_WIN) - _S_IREAD | _S_IWRITE + _S_IREAD | _S_IWRITE #else - 0666 + 0666 #endif - ); - if (fd >= 0) { - QT_STATBUF st; - if (!QT_FSTAT(fd, &st)) { - uchar *ptr; - ptr = reinterpret_cast<uchar *>( - mmap(0, st.st_size, // any address, whole file - PROT_READ, // read-only memory - MAP_FILE | MAP_PRIVATE, // swap-backed map from file - fd, 0)); // from offset 0 of fd - if (ptr && ptr != reinterpret_cast<uchar *>(MAP_FAILED)) { - data = ptr; - data_len = st.st_size; - fromMM = true; - } + ); + if (fd >= 0) { + QT_STATBUF st; + if (!QT_FSTAT(fd, &st) && st.st_size <= std::numeric_limits<qsizetype>::max()) { + int protection = PROT_READ; // read-only memory + int flags = MAP_FILE | MAP_PRIVATE; // swap-backed map from file + void *ptr = QT_MMAP(nullptr, st.st_size, // any address, whole file + protection, flags, + fd, 0); // from offset 0 of fd + if (ptr != MAP_FAILED) { + data = static_cast<uchar *>(ptr); + data_len = st.st_size; + fromMM = true; } - ::close(fd); } + QT_CLOSE(fd); + } #endif // QT_USE_MMAP - if(!data) { - QFile file(f); - if (!file.exists()) - return false; - data_len = file.size(); - data = new uchar[data_len]; - - bool ok = false; - if (file.open(QIODevice::ReadOnly)) - ok = (data_len == (uint)file.read((char*)data, data_len)); - if (!ok) { - delete [] data; - data = 0; - data_len = 0; - return false; + if (!data) { + QFile file(f); + bool ok = false; + if (file.open(QIODevice::ReadOnly)) { + qint64 fsize = file.size(); + if (fsize <= std::numeric_limits<qsizetype>::max()) { + data_len = file.size(); + data = new uchar[data_len]; + ok = (data_len == file.read((char*)data, data_len)); } - fromMM = false; } - if (data && QDynamicBufferResourceRoot::registerSelf(data, data_len)) { - if(fromMM) { - unmapPointer = data; - unmapLength = data_len; - } - fileName = f; - return true; + if (!ok) { + delete [] data; + data = nullptr; + data_len = 0; + return false; } - return false; + fromMM = false; } -}; + if (data && QDynamicBufferResourceRoot::registerSelf(data, data_len)) { + if (fromMM) { + unmapPointer = data; + unmapLength = data_len; + } + fileName = f; + return true; + } + return false; +} static QString qt_resource_fixResourceRoot(QString r) { if(!r.isEmpty()) { @@ -1531,12 +1621,40 @@ bool QResourceFileEnginePrivate::unmap(uchar *ptr) void QResourceFileEnginePrivate::uncompress() const { - if (resource.isCompressed() && uncompressed.isEmpty() && resource.size()) { + if (uncompressed.isEmpty() && resource.size()) { + quint64 size; + switch (resource.compressionAlgorithm()) { + case QResource::NoCompression: + return; // nothing to do + + case QResource::ZlibCompression: #ifndef QT_NO_COMPRESS - uncompressed = qUncompress(resource.data(), resource.size()); + uncompressed = qUncompress(resource.data(), resource.size()); #else - Q_ASSERT(!"QResourceFileEngine::open: Qt built without support for compression"); + Q_ASSERT(!"QResourceFileEngine::open: Qt built without support for Zlib compression"); #endif + break; + + case QResource::ZstdCompression: +#if QT_CONFIG(zstd) + size = ZSTD_getFrameContentSize(resource.data(), resource.size()); + if (!ZSTD_isError(size)) { + if (size >= MaxAllocSize) { + qWarning("QResourceFileEngine::open: content bigger than memory (size %lld)", size); + } else { + uncompressed = QByteArray(size, Qt::Uninitialized); + size = ZSTD_decompress(const_cast<char *>(uncompressed.data()), size, + resource.data(), resource.size()); + } + } + if (ZSTD_isError(size)) + qWarning("QResourceFileEngine::open: error decoding: %s", ZSTD_getErrorName(size)); +#else + Q_UNUSED(size); + Q_ASSERT(!"QResourceFileEngine::open: Qt built without support for Zstd compression"); +#endif + break; + } } } diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h index 895cf0456e..5e798de436 100644 --- a/src/corelib/io/qresource.h +++ b/src/corelib/io/qresource.h @@ -54,6 +54,12 @@ class QResourcePrivate; class Q_CORE_EXPORT QResource { public: + enum Compression { + NoCompression, + ZlibCompression, + ZstdCompression + }; + QResource(const QString &file=QString(), const QLocale &locale=QLocale()); ~QResource(); @@ -67,12 +73,17 @@ public: bool isValid() const; bool isCompressed() const; + Compression compressionAlgorithm() const; qint64 size() const; const uchar *data() const; QDateTime lastModified() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDir::addSearchPath() instead") static void addSearchPath(const QString &path); + QT_DEPRECATED_X("Use QDir::searchPaths() instead") static QStringList searchPaths(); +#endif static bool registerResource(const QString &rccFilename, const QString &resourceRoot=QString()); static bool unregisterResource(const QString &rccFilename, const QString &resourceRoot=QString()); diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index dcfe46704c..7451de8809 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -64,49 +64,49 @@ public: explicit QResourceFileEngine(const QString &path); ~QResourceFileEngine(); - virtual void setFileName(const QString &file) override; + void setFileName(const QString &file) override; - virtual bool open(QIODevice::OpenMode flags) override ; - virtual bool close() override; - virtual bool flush() override; - virtual qint64 size() const override; - virtual qint64 pos() const override; + bool open(QIODevice::OpenMode flags) override; + bool close() override; + bool flush() override; + qint64 size() const override; + qint64 pos() const override; virtual bool atEnd() const; - virtual bool seek(qint64) override; - virtual qint64 read(char *data, qint64 maxlen) override; - virtual qint64 write(const char *data, qint64 len) override; + bool seek(qint64) override; + qint64 read(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; - virtual bool remove() override; - virtual bool copy(const QString &newName) override; - virtual bool rename(const QString &newName) override; - virtual bool link(const QString &newName) override; + bool remove() override; + bool copy(const QString &newName) override; + bool rename(const QString &newName) override; + bool link(const QString &newName) override; - virtual bool isSequential() const override; + bool isSequential() const override; - virtual bool isRelativePath() const override; + bool isRelativePath() const override; - virtual bool mkdir(const QString &dirName, bool createParentDirectories) const override; - virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; + bool mkdir(const QString &dirName, bool createParentDirectories) const override; + bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; - virtual bool setSize(qint64 size) override; + bool setSize(qint64 size) override; - virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override; + QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override; - virtual bool caseSensitive() const override; + bool caseSensitive() const override; - virtual FileFlags fileFlags(FileFlags type) const override; + FileFlags fileFlags(FileFlags type) const override; - virtual bool setPermissions(uint perms) override; + bool setPermissions(uint perms) override; - virtual QString fileName(QAbstractFileEngine::FileName file) const override; + QString fileName(QAbstractFileEngine::FileName file) const override; - virtual uint ownerId(FileOwner) const override; - virtual QString owner(FileOwner) const override; + uint ownerId(FileOwner) const override; + QString owner(FileOwner) const override; - virtual QDateTime fileTime(FileTime time) const override; + QDateTime fileTime(FileTime time) const override; - virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; - virtual Iterator *endEntryList() override; + Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; + Iterator *endEntryList() override; bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override; bool supportsExtension(Extension extension) const override; diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 0d2bd72d75..47b3548817 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -62,8 +62,8 @@ #include "qrect.h" #endif // !QT_NO_GEOM_VARIANT -#ifndef QT_NO_QOBJECT -#include "qcoreapplication.h" +#ifndef QT_BUILD_QMAKE +# include "qcoreapplication.h" #endif #ifndef QT_BOOTSTRAPPED @@ -2661,9 +2661,10 @@ QSettings::QSettings(const QString &fileName, Format format, QObject *parent) called, the QSettings object will not be able to read or write any settings, and status() will return AccessError. - On \macos and iOS, if both a name and an Internet domain are specified - for the organization, the domain is preferred over the name. On - other platforms, the name is preferred over the domain. + You should supply both the domain (used by default on \macos and iOS) and + the name (used by default elsewhere), although the code will cope if you + supply only one, which will then be used (on all platforms), at odds with + the usual naming of the file on platforms for which it isn't the default. \sa QCoreApplication::setOrganizationName(), QCoreApplication::setOrganizationDomain(), @@ -2671,8 +2672,21 @@ QSettings::QSettings(const QString &fileName, Format format, QObject *parent) setDefaultFormat() */ QSettings::QSettings(QObject *parent) - : QObject(*QSettingsPrivate::create(globalDefaultFormat, UserScope, -#ifdef Q_OS_MAC + : QSettings(UserScope, parent) +{ +} + +/*! + \since 5.13 + + Constructs a QSettings object in the same way as + QSettings(QObject *parent) but with the given \a scope. + + \sa QSettings(QObject *parent) +*/ +QSettings::QSettings(Scope scope, QObject *parent) + : QObject(*QSettingsPrivate::create(globalDefaultFormat, scope, +#ifdef Q_OS_DARWIN QCoreApplication::organizationDomain().isEmpty() ? QCoreApplication::organizationName() : QCoreApplication::organizationDomain() @@ -2711,6 +2725,25 @@ QSettings::QSettings(const QString &fileName, Format format) { d_ptr->q_ptr = this; } + +# ifndef QT_BUILD_QMAKE +QSettings::QSettings(Scope scope) + : d_ptr(QSettingsPrivate::create(globalDefaultFormat, scope, +# ifdef Q_OS_DARWIN + QCoreApplication::organizationDomain().isEmpty() + ? QCoreApplication::organizationName() + : QCoreApplication::organizationDomain() +# else + QCoreApplication::organizationName().isEmpty() + ? QCoreApplication::organizationDomain() + : QCoreApplication::organizationName() +# endif + , QCoreApplication::applicationName()) + ) +{ + d_ptr->q_ptr = this; +} +# endif #endif /*! @@ -3411,6 +3444,7 @@ QSettings::Format QSettings::defaultFormat() return globalDefaultFormat; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -3444,7 +3478,7 @@ void QSettings::setUserIniPath(const QString &dir) setPath(NativeFormat, UserScope, dir); #endif } - +#endif /*! \since 4.1 diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index 7a9eebe11b..07c746d043 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -129,6 +129,7 @@ public: const QString &application = QString(), QObject *parent = nullptr); QSettings(const QString &fileName, Format format, QObject *parent = nullptr); explicit QSettings(QObject *parent = nullptr); + explicit QSettings(Scope scope, QObject *parent = nullptr); #else explicit QSettings(const QString &organization, const QString &application = QString()); @@ -137,6 +138,9 @@ public: QSettings(Format format, Scope scope, const QString &organization, const QString &application = QString()); QSettings(const QString &fileName, Format format); +# ifndef QT_BUILD_QMAKE + explicit QSettings(Scope scope = UserScope); +# endif #endif ~QSettings(); @@ -183,8 +187,12 @@ public: static void setDefaultFormat(Format format); static Format defaultFormat(); - static void setSystemIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) - static void setUserIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QSettings::setPath() instead") + static void setSystemIniPath(const QString &dir); + QT_DEPRECATED_X("Use QSettings::setPath() instead") + static void setUserIniPath(const QString &dir); +#endif static void setPath(Format format, Scope scope, const QString &path); typedef QMap<QString, QVariant> SettingsMap; diff --git a/src/corelib/io/qstandardpaths_android.cpp b/src/corelib/io/qstandardpaths_android.cpp index 0667d170c7..83108e4387 100644 --- a/src/corelib/io/qstandardpaths_android.cpp +++ b/src/corelib/io/qstandardpaths_android.cpp @@ -239,10 +239,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) case QStandardPaths::PicturesLocation: return getExternalStoragePublicDirectory("DIRECTORY_PICTURES"); case QStandardPaths::DocumentsLocation: - if (QtAndroidPrivate::androidSdkVersion() > 18) - return getExternalStoragePublicDirectory("DIRECTORY_DOCUMENTS"); - else - return getExternalStorageDirectory() + QLatin1String("/Documents"); + return getExternalStoragePublicDirectory("DIRECTORY_DOCUMENTS"); case QStandardPaths::DownloadLocation: return getExternalStoragePublicDirectory("DIRECTORY_DOWNLOADS"); case QStandardPaths::GenericConfigLocation: @@ -295,13 +292,8 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) } if (type == DocumentsLocation) { - if (QtAndroidPrivate::androidSdkVersion() > 18) { - return QStringList() << writableLocation(type) - << getExternalFilesDir("DIRECTORY_DOCUMENTS"); - } else { - return QStringList() << writableLocation(type) - << getExternalFilesDir() + QLatin1String("/Documents"); - } + return QStringList() << writableLocation(type) + << getExternalFilesDir("DIRECTORY_DOCUMENTS"); } if (type == DownloadLocation) { diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp index 97e7b8a4eb..10c3f836c8 100644 --- a/src/corelib/io/qurlquery.cpp +++ b/src/corelib/io/qurlquery.cpp @@ -145,6 +145,14 @@ QT_BEGIN_NAMESPACE \since 5.2 */ +/*! + \fn QUrlQuery(std::initializer_list<QPair<QString, QString>> list) + + \since 5.13 + + Constructs a QUrlQuery object from the \a list of key/value pair. +*/ + typedef QList<QPair<QString, QString> > Map; class QUrlQueryPrivate : public QSharedData diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h index 092d002543..e3688aae2c 100644 --- a/src/corelib/io/qurlquery.h +++ b/src/corelib/io/qurlquery.h @@ -48,6 +48,8 @@ #include <QtCore/qstringlist.h> #endif +#include <initializer_list> + QT_BEGIN_NAMESPACE Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed = 0) Q_DECL_NOTHROW; @@ -59,6 +61,13 @@ public: QUrlQuery(); explicit QUrlQuery(const QUrl &url); explicit QUrlQuery(const QString &queryString); + QUrlQuery(std::initializer_list<QPair<QString, QString>> list) + : QUrlQuery() + { + for (const QPair<QString, QString> &item : list) + addQueryItem(item.first, item.second); + } + QUrlQuery(const QUrlQuery &other); QUrlQuery &operator=(const QUrlQuery &other); #ifdef Q_COMPILER_RVALUE_REFS diff --git a/src/corelib/io/qwindowspipereader_p.h b/src/corelib/io/qwindowspipereader_p.h index e52aa4c33d..c757753c9c 100644 --- a/src/corelib/io/qwindowspipereader_p.h +++ b/src/corelib/io/qwindowspipereader_p.h @@ -97,7 +97,7 @@ private: class Overlapped : public OVERLAPPED { - Q_DISABLE_COPY(Overlapped) + Q_DISABLE_COPY_MOVE(Overlapped) public: explicit Overlapped(QWindowsPipeReader *reader); void clear(); diff --git a/src/corelib/io/qwindowspipewriter_p.h b/src/corelib/io/qwindowspipewriter_p.h index d6671c3f27..6c269e86b7 100644 --- a/src/corelib/io/qwindowspipewriter_p.h +++ b/src/corelib/io/qwindowspipewriter_p.h @@ -134,7 +134,7 @@ private: class Overlapped : public OVERLAPPED { - Q_DISABLE_COPY(Overlapped) + Q_DISABLE_COPY_MOVE(Overlapped) public: explicit Overlapped(QWindowsPipeWriter *pipeWriter); void clear(); diff --git a/src/corelib/itemmodels/itemmodels.pri b/src/corelib/itemmodels/itemmodels.pri index 068a8c4b3a..ebeac6e211 100644 --- a/src/corelib/itemmodels/itemmodels.pri +++ b/src/corelib/itemmodels/itemmodels.pri @@ -20,6 +20,14 @@ qtConfig(proxymodel) { SOURCES += \ itemmodels/qabstractproxymodel.cpp + qtConfig(concatenatetablesproxymodel) { + HEADERS += \ + itemmodels/qconcatenatetablesproxymodel.h + + SOURCES += \ + itemmodels/qconcatenatetablesproxymodel.cpp + } + qtConfig(identityproxymodel) { HEADERS += \ itemmodels/qidentityproxymodel.h @@ -35,6 +43,15 @@ qtConfig(proxymodel) { SOURCES += \ itemmodels/qsortfilterproxymodel.cpp } + + qtConfig(transposeproxymodel) { + HEADERS += \ + itemmodels/qtransposeproxymodel.h \ + itemmodels/qtransposeproxymodel_p.h + + SOURCES += \ + itemmodels/qtransposeproxymodel.cpp + } } qtConfig(stringlistmodel) { diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index e816add91d..75e13ff994 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -77,7 +77,7 @@ void QPersistentModelIndexData::destroy(QPersistentModelIndexData *data) { Q_ASSERT(data); Q_ASSERT(data->ref.load() == 0); - QAbstractItemModel *model = const_cast<QAbstractItemModel *>(data->model); + QAbstractItemModel *model = const_cast<QAbstractItemModel *>(data->index.model()); // a valid persistent model index with a null model pointer can only happen if the model was destroyed if (model) { QAbstractItemModelPrivate *p = model->d_func(); @@ -512,10 +512,8 @@ QAbstractItemModel *QAbstractItemModelPrivate::staticEmptyModel() void QAbstractItemModelPrivate::invalidatePersistentIndexes() { - for (QPersistentModelIndexData *data : qAsConst(persistent.indexes)) { + for (QPersistentModelIndexData *data : qAsConst(persistent.indexes)) data->index = QModelIndex(); - data->model = 0; - } persistent.indexes.clear(); } @@ -530,7 +528,6 @@ void QAbstractItemModelPrivate::invalidatePersistentIndex(const QModelIndex &ind QPersistentModelIndexData *data = *it; persistent.indexes.erase(it); data->index = QModelIndex(); - data->model = 0; } } @@ -863,7 +860,6 @@ void QAbstractItemModelPrivate::rowsRemoved(const QModelIndex &parent, QPersistentModelIndexData *data = *it; persistent.indexes.erase(persistent.indexes.constFind(data->index)); data->index = QModelIndex(); - data->model = 0; } } @@ -958,7 +954,6 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent, QPersistentModelIndexData *data = *it; persistent.indexes.erase(persistent.indexes.constFind(data->index)); data->index = QModelIndex(); - data->model = 0; } } @@ -3294,8 +3289,6 @@ void QAbstractItemModel::changePersistentIndex(const QModelIndex &from, const QM data->index = to; if (to.isValid()) d->persistent.insertMultiAtEnd(to, data); - else - data->model = 0; } } @@ -3328,8 +3321,6 @@ void QAbstractItemModel::changePersistentIndexList(const QModelIndexList &from, data->index = to.at(i); if (data->index.isValid()) toBeReinserted << data; - else - data->model = 0; } } @@ -3959,7 +3950,7 @@ bool QAbstractListModel::dropMimeData(const QMimeData *data, Qt::DropAction acti /*! \internal - QHash::insertMulti insert the value before the old value. and find() return the new value. + QMultiHash::insert inserts the value before the old value. and find() return the new value. We need insertMultiAtEnd because we don't want to overwrite the old one, which should be removed later There should be only one instance QPersistentModelIndexData per index, but in some intermediate state there may be @@ -3969,9 +3960,9 @@ bool QAbstractListModel::dropMimeData(const QMimeData *data, Qt::DropAction acti */ void QAbstractItemModelPrivate::Persistent::insertMultiAtEnd(const QModelIndex& key, QPersistentModelIndexData *data) { - QHash<QModelIndex,QPersistentModelIndexData *>::iterator newIt = - indexes.insertMulti(key, data); - QHash<QModelIndex,QPersistentModelIndexData *>::iterator it = newIt + 1; + QHash<QModelIndex,QPersistentModelIndexData *>::iterator newIt = indexes.insert(key, data); + QHash<QModelIndex,QPersistentModelIndexData *>::iterator it = newIt; + ++it; while (it != indexes.end() && it.key() == key) { qSwap(*newIt,*it); newIt = it; diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index bec71b0606..c34876d1d6 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -163,6 +163,7 @@ typedef QList<QModelIndex> QModelIndexList; class QMimeData; class QAbstractItemModelPrivate; +class QTransposeProxyModelPrivate; template <class Key, class T> class QMap; @@ -173,6 +174,7 @@ class Q_CORE_EXPORT QAbstractItemModel : public QObject friend class QPersistentModelIndexData; friend class QAbstractItemViewPrivate; friend class QIdentityProxyModel; + friend class QTransposeProxyModelPrivate; public: explicit QAbstractItemModel(QObject *parent = nullptr); @@ -300,7 +302,9 @@ public Q_SLOTS: virtual void revert(); protected Q_SLOTS: - // Qt 6: Make virtual +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + virtual +#endif void resetInternalData(); protected: diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h index 12fd93d217..e6085eca94 100644 --- a/src/corelib/itemmodels/qabstractitemmodel_p.h +++ b/src/corelib/itemmodels/qabstractitemmodel_p.h @@ -65,11 +65,10 @@ QT_REQUIRE_CONFIG(itemmodel); class QPersistentModelIndexData { public: - QPersistentModelIndexData() : model(0) {} - QPersistentModelIndexData(const QModelIndex &idx) : index(idx), model(idx.model()) {} + QPersistentModelIndexData() {} + QPersistentModelIndexData(const QModelIndex &idx) : index(idx) {} QModelIndex index; QAtomicInt ref; - const QAbstractItemModel *model; static QPersistentModelIndexData *create(const QModelIndex &index); static void destroy(QPersistentModelIndexData *data); }; @@ -142,7 +141,7 @@ public: struct Persistent { Persistent() {} - QHash<QModelIndex, QPersistentModelIndexData *> indexes; + QMultiHash<QModelIndex, QPersistentModelIndexData *> indexes; QStack<QVector<QPersistentModelIndexData *> > moved; QStack<QVector<QPersistentModelIndexData *> > invalidated; void insertMultiAtEnd(const QModelIndex& key, QPersistentModelIndexData *data); diff --git a/src/corelib/itemmodels/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp index 62b3ee85b9..c863406afd 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.cpp +++ b/src/corelib/itemmodels/qabstractproxymodel.cpp @@ -313,6 +313,18 @@ bool QAbstractProxyModel::setHeaderData(int section, Qt::Orientation orientation return d->model->setHeaderData(sourceSection, orientation, value, role); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +/*! + \reimp + \since 6.0 + */ +bool QAbstractProxyModel::clearItemData(const QModelIndex &index) +{ + Q_D(QAbstractProxyModel); + return d->model->clearItemData(mapToSource(index)); +} +#endif + /*! \reimp */ diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index 08ecf9d15f..c9a73b6a31 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -78,6 +78,9 @@ public: bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setItemData(const QModelIndex& index, const QMap<int, QVariant> &roles) override; bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool clearItemData(const QModelIndex &index) override; +#endif QModelIndex buddy(const QModelIndex &index) const override; bool canFetchMore(const QModelIndex &parent) const override; diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp new file mode 100644 index 0000000000..bbfe2dce16 --- /dev/null +++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp @@ -0,0 +1,750 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qconcatenatetablesproxymodel.h" +#include <private/qabstractitemmodel_p.h> +#include "qsize.h" +#include "qdebug.h" + +QT_BEGIN_NAMESPACE + +class QConcatenateTablesProxyModelPrivate : public QAbstractItemModelPrivate +{ + Q_DECLARE_PUBLIC(QConcatenateTablesProxyModel); + +public: + QConcatenateTablesProxyModelPrivate(); + + int computeRowsPrior(const QAbstractItemModel *sourceModel) const; + + struct SourceModelForRowResult + { + SourceModelForRowResult() : sourceModel(Q_NULLPTR), sourceRow(-1) {} + QAbstractItemModel *sourceModel; + int sourceRow; + }; + SourceModelForRowResult sourceModelForRow(int row) const; + + void _q_slotRowsAboutToBeInserted(const QModelIndex &, int start, int end); + void _q_slotRowsInserted(const QModelIndex &, int start, int end); + void _q_slotRowsAboutToBeRemoved(const QModelIndex &, int start, int end); + void _q_slotRowsRemoved(const QModelIndex &, int start, int end); + void _q_slotColumnsAboutToBeInserted(const QModelIndex &parent, int start, int end); + void _q_slotColumnsInserted(const QModelIndex &parent, int, int); + void _q_slotColumnsAboutToBeRemoved(const QModelIndex &parent, int start, int end); + void _q_slotColumnsRemoved(const QModelIndex &parent, int, int); + void _q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles); + void _q_slotSourceLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint); + void _q_slotSourceLayoutChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint); + void _q_slotModelAboutToBeReset(); + void _q_slotModelReset(); + int columnCountAfterChange(const QAbstractItemModel *model, int newCount) const; + int calculatedColumnCount() const; + void updateColumnCount(); + bool mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent, + int *sourceRow, int *sourceColumn, QModelIndex *sourceParent, QAbstractItemModel **sourceModel) const; + + QVector<QAbstractItemModel *> m_models; + int m_rowCount; // have to maintain it here since we can't compute during model destruction + int m_columnCount; + + // for columns{AboutToBe,}{Inserted,Removed} + int m_newColumnCount; + + // for layoutAboutToBeChanged/layoutChanged + QVector<QPersistentModelIndex> layoutChangePersistentIndexes; + QVector<QModelIndex> layoutChangeProxyIndexes; +}; + +QConcatenateTablesProxyModelPrivate::QConcatenateTablesProxyModelPrivate() + : m_rowCount(0), + m_columnCount(0), + m_newColumnCount(0) +{ +} + +/*! + \since 5.13 + \class QConcatenateTablesProxyModel + \inmodule QtCore + \brief The QConcatenateTablesProxyModel class proxies multiple source models, concatenating their rows + + \ingroup model-view + + QConcatenateTablesProxyModel takes multiple source models and concatenates their rows. + + In other words, the proxy will have all rows of the first source model, + followed by all rows of the second source model, and so on. + + If the source models don't have the same number of columns, the proxy will only + have as many columns as the source model with the smallest number of columns. + Additional columns in other source models will simply be ignored. + + Source models can be added and removed at runtime, and the column count is adjusted accordingly. + + This proxy does not inherit from QAbstractProxyModel because it uses multiple source + models, rather than a single one. + + Only flat models (lists and tables) are supported, tree models are not. + + \sa QAbstractProxyModel, {Model/View Programming}, QIdentityProxyModel, QAbstractItemModel + */ + + +/*! + Constructs a concatenate-rows proxy model with the given \a parent. +*/ +QConcatenateTablesProxyModel::QConcatenateTablesProxyModel(QObject *parent) + : QAbstractItemModel(*new QConcatenateTablesProxyModelPrivate, parent) +{ +} + +/*! + Destroys this proxy model. +*/ +QConcatenateTablesProxyModel::~QConcatenateTablesProxyModel() +{ +} + +/*! + Returns the proxy index for a given \a sourceIndex, which can be from any of the source models. +*/ +QModelIndex QConcatenateTablesProxyModel::mapFromSource(const QModelIndex &sourceIndex) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (!sourceIndex.isValid()) + return QModelIndex(); + const QAbstractItemModel *sourceModel = sourceIndex.model(); + if (!d->m_models.contains(const_cast<QAbstractItemModel *>(sourceModel))) { + qWarning("QConcatenateTablesProxyModel: index from wrong model passed to mapFromSource"); + Q_ASSERT(!"QConcatenateTablesProxyModel: index from wrong model passed to mapFromSource"); + return QModelIndex(); + } + if (sourceIndex.column() >= d->m_columnCount) + return QModelIndex(); + int rowsPrior = d_func()->computeRowsPrior(sourceModel); + return createIndex(rowsPrior + sourceIndex.row(), sourceIndex.column(), sourceIndex.internalPointer()); +} + +/*! + Returns the source index for a given proxy index. +*/ +QModelIndex QConcatenateTablesProxyModel::mapToSource(const QModelIndex &proxyIndex) const +{ + Q_D(const QConcatenateTablesProxyModel); + Q_ASSERT(checkIndex(proxyIndex)); + if (!proxyIndex.isValid()) + return QModelIndex(); + if (proxyIndex.model() != this) { + qWarning("QConcatenateTablesProxyModel: index from wrong model passed to mapToSource"); + Q_ASSERT(!"QConcatenateTablesProxyModel: index from wrong model passed to mapToSource"); + return QModelIndex(); + } + const int row = proxyIndex.row(); + const auto result = d->sourceModelForRow(row); + if (!result.sourceModel) + return QModelIndex(); + return result.sourceModel->index(result.sourceRow, proxyIndex.column()); +} + +/*! + \reimp +*/ +QVariant QConcatenateTablesProxyModel::data(const QModelIndex &index, int role) const +{ + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(checkIndex(index, CheckIndexOption::IndexIsValid)); + if (!sourceIndex.isValid()) + return QVariant(); + return sourceIndex.data(role); +} + +/*! + \reimp +*/ +bool QConcatenateTablesProxyModel::setData(const QModelIndex &index, const QVariant &value, int role) +{ + Q_ASSERT(checkIndex(index, CheckIndexOption::IndexIsValid)); + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(sourceIndex.isValid()); + const auto sourceModel = const_cast<QAbstractItemModel *>(sourceIndex.model()); + return sourceModel->setData(sourceIndex, value, role); +} + +/*! + \reimp +*/ +QMap<int, QVariant> QConcatenateTablesProxyModel::itemData(const QModelIndex &proxyIndex) const +{ + Q_ASSERT(checkIndex(proxyIndex)); + const QModelIndex sourceIndex = mapToSource(proxyIndex); + Q_ASSERT(sourceIndex.isValid()); + return sourceIndex.model()->itemData(sourceIndex); +} + +/*! + \reimp +*/ +bool QConcatenateTablesProxyModel::setItemData(const QModelIndex &proxyIndex, const QMap<int, QVariant> &roles) +{ + Q_ASSERT(checkIndex(proxyIndex)); + const QModelIndex sourceIndex = mapToSource(proxyIndex); + Q_ASSERT(sourceIndex.isValid()); + const auto sourceModel = const_cast<QAbstractItemModel *>(sourceIndex.model()); + return sourceModel->setItemData(sourceIndex, roles); +} + +/*! + Returns the flags for the given index. + If the index is valid, the flags come from the source model for this index. + If the index is invalid (as used to determine if dropping onto an empty area + in the view is allowed, for instance), the flags from the first model are returned. +*/ +Qt::ItemFlags QConcatenateTablesProxyModel::flags(const QModelIndex &index) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return Qt::NoItemFlags; + Q_ASSERT(checkIndex(index)); + if (!index.isValid()) + return d->m_models.at(0)->flags(index); + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(sourceIndex.isValid()); + return sourceIndex.model()->flags(sourceIndex); +} + +/*! + This method returns the horizontal header data for the first source model, + and the vertical header data for the source model corresponding to each row. + \reimp +*/ +QVariant QConcatenateTablesProxyModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return QVariant(); + switch (orientation) { + case Qt::Horizontal: + return d->m_models.at(0)->headerData(section, orientation, role); + case Qt::Vertical: { + const auto result = d->sourceModelForRow(section); + Q_ASSERT(result.sourceModel); + return result.sourceModel->headerData(result.sourceRow, orientation, role); + } + } + return QVariant(); +} + +/*! + This method returns the column count of the source model with the smallest number of columns. + \reimp +*/ +int QConcatenateTablesProxyModel::columnCount(const QModelIndex &parent) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (parent.isValid()) + return 0; // flat model + return d->m_columnCount; +} + +/*! + \reimp +*/ +QModelIndex QConcatenateTablesProxyModel::index(int row, int column, const QModelIndex &parent) const +{ + Q_D(const QConcatenateTablesProxyModel); + Q_ASSERT(hasIndex(row, column, parent)); + if (!hasIndex(row, column, parent)) + return QModelIndex(); + Q_ASSERT(checkIndex(parent, QAbstractItemModel::CheckIndexOption::ParentIsInvalid)); // flat model + const auto result = d->sourceModelForRow(row); + Q_ASSERT(result.sourceModel); + return mapFromSource(result.sourceModel->index(result.sourceRow, column)); +} + +/*! + \reimp +*/ +QModelIndex QConcatenateTablesProxyModel::parent(const QModelIndex &index) const +{ + Q_UNUSED(index); + return QModelIndex(); // flat model, no hierarchy +} + +/*! + \reimp +*/ +int QConcatenateTablesProxyModel::rowCount(const QModelIndex &parent) const +{ + Q_D(const QConcatenateTablesProxyModel); + Q_ASSERT(checkIndex(parent, QAbstractItemModel::CheckIndexOption::ParentIsInvalid)); // flat model + Q_UNUSED(parent); + return d->m_rowCount; +} + +/*! + This method returns the mime types for the first source model. + \reimp +*/ +QStringList QConcatenateTablesProxyModel::mimeTypes() const +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return QStringList(); + return d->m_models.at(0)->mimeTypes(); +} + +/*! + The call is forwarded to the source model of the first index in the list of \a indexes. + + Important: please note that this proxy only supports dragging a single row. + It will assert if called with indexes from multiple rows, because dragging rows that + might come from different source models cannot be implemented generically by this proxy model. + Each piece of data in the QMimeData needs to be merged, which is data-type-specific. + Reimplement this method in a subclass if you want to support dragging multiple rows. + + \reimp +*/ +QMimeData *QConcatenateTablesProxyModel::mimeData(const QModelIndexList &indexes) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (indexes.isEmpty()) + return nullptr; + const QModelIndex firstIndex = indexes.first(); + Q_ASSERT(checkIndex(firstIndex, CheckIndexOption::IndexIsValid)); + const auto result = d->sourceModelForRow(firstIndex.row()); + QModelIndexList sourceIndexes; + sourceIndexes.reserve(indexes.count()); + for (const QModelIndex &index : indexes) { + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(sourceIndex.model() == result.sourceModel); // see documentation above + sourceIndexes.append(sourceIndex); + } + return result.sourceModel->mimeData(sourceIndexes); +} + + +bool QConcatenateTablesProxyModelPrivate::mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent, + int *sourceRow, int *sourceColumn, QModelIndex *sourceParent, QAbstractItemModel **sourceModel) const +{ + Q_Q(const QConcatenateTablesProxyModel); + *sourceColumn = column; + if (!parent.isValid()) { + // Drop after the last item + if (row == -1 || row == m_rowCount) { + *sourceRow = -1; + *sourceModel = m_models.constLast(); + return true; + } + // Drop between toplevel items + const auto result = sourceModelForRow(row); + Q_ASSERT(result.sourceModel); + *sourceRow = result.sourceRow; + *sourceModel = result.sourceModel; + return true; + } else { + if (row > -1) + return false; // flat model, no dropping as new children of items + // Drop onto item + const int targetRow = parent.row(); + const auto result = sourceModelForRow(targetRow); + Q_ASSERT(result.sourceModel); + const QModelIndex sourceIndex = q->mapToSource(parent); + *sourceRow = -1; + *sourceParent = sourceIndex; + *sourceModel = result.sourceModel; + return true; + } +} + +/*! + \reimp +*/ +bool QConcatenateTablesProxyModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return false; + + int sourceRow, sourceColumn; + QModelIndex sourceParent; + QAbstractItemModel *sourceModel; + if (!d->mapDropCoordinatesToSource(row, column, parent, &sourceRow, &sourceColumn, &sourceParent, &sourceModel)) + return false; + return sourceModel->canDropMimeData(data, action, sourceRow, sourceColumn, sourceParent); +} + +/*! + QConcatenateTablesProxyModel handles dropping onto an item, between items, and after the last item. + In all cases the call is forwarded to the underlying source model. + When dropping onto an item, the source model for this item is called. + When dropping between items, the source model immediately below the drop position is called. + When dropping after the last item, the last source model is called. + + \reimp +*/ +bool QConcatenateTablesProxyModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return false; + int sourceRow, sourceColumn; + QModelIndex sourceParent; + QAbstractItemModel *sourceModel; + if (!d->mapDropCoordinatesToSource(row, column, parent, &sourceRow, &sourceColumn, &sourceParent, &sourceModel)) + return false; + + return sourceModel->dropMimeData(data, action, sourceRow, sourceColumn, sourceParent); +} + +/*! + \reimp +*/ +QSize QConcatenateTablesProxyModel::span(const QModelIndex &index) const +{ + Q_D(const QConcatenateTablesProxyModel); + Q_ASSERT(checkIndex(index)); + if (d->m_models.isEmpty() || !index.isValid()) + return QSize(); + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(sourceIndex.isValid()); + return sourceIndex.model()->span(sourceIndex); +} + +/*! + Adds a source model \a sourceModel, below all previously added source models. + + The ownership of \a sourceModel is not affected by this. + + The same source model cannot be added more than once. + */ +void QConcatenateTablesProxyModel::addSourceModel(QAbstractItemModel *sourceModel) +{ + Q_D(QConcatenateTablesProxyModel); + Q_ASSERT(sourceModel); + Q_ASSERT(!d->m_models.contains(sourceModel)); + connect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), this, SLOT(_q_slotDataChanged(QModelIndex,QModelIndex,QVector<int>))); + connect(sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(_q_slotRowsInserted(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(_q_slotRowsRemoved(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(_q_slotRowsAboutToBeInserted(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(_q_slotRowsAboutToBeRemoved(QModelIndex,int,int))); + + connect(sourceModel, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(_q_slotColumnsInserted(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(_q_slotColumnsRemoved(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(_q_slotColumnsAboutToBeInserted(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(_q_slotColumnsAboutToBeRemoved(QModelIndex,int,int))); + + connect(sourceModel, SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)), + this, SLOT(_q_slotSourceLayoutAboutToBeChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint))); + connect(sourceModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)), + this, SLOT(_q_slotSourceLayoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint))); + connect(sourceModel, SIGNAL(modelAboutToBeReset()), this, SLOT(_q_slotModelAboutToBeReset())); + connect(sourceModel, SIGNAL(modelReset()), this, SLOT(_q_slotModelReset())); + + const int newRows = sourceModel->rowCount(); + if (newRows > 0) + beginInsertRows(QModelIndex(), d->m_rowCount, d->m_rowCount + newRows - 1); + d->m_rowCount += newRows; + d->m_models.append(sourceModel); + if (newRows > 0) + endInsertRows(); + + d->updateColumnCount(); +} + +/*! + Removes the source model \a sourceModel, which was previously added to this proxy. + + The ownership of \a sourceModel is not affected by this. +*/ +void QConcatenateTablesProxyModel::removeSourceModel(QAbstractItemModel *sourceModel) +{ + Q_D(QConcatenateTablesProxyModel); + Q_ASSERT(d->m_models.contains(sourceModel)); + disconnect(sourceModel, 0, this, 0); + + const int rowsRemoved = sourceModel->rowCount(); + const int rowsPrior = d->computeRowsPrior(sourceModel); // location of removed section + + if (rowsRemoved > 0) + beginRemoveRows(QModelIndex(), rowsPrior, rowsPrior + rowsRemoved - 1); + d->m_models.removeOne(sourceModel); + d->m_rowCount -= rowsRemoved; + if (rowsRemoved > 0) + endRemoveRows(); + + d->updateColumnCount(); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotRowsAboutToBeInserted(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // not supported, the proxy is a flat model + return; + const QAbstractItemModel * const model = static_cast<QAbstractItemModel *>(q->sender()); + const int rowsPrior = computeRowsPrior(model); + q->beginInsertRows(QModelIndex(), rowsPrior + start, rowsPrior + end); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotRowsInserted(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + m_rowCount += end - start + 1; + q->endInsertRows(); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + const QAbstractItemModel * const model = static_cast<QAbstractItemModel *>(q->sender()); + const int rowsPrior = computeRowsPrior(model); + q->beginRemoveRows(QModelIndex(), rowsPrior + start, rowsPrior + end); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotRowsRemoved(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + m_rowCount -= end - start + 1; + q->endRemoveRows(); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotColumnsAboutToBeInserted(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + const QAbstractItemModel * const model = static_cast<QAbstractItemModel *>(q->sender()); + const int oldColCount = model->columnCount(); + const int newColCount = columnCountAfterChange(model, oldColCount + end - start + 1); + Q_ASSERT(newColCount >= oldColCount); + if (newColCount > oldColCount) + // If the underlying models have a different number of columns (example: 2 and 3), inserting 2 columns in + // the first model leads to inserting only one column in the proxy, since qMin(2+2,3) == 3. + q->beginInsertColumns(QModelIndex(), start, qMin(end, start + newColCount - oldColCount - 1)); + m_newColumnCount = newColCount; +} + +void QConcatenateTablesProxyModelPrivate::_q_slotColumnsInserted(const QModelIndex &parent, int start, int end) +{ + Q_UNUSED(start); + Q_UNUSED(end); + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + if (m_newColumnCount != m_columnCount) { + m_columnCount = m_newColumnCount; + q->endInsertColumns(); + } +} + +void QConcatenateTablesProxyModelPrivate::_q_slotColumnsAboutToBeRemoved(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + const QAbstractItemModel * const model = static_cast<QAbstractItemModel *>(q->sender()); + const int oldColCount = model->columnCount(); + const int newColCount = columnCountAfterChange(model, oldColCount - (end - start + 1)); + Q_ASSERT(newColCount <= oldColCount); + if (newColCount < oldColCount) + q->beginRemoveColumns(QModelIndex(), start, qMax(end, start + oldColCount - newColCount - 1)); + m_newColumnCount = newColCount; +} + +void QConcatenateTablesProxyModelPrivate::_q_slotColumnsRemoved(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + Q_UNUSED(start); + Q_UNUSED(end); + if (parent.isValid()) // flat model + return; + if (m_newColumnCount != m_columnCount) { + m_columnCount = m_newColumnCount; + q->endRemoveColumns(); + } +} + +void QConcatenateTablesProxyModelPrivate::_q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles) +{ + Q_Q(QConcatenateTablesProxyModel); + Q_ASSERT(from.isValid()); + Q_ASSERT(to.isValid()); + const QModelIndex myFrom = q->mapFromSource(from); + Q_ASSERT(q->checkIndex(myFrom, QAbstractItemModel::CheckIndexOption::IndexIsValid)); + const QModelIndex myTo = q->mapFromSource(to); + Q_ASSERT(q->checkIndex(myTo, QAbstractItemModel::CheckIndexOption::IndexIsValid)); + emit q->dataChanged(myFrom, myTo, roles); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotSourceLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint) +{ + Q_Q(QConcatenateTablesProxyModel); + + if (!sourceParents.isEmpty() && !sourceParents.contains(QModelIndex())) + return; + + emit q->layoutAboutToBeChanged({}, hint); + + const QModelIndexList persistentIndexList = q->persistentIndexList(); + layoutChangePersistentIndexes.reserve(persistentIndexList.size()); + layoutChangeProxyIndexes.reserve(persistentIndexList.size()); + + for (const QPersistentModelIndex &proxyPersistentIndex : persistentIndexList) { + layoutChangeProxyIndexes.append(proxyPersistentIndex); + Q_ASSERT(proxyPersistentIndex.isValid()); + const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex); + Q_ASSERT(srcPersistentIndex.isValid()); + layoutChangePersistentIndexes << srcPersistentIndex; + } +} + +void QConcatenateTablesProxyModelPrivate::_q_slotSourceLayoutChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint) +{ + Q_Q(QConcatenateTablesProxyModel); + if (!sourceParents.isEmpty() && !sourceParents.contains(QModelIndex())) + return; + for (int i = 0; i < layoutChangeProxyIndexes.size(); ++i) { + const QModelIndex proxyIdx = layoutChangeProxyIndexes.at(i); + const QModelIndex newProxyIdx = q->mapFromSource(layoutChangePersistentIndexes.at(i)); + q->changePersistentIndex(proxyIdx, newProxyIdx); + } + + layoutChangePersistentIndexes.clear(); + layoutChangeProxyIndexes.clear(); + + emit q->layoutChanged({}, hint); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotModelAboutToBeReset() +{ + Q_Q(QConcatenateTablesProxyModel); + Q_ASSERT(m_models.contains(const_cast<QAbstractItemModel *>(static_cast<const QAbstractItemModel *>(q->sender())))); + q->beginResetModel(); + // A reset might reduce both rowCount and columnCount, and we can't notify of both at the same time, + // and notifying of one after the other leaves an intermediary invalid situation. + // So the only safe choice is to forward it as a full reset. +} + +void QConcatenateTablesProxyModelPrivate::_q_slotModelReset() +{ + Q_Q(QConcatenateTablesProxyModel); + Q_ASSERT(m_models.contains(const_cast<QAbstractItemModel *>(static_cast<const QAbstractItemModel *>(q->sender())))); + m_columnCount = calculatedColumnCount(); + m_rowCount = computeRowsPrior(nullptr); + q->endResetModel(); +} + +int QConcatenateTablesProxyModelPrivate::calculatedColumnCount() const +{ + if (m_models.isEmpty()) + return 0; + + const auto it = std::min_element(m_models.begin(), m_models.end(), [](const QAbstractItemModel* model1, const QAbstractItemModel* model2) { + return model1->columnCount() < model2->columnCount(); + }); + return (*it)->columnCount(); +} + +void QConcatenateTablesProxyModelPrivate::updateColumnCount() +{ + Q_Q(QConcatenateTablesProxyModel); + const int newColumnCount = calculatedColumnCount(); + const int columnDiff = newColumnCount - m_columnCount; + if (columnDiff > 0) { + q->beginInsertColumns(QModelIndex(), m_columnCount, m_columnCount + columnDiff - 1); + m_columnCount = newColumnCount; + q->endInsertColumns(); + } else if (columnDiff < 0) { + const int lastColumn = m_columnCount - 1; + q->beginRemoveColumns(QModelIndex(), lastColumn + columnDiff + 1, lastColumn); + m_columnCount = newColumnCount; + q->endRemoveColumns(); + } +} + +int QConcatenateTablesProxyModelPrivate::columnCountAfterChange(const QAbstractItemModel *model, int newCount) const +{ + int newColumnCount = 0; + for (int i = 0; i < m_models.count(); ++i) { + const QAbstractItemModel *mod = m_models.at(i); + const int colCount = mod == model ? newCount : mod->columnCount(); + if (i == 0) + newColumnCount = colCount; + else + newColumnCount = qMin(colCount, newColumnCount); + } + return newColumnCount; +} + +int QConcatenateTablesProxyModelPrivate::computeRowsPrior(const QAbstractItemModel *sourceModel) const +{ + int rowsPrior = 0; + for (const QAbstractItemModel *model : m_models) { + if (model == sourceModel) + break; + rowsPrior += model->rowCount(); + } + return rowsPrior; +} + +QConcatenateTablesProxyModelPrivate::SourceModelForRowResult QConcatenateTablesProxyModelPrivate::sourceModelForRow(int row) const +{ + QConcatenateTablesProxyModelPrivate::SourceModelForRowResult result; + int rowCount = 0; + for (QAbstractItemModel *model : m_models) { + const int subRowCount = model->rowCount(); + if (rowCount + subRowCount > row) { + result.sourceModel = model; + break; + } + rowCount += subRowCount; + } + result.sourceRow = row - rowCount; + return result; +} + +QT_END_NAMESPACE + +#include "moc_qconcatenatetablesproxymodel.cpp" diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.h b/src/corelib/itemmodels/qconcatenatetablesproxymodel.h new file mode 100644 index 0000000000..85fc6a9c72 --- /dev/null +++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.h @@ -0,0 +1,100 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCONCATENATEROWSPROXYMODEL_H +#define QCONCATENATEROWSPROXYMODEL_H + +#include <QtCore/qabstractitemmodel.h> + +QT_BEGIN_NAMESPACE + +class QConcatenateTablesProxyModelPrivate; + +class Q_CORE_EXPORT QConcatenateTablesProxyModel : public QAbstractItemModel +{ + Q_OBJECT + +public: + explicit QConcatenateTablesProxyModel(QObject *parent = nullptr); + ~QConcatenateTablesProxyModel(); + + Q_SCRIPTABLE void addSourceModel(QAbstractItemModel *sourceModel); + Q_SCRIPTABLE void removeSourceModel(QAbstractItemModel *sourceModel); + + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const; + QModelIndex mapToSource(const QModelIndex &proxyIndex) const; + + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + QMap<int, QVariant> itemData(const QModelIndex &proxyIndex) const override; + bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; + QSize span(const QModelIndex &index) const override; + +private: + Q_DECLARE_PRIVATE(QConcatenateTablesProxyModel) + Q_DISABLE_COPY(QConcatenateTablesProxyModel) + + Q_PRIVATE_SLOT(d_func(), void _q_slotRowsAboutToBeInserted(const QModelIndex &, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotRowsInserted(const QModelIndex &, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotRowsAboutToBeRemoved(const QModelIndex &, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotRowsRemoved(const QModelIndex &, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotColumnsAboutToBeInserted(const QModelIndex &parent, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotColumnsInserted(const QModelIndex &parent, int, int)) + Q_PRIVATE_SLOT(d_func(), void _q_slotColumnsAboutToBeRemoved(const QModelIndex &parent, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotColumnsRemoved(const QModelIndex &parent, int, int)) + Q_PRIVATE_SLOT(d_func(), void _q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles)) + Q_PRIVATE_SLOT(d_func(), void _q_slotSourceLayoutAboutToBeChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)) + Q_PRIVATE_SLOT(d_func(), void _q_slotSourceLayoutChanged(const QList<QPersistentModelIndex> &, QAbstractItemModel::LayoutChangeHint)) + Q_PRIVATE_SLOT(d_func(), void _q_slotModelAboutToBeReset()) + Q_PRIVATE_SLOT(d_func(), void _q_slotModelReset()) +}; + +QT_END_NAMESPACE + +#endif // QCONCATENATEROWSPROXYMODEL_H diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 87960b0863..d13e6199db 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -424,7 +424,7 @@ public: void updateChildrenMapping(const QModelIndex &source_parent, Mapping *parent_mapping, Qt::Orientation orient, int start, int end, int delta_item_count, bool remove); - virtual void _q_sourceModelDestroyed() override; + void _q_sourceModelDestroyed() override; bool needsReorder(const QVector<int> &source_rows, const QModelIndex &source_parent) const; diff --git a/src/corelib/itemmodels/qstringlistmodel.cpp b/src/corelib/itemmodels/qstringlistmodel.cpp index f92a0d6676..a248cdcd38 100644 --- a/src/corelib/itemmodels/qstringlistmodel.cpp +++ b/src/corelib/itemmodels/qstringlistmodel.cpp @@ -136,6 +136,42 @@ QModelIndex QStringListModel::sibling(int row, int column, const QModelIndex &id } /*! + \reimp + \since 5.13 +*/ +QMap<int, QVariant> QStringListModel::itemData(const QModelIndex &index) const +{ + if (!checkIndex(index, CheckIndexOption::IndexIsValid | CheckIndexOption::ParentIsInvalid)) + return QMap<int, QVariant>{}; + const QVariant displayData = lst.at(index.row()); + return QMap<int, QVariant>{{ + std::make_pair<int>(Qt::DisplayRole, displayData), + std::make_pair<int>(Qt::EditRole, displayData) + }}; +} + +/*! + \reimp + \since 5.13 + If \a roles contains both Qt::DisplayRole and Qt::EditRole, the latter will take precedence +*/ +bool QStringListModel::setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) +{ + if (roles.isEmpty()) + return false; + if (std::any_of(roles.keyBegin(), roles.keyEnd(), [](int role) -> bool { + return role != Qt::DisplayRole && role != Qt::EditRole; + })) { + return false; + } + auto roleIter = roles.constFind(Qt::EditRole); + if (roleIter == roles.constEnd()) + roleIter = roles.constFind(Qt::DisplayRole); + Q_ASSERT(roleIter != roles.constEnd()); + return setData(index, roleIter.value(), roleIter.key()); +} + +/*! Returns data for the specified \a role, from the item with the given \a index. @@ -188,18 +224,23 @@ bool QStringListModel::setData(const QModelIndex &index, const QVariant &value, if (lst.at(index.row()) == valueString) return true; lst.replace(index.row(), valueString); - QVector<int> roles; - roles.reserve(2); - roles.append(Qt::DisplayRole); - roles.append(Qt::EditRole); - emit dataChanged(index, index, roles); - // once Q_COMPILER_UNIFORM_INIT can be used, change to: - // emit dataChanged(index, index, {Qt::DisplayRole, Qt::EditRole}); + emit dataChanged(index, index, {Qt::DisplayRole, Qt::EditRole}); return true; } return false; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +/*! + \reimp + \since 6.0 + */ +bool QStringListModel::clearItemData(const QModelIndex &index) +{ + return setData(index, QVariant(), Qt::EditRole); +} +#endif + /*! Inserts \a count rows into the model, beginning at the given \a row. @@ -252,6 +293,38 @@ bool QStringListModel::removeRows(int row, int count, const QModelIndex &parent) return true; } +/*! + \since 5.13 + \reimp +*/ +bool QStringListModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) +{ + if (sourceRow < 0 + || sourceRow + count - 1 >= rowCount(sourceParent) + || destinationChild <= 0 + || destinationChild > rowCount(destinationParent) + || sourceRow == destinationChild - 1 + || count <= 0) { + return false; + } + if (!beginMoveRows(QModelIndex(), sourceRow, sourceRow + count - 1, QModelIndex(), destinationChild)) + return false; + /* + QList::move assumes that the second argument is the index where the item will end up to + i.e. the valid range for that argument is from 0 to QList::size()-1 + QAbstractItemModel::moveRows when source and destinations have the same parent assumes that + the item will end up being in the row BEFORE the one indicated by destinationChild + i.e. the valid range for that argument is from 1 to QList::size() + For this reason we remove 1 from destinationChild when using it inside QList + */ + destinationChild--; + const int fromRow = destinationChild < sourceRow ? (sourceRow + count - 1) : sourceRow; + while (count--) + lst.move(fromRow, destinationChild); + endMoveRows(); + return true; +} + static bool ascendingLessThan(const QPair<QString, int> &s1, const QPair<QString, int> &s2) { return s1.first < s2.first; diff --git a/src/corelib/itemmodels/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h index 53376285c6..86725ea80b 100644 --- a/src/corelib/itemmodels/qstringlistmodel.h +++ b/src/corelib/itemmodels/qstringlistmodel.h @@ -59,11 +59,18 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool clearItemData(const QModelIndex &index) override; +#endif Qt::ItemFlags flags(const QModelIndex &index) const override; bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override; + + QMap<int, QVariant> itemData(const QModelIndex &index) const override; + bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) override; void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; diff --git a/src/corelib/itemmodels/qtransposeproxymodel.cpp b/src/corelib/itemmodels/qtransposeproxymodel.cpp new file mode 100644 index 0000000000..dd84b97118 --- /dev/null +++ b/src/corelib/itemmodels/qtransposeproxymodel.cpp @@ -0,0 +1,446 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Luca Beldi <v.ronin@yahoo.it> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qtransposeproxymodel.h" +#include <private/qtransposeproxymodel_p.h> +#include <QtCore/qvector.h> +#include <QtCore/qmetaobject.h> +#include <QtCore/qsize.h> + +QT_BEGIN_NAMESPACE + +QModelIndex QTransposeProxyModelPrivate::uncheckedMapToSource(const QModelIndex &proxyIndex) const +{ + if (!model || !proxyIndex.isValid()) + return QModelIndex(); + if (proxyIndex.internalPointer()) + return model->createIndex(proxyIndex.column(), proxyIndex.row(), proxyIndex.internalPointer()); + return model->index(proxyIndex.column(), proxyIndex.row()); +} + +QModelIndex QTransposeProxyModelPrivate::uncheckedMapFromSource(const QModelIndex &sourceIndex) const +{ + if (!model || !sourceIndex.isValid()) + return QModelIndex(); + Q_Q(const QTransposeProxyModel); + return q->createIndex(sourceIndex.column(), sourceIndex.row(), sourceIndex.internalPointer()); +} + +void QTransposeProxyModelPrivate::onLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint) +{ + Q_Q(QTransposeProxyModel); + QModelIndexList toList; + toList.reserve(layoutChangePersistentIndexes.size()); + for (const QPersistentModelIndex &persistIdx : qAsConst(layoutChangePersistentIndexes)) + toList << q->mapFromSource(persistIdx); + q->changePersistentIndexList(layoutChangeProxyIndexes, toList); + layoutChangeProxyIndexes.clear(); + layoutChangePersistentIndexes.clear(); + QList<QPersistentModelIndex> proxyParents; + proxyParents.reserve(parents.size()); + for (const QPersistentModelIndex &srcParent : parents) + proxyParents << q->mapFromSource(srcParent); + QAbstractItemModel::LayoutChangeHint proxyHint = QAbstractItemModel::NoLayoutChangeHint; + if (hint == QAbstractItemModel::VerticalSortHint) + proxyHint = QAbstractItemModel::HorizontalSortHint; + else if (hint == QAbstractItemModel::HorizontalSortHint) + proxyHint = QAbstractItemModel::VerticalSortHint; + q->layoutChanged(proxyParents, proxyHint); +} + +void QTransposeProxyModelPrivate::onLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint) +{ + Q_Q(QTransposeProxyModel); + const QModelIndexList proxyPersistentIndexes = q->persistentIndexList(); + layoutChangeProxyIndexes.clear(); + layoutChangePersistentIndexes.clear(); + layoutChangeProxyIndexes.reserve(proxyPersistentIndexes.size()); + layoutChangePersistentIndexes.reserve(proxyPersistentIndexes.size()); + for (const QPersistentModelIndex &proxyPersistentIndex : proxyPersistentIndexes) { + layoutChangeProxyIndexes << proxyPersistentIndex; + Q_ASSERT(proxyPersistentIndex.isValid()); + const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex); + Q_ASSERT(srcPersistentIndex.isValid()); + layoutChangePersistentIndexes << srcPersistentIndex; + } + QList<QPersistentModelIndex> proxyParents; + proxyParents.reserve(parents.size()); + for (auto& srcParent : parents) + proxyParents << q->mapFromSource(srcParent); + QAbstractItemModel::LayoutChangeHint proxyHint = QAbstractItemModel::NoLayoutChangeHint; + if (hint == QAbstractItemModel::VerticalSortHint) + proxyHint = QAbstractItemModel::HorizontalSortHint; + else if (hint == QAbstractItemModel::HorizontalSortHint) + proxyHint = QAbstractItemModel::VerticalSortHint; + q->layoutAboutToBeChanged(proxyParents, proxyHint); +} + +void QTransposeProxyModelPrivate::onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles) +{ + Q_Q(QTransposeProxyModel); + q->dataChanged(q->mapFromSource(topLeft), q->mapFromSource(bottomRight), roles); +} + +void QTransposeProxyModelPrivate::onHeaderDataChanged(Qt::Orientation orientation, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->headerDataChanged(orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal, first, last); +} + +void QTransposeProxyModelPrivate::onColumnsAboutToBeInserted(const QModelIndex &parent, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->beginInsertRows(q->mapFromSource(parent), first, last); +} + +void QTransposeProxyModelPrivate::onColumnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->beginRemoveRows(q->mapFromSource(parent), first, last); +} + +void QTransposeProxyModelPrivate::onColumnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) +{ + Q_Q(QTransposeProxyModel); + q->beginMoveRows(q->mapFromSource(sourceParent), sourceStart, sourceEnd, q->mapFromSource(destinationParent), destinationColumn); +} + +void QTransposeProxyModelPrivate::onRowsAboutToBeInserted(const QModelIndex &parent, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->beginInsertColumns(q->mapFromSource(parent), first, last); +} + +void QTransposeProxyModelPrivate::onRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->beginRemoveColumns(q->mapFromSource(parent), first, last); +} + +void QTransposeProxyModelPrivate::onRowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) +{ + Q_Q(QTransposeProxyModel); + q->beginMoveColumns(q->mapFromSource(sourceParent), sourceStart, sourceEnd, q->mapFromSource(destinationParent), destinationRow); +} + +/*! + \since 5.13 + \class QTransposeProxyModel + \brief This proxy transposes the source model + \details This model will make the rows of the source model become columns of the proxy model and vice-versa. + + If the model is a tree, the parents will be transposed as well. For example, if an index in the source model had parent `index(2,0)`, it will have parent `index(0,2)` in the proxy. +*/ + +/*! + Constructs a new proxy model with the given \a parent. +*/ +QTransposeProxyModel::QTransposeProxyModel(QObject* parent) + : QAbstractProxyModel(*new QTransposeProxyModelPrivate, parent) +{} + +/*! + Destructs the proxy model. +*/ +QTransposeProxyModel::~QTransposeProxyModel() = default; + +/*! + \internal +*/ +QTransposeProxyModel::QTransposeProxyModel(QTransposeProxyModelPrivate &dd, QObject *parent) + : QAbstractProxyModel(dd, parent) +{} + +/*! + \reimp +*/ +void QTransposeProxyModel::setSourceModel(QAbstractItemModel* newSourceModel) +{ + Q_D(QTransposeProxyModel); + if (newSourceModel == d->model) + return; + beginResetModel(); + if (d->model) { + for (const QMetaObject::Connection& discIter : qAsConst(d->sourceConnections)) + disconnect(discIter); + } + d->sourceConnections.clear(); + QAbstractProxyModel::setSourceModel(newSourceModel); + if (d->model) { + using namespace std::placeholders; + d->sourceConnections = QVector<QMetaObject::Connection>{ + connect(d->model, &QAbstractItemModel::modelAboutToBeReset, this, &QTransposeProxyModel::beginResetModel), + connect(d->model, &QAbstractItemModel::modelReset, this, &QTransposeProxyModel::endResetModel), + connect(d->model, &QAbstractItemModel::dataChanged, this, std::bind(&QTransposeProxyModelPrivate::onDataChanged, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::headerDataChanged, this, std::bind(&QTransposeProxyModelPrivate::onHeaderDataChanged, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::columnsAboutToBeInserted, this, std::bind(&QTransposeProxyModelPrivate::onColumnsAboutToBeInserted, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::columnsAboutToBeMoved, this, std::bind(&QTransposeProxyModelPrivate::onColumnsAboutToBeMoved, d, _1, _2, _3, _4, _5)), + connect(d->model, &QAbstractItemModel::columnsAboutToBeRemoved, this, std::bind(&QTransposeProxyModelPrivate::onColumnsAboutToBeRemoved, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::columnsInserted, this, &QTransposeProxyModel::endInsertRows), + connect(d->model, &QAbstractItemModel::columnsRemoved, this, &QTransposeProxyModel::endRemoveRows), + connect(d->model, &QAbstractItemModel::columnsMoved, this, &QTransposeProxyModel::endMoveRows), + connect(d->model, &QAbstractItemModel::rowsAboutToBeInserted, this, std::bind(&QTransposeProxyModelPrivate::onRowsAboutToBeInserted, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::rowsAboutToBeMoved, this, std::bind(&QTransposeProxyModelPrivate::onRowsAboutToBeMoved, d, _1, _2, _3, _4, _5)), + connect(d->model, &QAbstractItemModel::rowsAboutToBeRemoved, this, std::bind(&QTransposeProxyModelPrivate::onRowsAboutToBeRemoved, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::rowsInserted, this, &QTransposeProxyModel::endInsertColumns), + connect(d->model, &QAbstractItemModel::rowsRemoved, this, &QTransposeProxyModel::endRemoveColumns), + connect(d->model, &QAbstractItemModel::rowsMoved, this, &QTransposeProxyModel::endMoveColumns), + connect(d->model, &QAbstractItemModel::layoutAboutToBeChanged, this, std::bind(&QTransposeProxyModelPrivate::onLayoutAboutToBeChanged, d, _1, _2)), + connect(d->model, &QAbstractItemModel::layoutChanged, this, std::bind(&QTransposeProxyModelPrivate::onLayoutChanged, d, _1, _2)) + }; + } + endResetModel(); +} + +/*! + \reimp +*/ +int QTransposeProxyModel::rowCount(const QModelIndex &parent) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model) + return 0; + Q_ASSERT(checkIndex(parent)); + return d->model->columnCount(mapToSource(parent)); +} + +/*! + \reimp +*/ +int QTransposeProxyModel::columnCount(const QModelIndex &parent) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model) + return 0; + Q_ASSERT(checkIndex(parent)); + return d->model->rowCount(mapToSource(parent)); +} + +/*! + \reimp +*/ +QVariant QTransposeProxyModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model) + return QVariant(); + return d->model->headerData(section, orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal, role); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role) +{ + Q_D(QTransposeProxyModel); + if (!d->model) + return false; + return d->model->setHeaderData(section, orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal, value, role); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(index)); + if (!d->model || !index.isValid()) + return false; + return d->model->setItemData(mapToSource(index), roles); +} + +/*! + \reimp +*/ +QSize QTransposeProxyModel::span(const QModelIndex &index) const +{ + Q_D(const QTransposeProxyModel); + Q_ASSERT(checkIndex(index)); + if (!d->model || !index.isValid()) + return QSize(); + return d->model->span(mapToSource(index)).transposed(); +} + +/*! + \reimp +*/ +QMap<int, QVariant> QTransposeProxyModel::itemData(const QModelIndex &index) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model) + return QMap<int, QVariant>(); + Q_ASSERT(checkIndex(index)); + return d->model->itemData(mapToSource(index)); +} + +/*! + \reimp +*/ +QModelIndex QTransposeProxyModel::mapFromSource(const QModelIndex &sourceIndex) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model || !sourceIndex.isValid()) + return QModelIndex(); + Q_ASSERT(d->model->checkIndex(sourceIndex)); + return d->uncheckedMapFromSource(sourceIndex); +} + +/*! + \reimp +*/ +QModelIndex QTransposeProxyModel::mapToSource(const QModelIndex &proxyIndex) const +{ + Q_D(const QTransposeProxyModel); + Q_ASSERT(checkIndex(proxyIndex)); + if (!d->model || !proxyIndex.isValid()) + return QModelIndex(); + return d->uncheckedMapToSource(proxyIndex); +} + +/*! + \reimp +*/ +QModelIndex QTransposeProxyModel::parent(const QModelIndex &index) const +{ + Q_D(const QTransposeProxyModel); + Q_ASSERT(checkIndex(index, CheckIndexOption::DoNotUseParent)); + if (!d->model || !index.isValid()) + return QModelIndex(); + return d->uncheckedMapFromSource(d->uncheckedMapToSource(index).parent()); +} + +/*! + \reimp +*/ +QModelIndex QTransposeProxyModel::index(int row, int column, const QModelIndex &parent) const +{ + Q_D(const QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return QModelIndex(); + return mapFromSource(d->model->index(column, row, mapToSource(parent))); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::insertRows(int row, int count, const QModelIndex &parent) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return false; + return d->model->insertColumns(row, count, mapToSource(parent)); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::removeRows(int row, int count, const QModelIndex &parent) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return false; + return d->model->removeColumns(row, count, mapToSource(parent)); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(sourceParent)); + Q_ASSERT(checkIndex(destinationParent)); + if (!d->model) + return false; + return d->model->moveColumns(mapToSource(sourceParent), sourceRow, count, mapToSource(destinationParent), destinationChild); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::insertColumns(int column, int count, const QModelIndex &parent) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return false; + return d->model->insertRows(column, count, mapToSource(parent)); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::removeColumns(int column, int count, const QModelIndex &parent) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return false; + return d->model->removeRows(column, count, mapToSource(parent)); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(sourceParent)); + Q_ASSERT(checkIndex(destinationParent)); + if (!d->model) + return false; + return d->model->moveRows(mapToSource(sourceParent), sourceRow, count, mapToSource(destinationParent), destinationChild); +} + +/*! + \reimp + This method will perform no action. Use a QSortFilterProxyModel on top of this one if you require sorting. +*/ +void QTransposeProxyModel::sort(int column, Qt::SortOrder order) +{ + Q_UNUSED(column) + Q_UNUSED(order) + return; +} + +QT_END_NAMESPACE diff --git a/src/corelib/itemmodels/qtransposeproxymodel.h b/src/corelib/itemmodels/qtransposeproxymodel.h new file mode 100644 index 0000000000..879266d931 --- /dev/null +++ b/src/corelib/itemmodels/qtransposeproxymodel.h @@ -0,0 +1,83 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Luca Beldi <v.ronin@yahoo.it> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTRANSPOSEPROXYMODEL_H +#define QTRANSPOSEPROXYMODEL_H + +#include <QtCore/qabstractproxymodel.h> +#include <QtCore/qscopedpointer.h> + +QT_BEGIN_NAMESPACE + +class QTransposeProxyModelPrivate; + +class Q_CORE_EXPORT QTransposeProxyModel : public QAbstractProxyModel +{ + Q_OBJECT + Q_DISABLE_COPY(QTransposeProxyModel) + Q_DECLARE_PRIVATE(QTransposeProxyModel) +public: + explicit QTransposeProxyModel(QObject* parent = nullptr); + ~QTransposeProxyModel(); + void setSourceModel(QAbstractItemModel* newSourceModel) override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole) override; + bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) override; + QSize span(const QModelIndex &index) const override; + QMap<int, QVariant> itemData(const QModelIndex &index) const override; + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override; + QModelIndex mapToSource(const QModelIndex &proxyIndex) const override; + QModelIndex parent(const QModelIndex &index) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override; + bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; + bool moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) override; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; +protected: + QTransposeProxyModel(QTransposeProxyModelPrivate &, QObject *parent); +}; + +QT_END_NAMESPACE + +#endif // QTRANSPOSEPROXYMODEL_H diff --git a/src/corelib/itemmodels/qtransposeproxymodel_p.h b/src/corelib/itemmodels/qtransposeproxymodel_p.h new file mode 100644 index 0000000000..fb5ce5c117 --- /dev/null +++ b/src/corelib/itemmodels/qtransposeproxymodel_p.h @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Luca Beldi <v.ronin@yahoo.it> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTRANSPOSEPROXYMODEL_P_H +#define QTRANSPOSEPROXYMODEL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qtransposeproxymodel.h" +#include <private/qabstractproxymodel_p.h> + +QT_BEGIN_NAMESPACE + +class QTransposeProxyModelPrivate : public QAbstractProxyModelPrivate +{ + Q_DECLARE_PUBLIC(QTransposeProxyModel) + Q_DISABLE_COPY(QTransposeProxyModelPrivate) +private: + QTransposeProxyModelPrivate() = default; + QVector<QMetaObject::Connection> sourceConnections; + QVector<QPersistentModelIndex> layoutChangePersistentIndexes; + QModelIndexList layoutChangeProxyIndexes; + QModelIndex uncheckedMapToSource(const QModelIndex &proxyIndex) const; + QModelIndex uncheckedMapFromSource(const QModelIndex &sourceIndex) const; + void onLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint); + void onLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint); + void onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles); + void onHeaderDataChanged(Qt::Orientation orientation, int first, int last); + void onColumnsAboutToBeInserted(const QModelIndex &parent, int first, int last); + void onColumnsAboutToBeRemoved(const QModelIndex &parent, int first, int last); + void onColumnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn); + void onRowsAboutToBeInserted(const QModelIndex &parent, int first, int last); + void onRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last); + void onRowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow); +}; + +QT_END_NAMESPACE + +#endif //QTRANSPOSEPROXYMODEL_P_H diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index b6b4da3885..e5098b8415 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1265,7 +1265,11 @@ bool QCoreApplication::closingDown() \l{QCoreApplication::sendPostedEvents()}{sendPostedEvents()} from within that local loop. - Calling this function processes events only for the calling thread. + Calling this function processes events only for the calling thread, + and returns after all available events have been processed. Available + events are events queued before the function call. This means that + events that are posted while the function runs will be queued until + a later round of event processing. \threadsafe @@ -1282,7 +1286,7 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags) /*! \overload processEvents() - Processes pending events for the calling thread for \a maxtime + Processes pending events for the calling thread for \a ms milliseconds or until there are no more events to process, whichever is shorter. @@ -1291,11 +1295,14 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags) Calling this function processes events only for the calling thread. + \note Unlike the \l{QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags)}{processEvents()} + overload, this function also processes events that are posted while the function runs. + \threadsafe \sa exec(), QTimer, QEventLoop::processEvents() */ -void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags, int maxtime) +void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags, int ms) { // ### Qt 6: consider splitting this method into a public and a private // one, so that a user-invoked processEvents can be detected @@ -1306,7 +1313,7 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags, int m QElapsedTimer start; start.start(); while (data->eventDispatcher.load()->processEvents(flags & ~QEventLoop::WaitForMoreEvents)) { - if (start.elapsed() > maxtime) + if (start.elapsed() > ms) break; } } diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 45c6e29e4b..34c2dde6a8 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -86,9 +86,10 @@ static gboolean socketNotifierSourceCheck(GSource *source) p->pollfd.fd, t[int(p->socketNotifier->type())]); // ### note, modifies src->pollfds! p->socketNotifier->setEnabled(false); + i--; + } else { + pending = pending || ((p->pollfd.revents & p->pollfd.events) != 0); } - - pending = ((p->pollfd.revents & p->pollfd.events) != 0); } return pending; diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 0bddf89b15..343ed70196 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -992,8 +992,14 @@ int QEventDispatcherWin32::remainingTime(int timerId) quint64 currentTime = qt_msectime(); for (const WinTimerInfo *t : qAsConst(d->timerVec)) { - if (t && t->timerId == timerId) // timer found, return time to wait - return t->timeout > currentTime ? t->timeout - currentTime : 0; + if (t && t->timerId == timerId) { + // timer found, return time to wait + + if (d->internalHwnd) + return t->timeout > currentTime ? t->timeout - currentTime : 0; + else + return t->interval; + } } #ifndef QT_NO_DEBUG diff --git a/src/corelib/kernel/qjni_p.h b/src/corelib/kernel/qjni_p.h index 52abd51dc1..ec8525e6e1 100644 --- a/src/corelib/kernel/qjni_p.h +++ b/src/corelib/kernel/qjni_p.h @@ -76,7 +76,7 @@ public: private: friend class QAndroidJniEnvironment; - Q_DISABLE_COPY(QJNIEnvironmentPrivate) + Q_DISABLE_COPY_MOVE(QJNIEnvironmentPrivate) JNIEnv *jniEnv; }; diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 5de2717078..8082b7fe9b 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -216,8 +216,8 @@ private: Constructs a new instance of this class. You can pass up to ten arguments (\a val0, \a val1, \a val2, \a val3, \a val4, \a val5, \a val6, \a val7, - \a val8, and \a val9) to the constructor. Returns the new object, or 0 if - no suitable constructor is available. + \a val8, and \a val9) to the constructor. Returns the new object, or + \nullptr if no suitable constructor is available. Note that only constructors that are declared with the Q_INVOKABLE modifier are made available through the meta-object system. @@ -321,8 +321,8 @@ const char *QMetaObject::className() const /*! \fn QMetaObject *QMetaObject::superClass() const - Returns the meta-object of the superclass, or 0 if there is no - such object. + Returns the meta-object of the superclass, or \nullptr if there is + no such object. \sa className() */ @@ -2257,9 +2257,9 @@ bool QMetaMethod::invoke(QObject *object, return false; // check connection type - QThread *currentThread = QThread::currentThread(); - QThread *objectThread = object->thread(); if (connectionType == Qt::AutoConnection) { + QThread *currentThread = QThread::currentThread(); + QThread *objectThread = object->thread(); connectionType = currentThread == objectThread ? Qt::DirectConnection : Qt::QueuedConnection; @@ -2342,6 +2342,8 @@ bool QMetaMethod::invoke(QObject *object, 0, -1, nargs, types, args)); } else { // blocking queued connection #if QT_CONFIG(thread) + QThread *currentThread = QThread::currentThread(); + QThread *objectThread = object->thread(); if (currentThread == objectThread) { qWarning("QMetaMethod::invoke: Dead lock detected in " "BlockingQueuedConnection: Receiver is %s(%p)", @@ -2613,7 +2615,7 @@ int QMetaEnum::keyCount() const } /*! - Returns the key with the given \a index, or 0 if no such key exists. + Returns the key with the given \a index, or \nullptr if no such key exists. \sa keyCount(), value(), valueToKey() */ @@ -2735,7 +2737,7 @@ int QMetaEnum::keyToValue(const char *key, bool *ok) const /*! Returns the string that is used as the name of the given - enumeration \a value, or 0 if \a value is not defined. + enumeration \a value, or \nullptr if \a value is not defined. For flag types, use valueToKeys(). diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h index 115ec835aa..6100835bad 100644 --- a/src/corelib/kernel/qmetaobjectbuilder_p.h +++ b/src/corelib/kernel/qmetaobjectbuilder_p.h @@ -184,7 +184,7 @@ public: #endif private: - Q_DISABLE_COPY(QMetaObjectBuilder) + Q_DISABLE_COPY_MOVE(QMetaObjectBuilder) QMetaObjectBuilderPrivate *d; diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 632b86959d..a1d53be197 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -290,6 +290,10 @@ struct DefinedTypesFilter { \value QJsonObject QJsonObject \value QJsonArray QJsonArray \value QJsonDocument QJsonDocument + \value QCborValue QCborValue + \value QCborArray QCborArray + \value QCborMap QCborMap + \value QCborSimpleType QCborSimpleType \value QModelIndex QModelIndex \value QPersistentModelIndex QPersistentModelIndex (since 5.5) \value QUuid QUuid @@ -373,6 +377,13 @@ struct DefinedTypesFilter { */ /*! + \fn int QMetaType::id() const + \since 5.13 + + Returns id type hold by this QMetatype instance. +*/ + +/*! \fn bool QMetaType::sizeOf() const \since 5.0 @@ -410,8 +421,8 @@ struct DefinedTypesFilter { pointer of this type. (given by QVariant::data for example) If the type is an enumeration, flags() contains QMetaType::IsEnumeration, and this function - returns the QMetaObject of the enclosing object if the enum was registered as a Q_ENUM or 0 - otherwise + returns the QMetaObject of the enclosing object if the enum was registered as a Q_ENUM or + \nullptr otherwise \sa QMetaType::metaObjectForType(), QMetaType::flags() */ @@ -1374,236 +1385,197 @@ int QMetaType::type(const QT_PREPEND_NAMESPACE(QByteArray) &typeName) } #ifndef QT_NO_DATASTREAM -/*! - Writes the object pointed to by \a data with the ID \a type to - the given \a stream. Returns \c true if the object is saved - successfully; otherwise returns \c false. - The type must have been registered with qRegisterMetaType() and - qRegisterMetaTypeStreamOperators() beforehand. +namespace +{ - Normally, you should not need to call this function directly. - Instead, use QVariant's \c operator<<(), which relies on save() - to stream custom types. +template<typename T> +class HasStreamOperator +{ + struct Yes { char unused[1]; }; + struct No { char unused[2]; }; + Q_STATIC_ASSERT(sizeof(Yes) != sizeof(No)); + + template<class C> static decltype(std::declval<QDataStream&>().operator>>(std::declval<C&>()), Yes()) load(int); + template<class C> static decltype(operator>>(std::declval<QDataStream&>(), std::declval<C&>()), Yes()) load(int); + template<class C> static No load(...); + template<class C> static decltype(operator<<(std::declval<QDataStream&>(), std::declval<const C&>()), Yes()) saveFunction(int); + template<class C> static decltype(std::declval<QDataStream&>().operator<<(std::declval<const C&>()), Yes()) saveMethod(int); + template<class C> static No saveMethod(...); + template<class C> static No saveFunction(...); + static constexpr bool LoadValue = QtMetaTypePrivate::TypeDefinition<T>::IsAvailable && (sizeof(load<T>(0)) == sizeof(Yes)); + static constexpr bool SaveValue = QtMetaTypePrivate::TypeDefinition<T>::IsAvailable && + ((sizeof(saveMethod<T>(0)) == sizeof(Yes)) || (sizeof(saveFunction<T>(0)) == sizeof(Yes))); +public: + static constexpr bool Value = LoadValue && SaveValue; +}; - \sa load(), qRegisterMetaTypeStreamOperators() -*/ -bool QMetaType::save(QDataStream &stream, int type, const void *data) +// Quick sanity checks +Q_STATIC_ASSERT(HasStreamOperator<NS(QJsonDocument)>::Value); +Q_STATIC_ASSERT(!HasStreamOperator<void*>::Value); +Q_STATIC_ASSERT(HasStreamOperator<qint8>::Value); + +template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted && HasStreamOperator<T>::Value> +struct FilteredOperatorSwitch +{ + static bool load(QDataStream &stream, T *data, int) + { + stream >> *data; + return true; + } + static bool save(QDataStream &stream, const T *data, int) + { + stream << *data; + return true; + } +}; +template<typename T> +struct FilteredOperatorSwitch<T, /* IsAcceptedType = */ false> { - if (!data || !isRegistered(type)) + static const QMetaTypeInterface* getMetaTypeInterface(int type) + { + if (QModulesPrivate::QTypeModuleInfo<T>::IsGui && qMetaTypeGuiHelper) + return &qMetaTypeGuiHelper[type - QMetaType::FirstGuiType]; + else if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget && qMetaTypeWidgetsHelper) + return &qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType]; + return nullptr; + } + static bool save(QDataStream &stream, const T *data, int type) + { + if (auto interface = getMetaTypeInterface(type)) { + interface->saveOp(stream, data); + return true; + } return false; - - switch(type) { - case QMetaType::UnknownType: - case QMetaType::Void: - case QMetaType::VoidStar: - case QMetaType::QObjectStar: -#if QT_CONFIG(itemmodel) - case QMetaType::QModelIndex: - case QMetaType::QPersistentModelIndex: -#endif - case QMetaType::QJsonValue: - case QMetaType::QJsonObject: - case QMetaType::QJsonArray: - case QMetaType::QJsonDocument: - case QMetaType::QCborValue: - case QMetaType::QCborArray: - case QMetaType::QCborMap: + } + static bool load(QDataStream &stream, T *data, int type) + { + if (auto interface = getMetaTypeInterface(type)) { + interface->loadOp(stream, data); + return true; + } return false; - case QMetaType::Nullptr: - stream << *static_cast<const std::nullptr_t *>(data); - return true; - case QMetaType::Long: - stream << qlonglong(*static_cast<const long *>(data)); - break; - case QMetaType::Int: - stream << *static_cast<const int *>(data); - break; - case QMetaType::Short: - stream << *static_cast<const short *>(data); - break; - case QMetaType::Char: + } +}; + +class SaveOperatorSwitch +{ +public: + QDataStream &stream; + int m_type; + + template<typename T> + bool delegate(const T *data) + { + return FilteredOperatorSwitch<T>::save(stream, data, m_type); + } + bool delegate(const char *data) + { // force a char to be signed - stream << *static_cast<const signed char *>(data); - break; - case QMetaType::ULong: - stream << qulonglong(*static_cast<const ulong *>(data)); - break; - case QMetaType::UInt: - stream << *static_cast<const uint *>(data); - break; - case QMetaType::LongLong: - stream << *static_cast<const qlonglong *>(data); - break; - case QMetaType::ULongLong: - stream << *static_cast<const qulonglong *>(data); - break; - case QMetaType::UShort: - stream << *static_cast<const ushort *>(data); - break; - case QMetaType::SChar: - stream << *static_cast<const signed char *>(data); - break; - case QMetaType::UChar: - stream << *static_cast<const uchar *>(data); - break; - case QMetaType::Bool: - stream << qint8(*static_cast<const bool *>(data)); - break; - case QMetaType::Float: - stream << *static_cast<const float *>(data); - break; - case QMetaType::Double: - stream << *static_cast<const double *>(data); - break; - case QMetaType::QChar: - stream << *static_cast<const NS(QChar) *>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QVariantMap: - stream << *static_cast<const NS(QVariantMap)*>(data); - break; - case QMetaType::QVariantHash: - stream << *static_cast<const NS(QVariantHash)*>(data); - break; - case QMetaType::QVariantList: - stream << *static_cast<const NS(QVariantList)*>(data); - break; - case QMetaType::QVariant: - stream << *static_cast<const NS(QVariant)*>(data); - break; - case QMetaType::QByteArrayList: - stream << *static_cast<const NS(QByteArrayList)*>(data); - break; -#endif - case QMetaType::QByteArray: - stream << *static_cast<const NS(QByteArray)*>(data); - break; - case QMetaType::QString: - stream << *static_cast<const NS(QString)*>(data); - break; - case QMetaType::QStringList: - stream << *static_cast<const NS(QStringList)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QBitArray: - stream << *static_cast<const NS(QBitArray)*>(data); - break; -#endif - case QMetaType::QDate: - stream << *static_cast<const NS(QDate)*>(data); - break; - case QMetaType::QTime: - stream << *static_cast<const NS(QTime)*>(data); - break; - case QMetaType::QDateTime: - stream << *static_cast<const NS(QDateTime)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QUrl: - stream << *static_cast<const NS(QUrl)*>(data); - break; -#endif - case QMetaType::QLocale: - stream << *static_cast<const NS(QLocale)*>(data); - break; -#ifndef QT_NO_GEOM_VARIANT - case QMetaType::QRect: - stream << *static_cast<const NS(QRect)*>(data); - break; - case QMetaType::QRectF: - stream << *static_cast<const NS(QRectF)*>(data); - break; - case QMetaType::QSize: - stream << *static_cast<const NS(QSize)*>(data); - break; - case QMetaType::QSizeF: - stream << *static_cast<const NS(QSizeF)*>(data); - break; - case QMetaType::QLine: - stream << *static_cast<const NS(QLine)*>(data); - break; - case QMetaType::QLineF: - stream << *static_cast<const NS(QLineF)*>(data); - break; - case QMetaType::QPoint: - stream << *static_cast<const NS(QPoint)*>(data); - break; - case QMetaType::QPointF: - stream << *static_cast<const NS(QPointF)*>(data); - break; -#endif -#ifndef QT_NO_REGEXP - case QMetaType::QRegExp: - stream << *static_cast<const NS(QRegExp)*>(data); - break; -#endif -#if QT_CONFIG(regularexpression) - case QMetaType::QRegularExpression: - stream << *static_cast<const NS(QRegularExpression)*>(data); - break; -#endif // QT_CONFIG(regularexpression) -#ifndef QT_BOOTSTRAPPED - case QMetaType::QEasingCurve: - stream << *static_cast<const NS(QEasingCurve)*>(data); - break; - case QMetaType::QCborSimpleType: - stream << *static_cast<const quint8 *>(data); - break; -#endif // QT_BOOTSTRAPPED - case QMetaType::QFont: - case QMetaType::QPixmap: - case QMetaType::QBrush: - case QMetaType::QColor: - case QMetaType::QPalette: - case QMetaType::QImage: - case QMetaType::QPolygon: - case QMetaType::QPolygonF: - case QMetaType::QRegion: - case QMetaType::QBitmap: - case QMetaType::QCursor: - case QMetaType::QKeySequence: - case QMetaType::QPen: - case QMetaType::QTextLength: - case QMetaType::QTextFormat: - case QMetaType::QMatrix: - case QMetaType::QTransform: - case QMetaType::QMatrix4x4: - case QMetaType::QVector2D: - case QMetaType::QVector3D: - case QMetaType::QVector4D: - case QMetaType::QQuaternion: - case QMetaType::QIcon: - if (!qMetaTypeGuiHelper) - return false; - qMetaTypeGuiHelper[type - FirstGuiType].saveOp(stream, data); - break; - case QMetaType::QSizePolicy: - if (!qMetaTypeWidgetsHelper) - return false; - qMetaTypeWidgetsHelper[type - FirstWidgetsType].saveOp(stream, data); - break; - case QMetaType::QUuid: - stream << *static_cast<const NS(QUuid)*>(data); - break; - default: { + stream << qint8(*data); + return true; + } + bool delegate(const long *data) + { + stream << qlonglong(*data); + return true; + } + bool delegate(const unsigned long *data) + { + stream << qulonglong(*data); + return true; + } + bool delegate(const QMetaTypeSwitcher::NotBuiltinType *data) + { const QVector<QCustomTypeInfo> * const ct = customTypes(); if (!ct) return false; - - SaveOperator saveOp = 0; + QMetaType::SaveOperator saveOp = nullptr; { QReadLocker locker(customTypesLock()); - saveOp = ct->at(type - User).saveOp; + saveOp = ct->at(m_type - QMetaType::User).saveOp; } - if (!saveOp) return false; saveOp(stream, data); - break; } + return true; } + bool delegate(const void*) { return false; } + bool delegate(const QMetaTypeSwitcher::UnknownType*) { return false; } +}; +class LoadOperatorSwitch +{ +public: + QDataStream &stream; + int m_type; - return true; + template<typename T> + bool delegate(const T *data) + { + return FilteredOperatorSwitch<T>::load(stream, const_cast<T*>(data), m_type); + } + bool delegate(const char *data) + { + // force a char to be signed + qint8 c; + stream >> c; + *const_cast<char*>(data) = c; + return true; + } + bool delegate(const long *data) + { + qlonglong l; + stream >> l; + *const_cast<long*>(data) = l; + return true; + } + bool delegate(const unsigned long *data) + { + qlonglong l; + stream >> l; + *const_cast<unsigned long*>(data) = l; + return true; + } + bool delegate(const QMetaTypeSwitcher::NotBuiltinType *data) + { + const QVector<QCustomTypeInfo> * const ct = customTypes(); + if (!ct) + return false; + QMetaType::LoadOperator loadOp = nullptr; + { + QReadLocker locker(customTypesLock()); + loadOp = ct->at(m_type - QMetaType::User).loadOp; + } + if (!loadOp) + return false; + loadOp(stream, const_cast<QMetaTypeSwitcher::NotBuiltinType*>(data)); + return true; + } + bool delegate(const void*) { return false; } + bool delegate(const QMetaTypeSwitcher::UnknownType*) { return false; } +}; +} // namespace + +/*! + Writes the object pointed to by \a data with the ID \a type to + the given \a stream. Returns \c true if the object is saved + successfully; otherwise returns \c false. + + The type must have been registered with qRegisterMetaType() and + qRegisterMetaTypeStreamOperators() beforehand. + + Normally, you should not need to call this function directly. + Instead, use QVariant's \c operator<<(), which relies on save() + to stream custom types. + + \sa load(), qRegisterMetaTypeStreamOperators() +*/ +bool QMetaType::save(QDataStream &stream, int type, const void *data) +{ + if (!data) + return false; + SaveOperatorSwitch saveOp{stream, type}; + return QMetaTypeSwitcher::switcher<bool>(saveOp, type, data); } /*! @@ -1622,225 +1594,10 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) */ bool QMetaType::load(QDataStream &stream, int type, void *data) { - if (!data || !isRegistered(type)) - return false; - - switch(type) { - case QMetaType::UnknownType: - case QMetaType::Void: - case QMetaType::VoidStar: - case QMetaType::QObjectStar: -#if QT_CONFIG(itemmodel) - case QMetaType::QModelIndex: - case QMetaType::QPersistentModelIndex: -#endif - case QMetaType::QJsonValue: - case QMetaType::QJsonObject: - case QMetaType::QJsonArray: - case QMetaType::QJsonDocument: - case QMetaType::QCborValue: - case QMetaType::QCborArray: - case QMetaType::QCborMap: + if (!data) return false; - case QMetaType::Nullptr: - stream >> *static_cast<std::nullptr_t *>(data); - return true; - case QMetaType::Long: { - qlonglong l; - stream >> l; - *static_cast<long *>(data) = long(l); - break; } - case QMetaType::Int: - stream >> *static_cast<int *>(data); - break; - case QMetaType::Short: - stream >> *static_cast<short *>(data); - break; - case QMetaType::Char: - // force a char to be signed - stream >> *static_cast<signed char *>(data); - break; - case QMetaType::ULong: { - qulonglong ul; - stream >> ul; - *static_cast<ulong *>(data) = ulong(ul); - break; } - case QMetaType::UInt: - stream >> *static_cast<uint *>(data); - break; - case QMetaType::LongLong: - stream >> *static_cast<qlonglong *>(data); - break; - case QMetaType::ULongLong: - stream >> *static_cast<qulonglong *>(data); - break; - case QMetaType::UShort: - stream >> *static_cast<ushort *>(data); - break; - case QMetaType::SChar: - stream >> *static_cast<signed char *>(data); - break; - case QMetaType::UChar: - stream >> *static_cast<uchar *>(data); - break; - case QMetaType::Bool: { - qint8 b; - stream >> b; - *static_cast<bool *>(data) = b; - break; } - case QMetaType::Float: - stream >> *static_cast<float *>(data); - break; - case QMetaType::Double: - stream >> *static_cast<double *>(data); - break; - case QMetaType::QChar: - stream >> *static_cast< NS(QChar)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QVariantMap: - stream >> *static_cast< NS(QVariantMap)*>(data); - break; - case QMetaType::QVariantHash: - stream >> *static_cast< NS(QVariantHash)*>(data); - break; - case QMetaType::QVariantList: - stream >> *static_cast< NS(QVariantList)*>(data); - break; - case QMetaType::QVariant: - stream >> *static_cast< NS(QVariant)*>(data); - break; - case QMetaType::QByteArrayList: - stream >> *static_cast< NS(QByteArrayList)*>(data); - break; -#endif - case QMetaType::QByteArray: - stream >> *static_cast< NS(QByteArray)*>(data); - break; - case QMetaType::QString: - stream >> *static_cast< NS(QString)*>(data); - break; - case QMetaType::QStringList: - stream >> *static_cast< NS(QStringList)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QBitArray: - stream >> *static_cast< NS(QBitArray)*>(data); - break; -#endif - case QMetaType::QDate: - stream >> *static_cast< NS(QDate)*>(data); - break; - case QMetaType::QTime: - stream >> *static_cast< NS(QTime)*>(data); - break; - case QMetaType::QDateTime: - stream >> *static_cast< NS(QDateTime)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QUrl: - stream >> *static_cast< NS(QUrl)*>(data); - break; -#endif - case QMetaType::QLocale: - stream >> *static_cast< NS(QLocale)*>(data); - break; -#ifndef QT_NO_GEOM_VARIANT - case QMetaType::QRect: - stream >> *static_cast< NS(QRect)*>(data); - break; - case QMetaType::QRectF: - stream >> *static_cast< NS(QRectF)*>(data); - break; - case QMetaType::QSize: - stream >> *static_cast< NS(QSize)*>(data); - break; - case QMetaType::QSizeF: - stream >> *static_cast< NS(QSizeF)*>(data); - break; - case QMetaType::QLine: - stream >> *static_cast< NS(QLine)*>(data); - break; - case QMetaType::QLineF: - stream >> *static_cast< NS(QLineF)*>(data); - break; - case QMetaType::QPoint: - stream >> *static_cast< NS(QPoint)*>(data); - break; - case QMetaType::QPointF: - stream >> *static_cast< NS(QPointF)*>(data); - break; -#endif -#ifndef QT_NO_REGEXP - case QMetaType::QRegExp: - stream >> *static_cast< NS(QRegExp)*>(data); - break; -#endif -#if QT_CONFIG(regularexpression) - case QMetaType::QRegularExpression: - stream >> *static_cast< NS(QRegularExpression)*>(data); - break; -#endif // QT_CONFIG(regularexpression) -#ifndef QT_BOOTSTRAPPED - case QMetaType::QEasingCurve: - stream >> *static_cast< NS(QEasingCurve)*>(data); - break; - case QMetaType::QCborSimpleType: - stream >> *static_cast<quint8 *>(data); - break; -#endif // QT_BOOTSTRAPPED - case QMetaType::QFont: - case QMetaType::QPixmap: - case QMetaType::QBrush: - case QMetaType::QColor: - case QMetaType::QPalette: - case QMetaType::QImage: - case QMetaType::QPolygon: - case QMetaType::QPolygonF: - case QMetaType::QRegion: - case QMetaType::QBitmap: - case QMetaType::QCursor: - case QMetaType::QKeySequence: - case QMetaType::QPen: - case QMetaType::QTextLength: - case QMetaType::QTextFormat: - case QMetaType::QMatrix: - case QMetaType::QTransform: - case QMetaType::QMatrix4x4: - case QMetaType::QVector2D: - case QMetaType::QVector3D: - case QMetaType::QVector4D: - case QMetaType::QQuaternion: - case QMetaType::QIcon: - if (!qMetaTypeGuiHelper) - return false; - qMetaTypeGuiHelper[type - FirstGuiType].loadOp(stream, data); - break; - case QMetaType::QSizePolicy: - if (!qMetaTypeWidgetsHelper) - return false; - qMetaTypeWidgetsHelper[type - FirstWidgetsType].loadOp(stream, data); - break; - case QMetaType::QUuid: - stream >> *static_cast< NS(QUuid)*>(data); - break; - default: { - const QVector<QCustomTypeInfo> * const ct = customTypes(); - if (!ct) - return false; - - LoadOperator loadOp = 0; - { - QReadLocker locker(customTypesLock()); - loadOp = ct->at(type - User).loadOp; - } - - if (!loadOp) - return false; - loadOp(stream, data); - break; } - } - return true; + LoadOperatorSwitch loadOp{stream, type}; + return QMetaTypeSwitcher::switcher<bool>(loadOp, type, data); } #endif // QT_NO_DATASTREAM diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index ed7feee775..a47fbfe28d 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -570,6 +570,7 @@ public: inline bool isValid() const; inline bool isRegistered() const; + inline int id() const; inline int sizeOf() const; inline TypeFlags flags() const; inline const QMetaObject *metaObject() const; @@ -1976,7 +1977,9 @@ QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_FORWARD_DECLARE_STATIC_TYPES_ITER) typedef QList<QVariant> QVariantList; typedef QMap<QString, QVariant> QVariantMap; typedef QHash<QString, QVariant> QVariantHash; -#ifndef Q_CLANG_QDOC +#ifdef Q_CLANG_QDOC +class QByteArrayList; +#else typedef QList<QByteArray> QByteArrayList; #endif @@ -2221,6 +2224,11 @@ inline bool QMetaType::isRegistered() const return isValid(); } +inline int QMetaType::id() const +{ + return m_typeId; +} + inline void *QMetaType::create(const void *copy) const { // ### TODO Qt6 remove the extension diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp index c8ad1bc43f..9a98db21d3 100644 --- a/src/corelib/kernel/qmimedata.cpp +++ b/src/corelib/kernel/qmimedata.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE static inline QString textUriListLiteral() { return QStringLiteral("text/uri-list"); } static inline QString textHtmlLiteral() { return QStringLiteral("text/html"); } static inline QString textPlainLiteral() { return QStringLiteral("text/plain"); } +static inline QString textPlainUtf8Literal() { return QStringLiteral("text/plain;charset=utf-8"); } static inline QString applicationXColorLiteral() { return QStringLiteral("application/x-color"); } static inline QString applicationXQtImageLiteral() { return QStringLiteral("application/x-qt-image"); } @@ -399,6 +400,10 @@ bool QMimeData::hasUrls() const QString QMimeData::text() const { Q_D(const QMimeData); + QVariant utf8Text = d->retrieveTypedData(textPlainUtf8Literal(), QVariant::String); + if (!utf8Text.isNull()) + return utf8Text.toString(); + QVariant data = d->retrieveTypedData(textPlainLiteral(), QVariant::String); return data.toString(); } diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index b4e885e407..2cdb9eaaa6 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1763,7 +1763,7 @@ void QObject::killTimer(int id) \fn template<typename T> T *QObject::findChild(const QString &name, Qt::FindChildOptions options) const Returns the child of this object that can be cast into type T and - that is called \a name, or 0 if there is no such object. + that is called \a name, or \nullptr if there is no such object. Omitting the \a name argument causes all object names to be matched. The search is performed recursively, unless \a options specifies the option FindDirectChildrenOnly. @@ -1824,12 +1824,15 @@ void QObject::killTimer(int id) /*! \fn template<typename T> QList<T> QObject::findChildren(const QRegExp ®Exp, Qt::FindChildOptions options) const \overload findChildren() + \obsolete Returns the children of this object that can be cast to type T and that have names matching the regular expression \a regExp, or an empty list if there are no such objects. The search is performed recursively, unless \a options specifies the option FindDirectChildrenOnly. + + Use the findChildren overload taking a QRegularExpression instead. */ /*! @@ -2148,7 +2151,8 @@ void QObject::removeEventFilter(QObject *obj) \fn void QObject::destroyed(QObject *obj) This signal is emitted immediately before the object \a obj is - destroyed, and can not be blocked. + destroyed, after any instances of QPointer have been notified, + and can not be blocked. All the objects's children are destroyed immediately after this signal is emitted. @@ -3673,10 +3677,12 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i return; } - void *empty_argv[] = { 0 }; + void *empty_argv[] = { nullptr }; + if (!argv) + argv = empty_argv; + if (qt_signal_spy_callback_set.signal_begin_callback != 0) { - qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index, - argv ? argv : empty_argv); + qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index, argv); } Q_TRACE(QMetaObject_activate_begin_signal, sender, signal_index); @@ -3739,7 +3745,7 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i // put into the event queue if ((c->connectionType == Qt::AutoConnection && !receiverInSameThread) || (c->connectionType == Qt::QueuedConnection)) { - queued_activate(sender, signal_index, c, argv ? argv : empty_argv, locker); + queued_activate(sender, signal_index, c, argv, locker); continue; #if QT_CONFIG(thread) } else if (c->connectionType == Qt::BlockingQueuedConnection) { @@ -3751,8 +3757,8 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i } QSemaphore semaphore; QMetaCallEvent *ev = c->isSlotObject ? - new QMetaCallEvent(c->slotObj, sender, signal_index, 0, 0, argv ? argv : empty_argv, &semaphore) : - new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction, sender, signal_index, 0, 0, argv ? argv : empty_argv, &semaphore); + new QMetaCallEvent(c->slotObj, sender, signal_index, 0, 0, argv, &semaphore) : + new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction, sender, signal_index, 0, 0, argv, &semaphore); QCoreApplication::postEvent(receiver, ev); locker.unlock(); semaphore.acquire(); @@ -3771,7 +3777,7 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i QScopedPointer<QtPrivate::QSlotObjectBase, QSlotObjectBaseDeleter> obj(c->slotObj); locker.unlock(); Q_TRACE(QMetaObject_activate_begin_slot_functor, obj.data()); - obj->call(receiver, argv ? argv : empty_argv); + obj->call(receiver, argv); Q_TRACE(QMetaObject_activate_end_slot_functor, obj.data()); // Make sure the slot object gets destroyed before the mutex is locked again, as the @@ -3787,10 +3793,10 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i const auto callFunction = c->callFunction; locker.unlock(); if (qt_signal_spy_callback_set.slot_begin_callback != 0) - qt_signal_spy_callback_set.slot_begin_callback(receiver, methodIndex, argv ? argv : empty_argv); + qt_signal_spy_callback_set.slot_begin_callback(receiver, methodIndex, argv); Q_TRACE(QMetaObject_activate_begin_slot, receiver, methodIndex); - callFunction(receiver, QMetaObject::InvokeMetaMethod, method_relative, argv ? argv : empty_argv); + callFunction(receiver, QMetaObject::InvokeMetaMethod, method_relative, argv); Q_TRACE(QMetaObject_activate_end_slot, receiver, methodIndex); if (qt_signal_spy_callback_set.slot_end_callback != 0) @@ -3801,13 +3807,11 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i locker.unlock(); if (qt_signal_spy_callback_set.slot_begin_callback != 0) { - qt_signal_spy_callback_set.slot_begin_callback(receiver, - method, - argv ? argv : empty_argv); + qt_signal_spy_callback_set.slot_begin_callback(receiver, method, argv); } Q_TRACE(QMetaObject_activate_begin_slot, receiver, method); - metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv); + metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv); Q_TRACE(QMetaObject_activate_end_slot, receiver, method); if (qt_signal_spy_callback_set.slot_end_callback != 0) diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index aac9bcdee9..52c1b8e555 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -176,7 +176,9 @@ public: } #ifndef QT_NO_REGEXP +#if QT_DEPRECATED_SINCE(5, 13) template<typename T> + QT_DEPRECATED_X("Use findChildren(const RegularExpression &, ...) instead.") inline QList<T> findChildren(const QRegExp &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const { typedef typename std::remove_cv<typename std::remove_pointer<T>::type>::type ObjType; @@ -186,6 +188,7 @@ public: return list; } #endif +#endif #if QT_CONFIG(regularexpression) template<typename T> @@ -517,7 +520,10 @@ inline T qobject_cast(const QObject *object) template <class T> inline const char * qobject_interface_iid() { return nullptr; } -#if !defined(Q_MOC_RUN) && !defined(Q_CLANG_QDOC) + +#if defined(Q_CLANG_QDOC) +# define Q_DECLARE_INTERFACE(IFace, IId) +#elif !defined(Q_MOC_RUN) # define Q_DECLARE_INTERFACE(IFace, IId) \ template <> inline const char *qobject_interface_iid<IFace *>() \ { return IId; } \ diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 5dfef786ec..a762e6f529 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -407,7 +407,7 @@ private: class QBoolBlocker { - Q_DISABLE_COPY(QBoolBlocker) + Q_DISABLE_COPY_MOVE(QBoolBlocker) public: explicit inline QBoolBlocker(bool &b, bool value=true):block(b), reset(b){block = value;} inline ~QBoolBlocker(){block = reset; } @@ -432,9 +432,9 @@ struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QDynamicMetaObjectData, { ~QAbstractDynamicMetaObject(); - virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override { return this; } + QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override { return this; } virtual int createProperty(const char *, const char *) { return -1; } - virtual int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) override + int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) override { return metaCall(c, _id, a); } virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; } // Compat overload }; diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h index 8afff1fb98..aa6bd84e95 100644 --- a/src/corelib/kernel/qobjectdefs_impl.h +++ b/src/corelib/kernel/qobjectdefs_impl.h @@ -395,7 +395,7 @@ namespace QtPrivate { protected: ~QSlotObjectBase() {} private: - Q_DISABLE_COPY(QSlotObjectBase) + Q_DISABLE_COPY_MOVE(QSlotObjectBase) }; // implementation of QSlotObjectBase for which the slot is a pointer to member function of a QObject diff --git a/src/corelib/kernel/qppsobject_p.h b/src/corelib/kernel/qppsobject_p.h index abcf00fa05..a3bf3a5bc1 100644 --- a/src/corelib/kernel/qppsobject_p.h +++ b/src/corelib/kernel/qppsobject_p.h @@ -119,7 +119,7 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QPpsObject) - Q_DISABLE_COPY(QPpsObject) + Q_DISABLE_COPY_MOVE(QPpsObject) }; QT_END_NAMESPACE diff --git a/src/corelib/kernel/qsystemerror.cpp b/src/corelib/kernel/qsystemerror.cpp index 53c3136857..9d0394e4a5 100644 --- a/src/corelib/kernel/qsystemerror.cpp +++ b/src/corelib/kernel/qsystemerror.cpp @@ -152,10 +152,7 @@ QString QSystemError::string(ErrorScope errorScope, int errorCode) case NativeError: #if defined (Q_OS_WIN) return windowsErrorString(errorCode); -#else - //unix: fall through as native and standard library are the same - Q_FALLTHROUGH(); -#endif +#endif // else unix: native and standard library are the same case StandardLibraryError: return standardLibraryErrorString(errorCode); default: diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 744bbfbff5..dc39490ab0 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -61,14 +61,8 @@ #if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) #define QT_USE_MMAP #include "private/qcore_unix_p.h" -#endif - -// most of the headers below are already included in qplatformdefs.h -// also this lacks Large File support but that's probably irrelevant -#if defined(QT_USE_MMAP) // for mmap #include <sys/mman.h> -#include <errno.h> #endif #include <stdlib.h> @@ -302,7 +296,7 @@ public: bool used_mmap : 1; #endif char *unmapPointer; // used memory (mmap, new or resource file) - quint32 unmapLength; + qsizetype unmapLength; // The resource object in case we loaded the translations from a resource QResource *resource; @@ -322,7 +316,7 @@ public: uint numerusRulesLength; bool do_load(const QString &filename, const QString &directory); - bool do_load(const uchar *data, int len, const QString &directory); + bool do_load(const uchar *data, qsizetype len, const QString &directory); QString do_translate(const char *context, const char *sourceText, const char *comment, int n) const; void clear(); @@ -553,7 +547,7 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo return false; qint64 fileSize = file.size(); - if (fileSize < MagicLength || quint32(-1) <= fileSize) + if (fileSize < MagicLength || fileSize > std::numeric_limits<qsizetype>::max()) return false; { @@ -563,7 +557,7 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo return false; } - d->unmapLength = quint32(fileSize); + d->unmapLength = qsizetype(fileSize); #ifdef QT_USE_MMAP @@ -571,21 +565,20 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo #define MAP_FILE 0 #endif #ifndef MAP_FAILED -#define MAP_FAILED -1 +#define MAP_FAILED reinterpret_cast<void *>(-1) #endif int fd = file.handle(); if (fd >= 0) { - char *ptr; - ptr = reinterpret_cast<char *>( - mmap(0, d->unmapLength, // any address, whole file - PROT_READ, // read-only memory - MAP_FILE | MAP_PRIVATE, // swap-backed map from file - fd, 0)); // from offset 0 of fd - if (ptr && ptr != reinterpret_cast<char *>(MAP_FAILED)) { + int protection = PROT_READ; // read-only memory + int flags = MAP_FILE | MAP_PRIVATE; // swap-backed map from file + void *ptr = QT_MMAP(nullptr, d->unmapLength,// any address, whole file + protection, flags, + fd, 0); // from offset 0 of fd + if (ptr != MAP_FAILED) { file.close(); d->used_mmap = true; - d->unmapPointer = ptr; + d->unmapPointer = static_cast<char *>(ptr); ok = true; } } @@ -815,7 +808,7 @@ static quint32 read32(const uchar *data) return qFromBigEndian<quint32>(data); } -bool QTranslatorPrivate::do_load(const uchar *data, int len, const QString &directory) +bool QTranslatorPrivate::do_load(const uchar *data, qsizetype len, const QString &directory) { bool ok = true; const uchar *end = data + len; diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index ff73c27b6e..f95502e75f 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -55,6 +55,8 @@ #if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L #include <variant> +#elif defined(Q_CLANG_QDOC) +namespace std { template<typename...> struct variant; } #endif QT_BEGIN_NAMESPACE @@ -365,7 +367,7 @@ class Q_CORE_EXPORT QVariant static inline QVariant fromValue(const T &value) { return qVariantFromValue(value); } -#if defined(Q_CLANG_QDOC) || (QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L) +#if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L template<typename... Types> static inline QVariant fromStdVariant(const std::variant<Types...> &value) { diff --git a/src/corelib/mimetypes/mime/packages/freedesktop.org.xml b/src/corelib/mimetypes/mime/packages/freedesktop.org.xml index b749fe41ac..d384ffb2d5 100644 --- a/src/corelib/mimetypes/mime/packages/freedesktop.org.xml +++ b/src/corelib/mimetypes/mime/packages/freedesktop.org.xml @@ -64,20 +64,32 @@ <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> <mime-type type="application/x-atari-2600-rom"> <comment>Atari 2600</comment> + <comment xml:lang="ast">Atari 2600</comment> <comment xml:lang="ca">Atari 2600</comment> + <comment xml:lang="cs">Atari 2600</comment> <comment xml:lang="da">Atari 2600</comment> <comment xml:lang="de">Atari 2600</comment> + <comment xml:lang="en_GB">Atari 2600</comment> <comment xml:lang="es">Atari 2600</comment> + <comment xml:lang="eu">Atari 2600</comment> <comment xml:lang="fi">Atari 2600</comment> <comment xml:lang="fr">Atari 2600</comment> + <comment xml:lang="ga">Atari 2600</comment> <comment xml:lang="he">אטארי 2600</comment> + <comment xml:lang="hr">Atari 2600</comment> <comment xml:lang="hu">Atari 2600</comment> + <comment xml:lang="id">Atari 2600</comment> + <comment xml:lang="it">Atari 2600</comment> <comment xml:lang="kk">Atari 2600</comment> <comment xml:lang="ko">Atari 2600</comment> + <comment xml:lang="oc">Atari 2600</comment> <comment xml:lang="pl">Atari 2600</comment> <comment xml:lang="pt_BR">Atari 2600</comment> <comment xml:lang="ru">Atari 2600</comment> <comment xml:lang="sk">Atari 2600</comment> + <comment xml:lang="sr">Атари 2600</comment> + <comment xml:lang="sv">Atari 2600</comment> + <comment xml:lang="tr">Atari 2600</comment> <comment xml:lang="uk">Atari 2600</comment> <comment xml:lang="zh_CN">雅达利 2600</comment> <comment xml:lang="zh_TW">Atari 2600</comment> @@ -86,20 +98,32 @@ </mime-type> <mime-type type="application/x-atari-7800-rom"> <comment>Atari 7800</comment> + <comment xml:lang="ast">Atari 7800</comment> <comment xml:lang="ca">Atari 7800</comment> + <comment xml:lang="cs">Atari 7800</comment> <comment xml:lang="da">Atari 7800</comment> <comment xml:lang="de">Atari 7800</comment> + <comment xml:lang="en_GB">Atari 7800</comment> <comment xml:lang="es">Atari 7800</comment> + <comment xml:lang="eu">Atari 7800</comment> <comment xml:lang="fi">Atari 7800</comment> <comment xml:lang="fr">Atari 7800</comment> + <comment xml:lang="ga">Atari 7800</comment> <comment xml:lang="he">אטארי 7800</comment> + <comment xml:lang="hr">Atari 7800</comment> <comment xml:lang="hu">Atari 7800</comment> + <comment xml:lang="id">Atari 7800</comment> + <comment xml:lang="it">Atari 7800</comment> <comment xml:lang="kk">Atari 7800</comment> <comment xml:lang="ko">Atari 7800</comment> + <comment xml:lang="oc">Atari 7800</comment> <comment xml:lang="pl">Atari 7800</comment> <comment xml:lang="pt_BR">Atari 7800</comment> <comment xml:lang="ru">Atari 7800</comment> <comment xml:lang="sk">Atari 7800</comment> + <comment xml:lang="sr">Атари 7800</comment> + <comment xml:lang="sv">Atari 7800</comment> + <comment xml:lang="tr">Atari 7800</comment> <comment xml:lang="uk">Atari 7800</comment> <comment xml:lang="zh_CN">雅达利 7800</comment> <comment xml:lang="zh_TW">Atari 7800</comment> @@ -109,6 +133,35 @@ <match value="ATARI7800" type="string" offset="1"/> </magic> </mime-type> + <mime-type type="application/x-atari-lynx-rom"> + <comment>Atari Lynx</comment> + <comment xml:lang="ast">Atari Lynx</comment> + <comment xml:lang="ca">Atari Lynx</comment> + <comment xml:lang="cs">Atari Lynx</comment> + <comment xml:lang="de">Atari Lynx</comment> + <comment xml:lang="en_GB">Atari Lynx</comment> + <comment xml:lang="es">Atari Lynx</comment> + <comment xml:lang="fi">Atari Lynx</comment> + <comment xml:lang="hr">Atari Lynx</comment> + <comment xml:lang="hu">Atari Lynx</comment> + <comment xml:lang="id">Atari Lynx</comment> + <comment xml:lang="it">Atari Lynx</comment> + <comment xml:lang="kk">Atari Lynx</comment> + <comment xml:lang="ko">Atari Lynx</comment> + <comment xml:lang="pl">Atari Lynx</comment> + <comment xml:lang="pt_BR">Atari Lynx</comment> + <comment xml:lang="ru">Atari Lynx</comment> + <comment xml:lang="sk">Atari Lynx</comment> + <comment xml:lang="sv">Atari Lynx</comment> + <comment xml:lang="uk">Atari Lynx</comment> + <comment xml:lang="zh_CN">雅达利 Lynx</comment> + <comment xml:lang="zh_TW">Atari Lynx</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.lnx"/> + <magic> + <match value="LYNX" type="string" offset="0"/> + </magic> + </mime-type> <mime-type type="application/andrew-inset"> <comment>ATK inset</comment> <comment xml:lang="ar">شكل ATK</comment> @@ -146,7 +199,7 @@ <comment xml:lang="pt">Suplemento ATK</comment> <comment xml:lang="pt_BR">Conjunto de entrada do ATK</comment> <comment xml:lang="ro">Inset ATK</comment> - <comment xml:lang="ru">вкладка ATK</comment> + <comment xml:lang="ru">Вкладка ATK</comment> <comment xml:lang="sk">Vložka ATK</comment> <comment xml:lang="sl">Vložka ATK</comment> <comment xml:lang="sq">Inset ATK</comment> @@ -165,6 +218,7 @@ <mime-type type="application/epub+zip"> <comment>electronic book document</comment> <comment xml:lang="ar">مستند كتاب إلكتروني</comment> + <comment xml:lang="ast">documentu de llibru electrónicu</comment> <comment xml:lang="be@latin">elektronnaja kniha</comment> <comment xml:lang="bg">Документ — електронна книга</comment> <comment xml:lang="ca">document de llibre electrònic</comment> @@ -181,7 +235,7 @@ <comment xml:lang="ga">leabhar leictreonach</comment> <comment xml:lang="gl">documento de libro electrónico</comment> <comment xml:lang="he">מסמך מסוג ספר אלקטרוני</comment> - <comment xml:lang="hr">dokument elektroničke knjige</comment> + <comment xml:lang="hr">Dokument elektroničke knjige</comment> <comment xml:lang="hu">elektronikus könyvdokumentum</comment> <comment xml:lang="ia">Documento de libro electronic</comment> <comment xml:lang="id">dokumen buku elektronik</comment> @@ -198,7 +252,7 @@ <comment xml:lang="pt">documento de livro eletrónico</comment> <comment xml:lang="pt_BR">Documento de livro eletrônico</comment> <comment xml:lang="ro">document carte electronică</comment> - <comment xml:lang="ru">электронная книга</comment> + <comment xml:lang="ru">Электронная книга</comment> <comment xml:lang="sk">Dokument elektronickej knihy</comment> <comment xml:lang="sl">dokument elektronske knjige</comment> <comment xml:lang="sq">Dokument libri elektronik</comment> @@ -224,6 +278,7 @@ <mime-type type="application/illustrator"> <comment>Adobe Illustrator document</comment> <comment xml:lang="ar">مستند أدوبي المصور</comment> + <comment xml:lang="ast">Documentu d'Adobe Illustrator</comment> <comment xml:lang="be@latin">Dakument Adobe Illustrator</comment> <comment xml:lang="bg">Документ — Adobe Illustrator</comment> <comment xml:lang="ca">document d'Adobe Illustrator</comment> @@ -244,7 +299,7 @@ <comment xml:lang="hr">Adobe Illustrator dokument</comment> <comment xml:lang="hu">Adobe Illustrator-dokumentum</comment> <comment xml:lang="ia">Documento Adobe Illustrator</comment> - <comment xml:lang="id">Dokumen Adobe Illustrator</comment> + <comment xml:lang="id">dokumen Adobe Illustrator</comment> <comment xml:lang="it">Documento Adobe Illustrator</comment> <comment xml:lang="ja">Adobe Illustrator ドキュメント</comment> <comment xml:lang="ka">Adobe Illustrator-ის დოკუმენტი</comment> @@ -261,11 +316,11 @@ <comment xml:lang="pt">documento Adobe Illustrator</comment> <comment xml:lang="pt_BR">Documento do Adobe Illustrator</comment> <comment xml:lang="ro">Document Adobe Illustrator</comment> - <comment xml:lang="ru">документ Adobe Illustrator</comment> + <comment xml:lang="ru">Документ Adobe Illustrator</comment> <comment xml:lang="sk">Dokument Adobe Illustrator</comment> <comment xml:lang="sl">Dokument Adobe Illustrator</comment> <comment xml:lang="sq">Dokument Adobe Illustrator</comment> - <comment xml:lang="sr">документ Адобе Илустратора</comment> + <comment xml:lang="sr">документ Адобе илустратора</comment> <comment xml:lang="sv">Adobe Illustrator-dokument</comment> <comment xml:lang="tr">Adobe Illustrator belgesi</comment> <comment xml:lang="uk">документ Adobe Illustrator</comment> @@ -274,10 +329,12 @@ <comment xml:lang="zh_TW">Adobe Illustrator 文件</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.ai"/> + <alias type="application/vnd.adobe.illustrator"/> </mime-type> <mime-type type="application/mac-binhex40"> <comment>Macintosh BinHex-encoded file</comment> <comment xml:lang="ar">ملف Macintosh BinHex مشفر</comment> + <comment xml:lang="ast">Ficheru codificáu en BinHex de Machintosh</comment> <comment xml:lang="az">Macintosh BinHex-kodlanmış fayl</comment> <comment xml:lang="be@latin">Fajł Macintosh, BinHex-zakadavany</comment> <comment xml:lang="bg">Файл — кодиран във формат BinHex за Macintosh</comment> @@ -297,10 +354,10 @@ <comment xml:lang="ga">comhad ionchódaithe le Macintosh BinHex</comment> <comment xml:lang="gl">ficheiro de Macintosh codificado con BinHex</comment> <comment xml:lang="he">קובץ בקידוד Macintosh BinHex</comment> - <comment xml:lang="hr">Macintosh BinHex-kodirana datoteka</comment> + <comment xml:lang="hr">Macintosh BinHex-kôdirana datoteka</comment> <comment xml:lang="hu">Macintosh BinHex kódolású fájl</comment> <comment xml:lang="ia">File codificate in BinHex de Macintosh</comment> - <comment xml:lang="id">Berkas tersandi Macintosh BinHex</comment> + <comment xml:lang="id">berkas tersandi Macintosh BinHex</comment> <comment xml:lang="it">File Macintosh codificato BinHex</comment> <comment xml:lang="ja">Macintosh BinHex エンコードファイル</comment> <comment xml:lang="kk">Macintosh BinHex кодталған файлы</comment> @@ -316,7 +373,7 @@ <comment xml:lang="pt">ficheiro codificado em BinHex de Macintosh</comment> <comment xml:lang="pt_BR">Arquivo do Macintosh codificado com BinHex</comment> <comment xml:lang="ro">Fișier codat Macintosh BinHex</comment> - <comment xml:lang="ru">файл (закодированный Macintosh BinHex)</comment> + <comment xml:lang="ru">Файл (закодированный Macintosh BinHex)</comment> <comment xml:lang="sk">Súbor kódovaný pomocou Macintosh BinHex</comment> <comment xml:lang="sl">Kodirana datoteka Macintosh (BinHex)</comment> <comment xml:lang="sq">File Macintosh i kodifikuar BinHex</comment> @@ -393,6 +450,7 @@ <mime-type type="application/mathml+xml"> <comment>MathML document</comment> <comment xml:lang="ar">مستند MathML</comment> + <comment xml:lang="ast">Documentu MathML</comment> <comment xml:lang="az">MathML sənədi</comment> <comment xml:lang="be@latin">Dakument MathML</comment> <comment xml:lang="bg">Документ — MathML</comment> @@ -415,7 +473,7 @@ <comment xml:lang="hr">MathML dokument</comment> <comment xml:lang="hu">MathML-dokumentum</comment> <comment xml:lang="ia">Documento MathML</comment> - <comment xml:lang="id">Dokumen MathML</comment> + <comment xml:lang="id">dokumen MathML</comment> <comment xml:lang="it">Documento MathML</comment> <comment xml:lang="ja">MathML ドキュメント</comment> <comment xml:lang="ka">MathML-ის დოკუმენტი</comment> @@ -432,7 +490,7 @@ <comment xml:lang="pt">documento MathML</comment> <comment xml:lang="pt_BR">Documento do MathML</comment> <comment xml:lang="ro">Document MathML</comment> - <comment xml:lang="ru">документ MathML</comment> + <comment xml:lang="ru">Документ MathML</comment> <comment xml:lang="sk">Dokument MathML</comment> <comment xml:lang="sl">Dokument MathML</comment> <comment xml:lang="sq">Dokument MathML</comment> @@ -469,7 +527,7 @@ <comment xml:lang="ga">comhad bhosca poist</comment> <comment xml:lang="gl">ficheiro de caixa de correo</comment> <comment xml:lang="he">קובץ תיבת-דואר</comment> - <comment xml:lang="hr">datoteka poštanskog sandučića</comment> + <comment xml:lang="hr">Datoteka poštanskog sandučića</comment> <comment xml:lang="hu">mailbox fájl</comment> <comment xml:lang="ia">File de cassa postal</comment> <comment xml:lang="id">berkas kotak surat</comment> @@ -487,7 +545,7 @@ <comment xml:lang="pt">ficheiro de caixa de correio</comment> <comment xml:lang="pt_BR">Arquivo de caixa de correio</comment> <comment xml:lang="ro">fișier căsuță poștală</comment> - <comment xml:lang="ru">файл почтового ящика</comment> + <comment xml:lang="ru">Файл почтового ящика</comment> <comment xml:lang="sk">Súbor mailbox</comment> <comment xml:lang="sl">datoteka poštnega predala</comment> <comment xml:lang="sq">File mailbox</comment> @@ -496,7 +554,7 @@ <comment xml:lang="tr">posta kutusu dosyası</comment> <comment xml:lang="uk">файл поштової скриньки</comment> <comment xml:lang="vi">tập tin hộp thư</comment> - <comment xml:lang="zh_CN">mailbox 文件</comment> + <comment xml:lang="zh_CN">邮箱文件</comment> <comment xml:lang="zh_TW">郵箱檔</comment> <generic-icon name="text-x-generic"/> <sub-class-of type="text/plain"/> @@ -508,6 +566,7 @@ <mime-type type="application/metalink+xml"> <comment>Metalink file</comment> <comment xml:lang="ar">ملف ميتالنك</comment> + <comment xml:lang="ast">Ficheru d'enllaz meta</comment> <comment xml:lang="bg">Изтегляне — Metalink</comment> <comment xml:lang="ca">fitxer Metalink</comment> <comment xml:lang="cs">soubor metalink</comment> @@ -527,7 +586,7 @@ <comment xml:lang="hr">Datoteka meta poveznice</comment> <comment xml:lang="hu">Metalink fájl</comment> <comment xml:lang="ia">File Metalink</comment> - <comment xml:lang="id">Berkas Metalink</comment> + <comment xml:lang="id">berkas Metalink</comment> <comment xml:lang="it">File Metalink</comment> <comment xml:lang="ja">Metalink ファイル</comment> <comment xml:lang="kk">Metalink файлы</comment> @@ -540,14 +599,14 @@ <comment xml:lang="pt">ficheiro Metalink</comment> <comment xml:lang="pt_BR">Arquivo Metalink</comment> <comment xml:lang="ro">Fișier Metalink</comment> - <comment xml:lang="ru">файл Metalink</comment> + <comment xml:lang="ru">Файл Metalink</comment> <comment xml:lang="sk">Súbor Metalink</comment> <comment xml:lang="sl">Datoteka povezave Metalink</comment> <comment xml:lang="sr">датотека метавезе</comment> <comment xml:lang="sv">Metalink-fil</comment> <comment xml:lang="tr">Metalink dosyası</comment> <comment xml:lang="uk">файл метапосилання</comment> - <comment xml:lang="zh_CN">元链接文件</comment> + <comment xml:lang="zh_CN">Metalink 文件</comment> <comment xml:lang="zh_TW">Metalink 檔案</comment> <sub-class-of type="application/xml"/> <magic priority="50"> @@ -559,6 +618,7 @@ <mime-type type="application/metalink4+xml"> <comment>Metalink file</comment> <comment xml:lang="ar">ملف ميتالنك</comment> + <comment xml:lang="ast">Ficheru d'enllaz meta</comment> <comment xml:lang="bg">Изтегляне — Metalink</comment> <comment xml:lang="ca">fitxer Metalink</comment> <comment xml:lang="cs">soubor metalink</comment> @@ -578,7 +638,7 @@ <comment xml:lang="hr">Datoteka meta poveznice</comment> <comment xml:lang="hu">Metalink fájl</comment> <comment xml:lang="ia">File Metalink</comment> - <comment xml:lang="id">Berkas Metalink</comment> + <comment xml:lang="id">berkas Metalink</comment> <comment xml:lang="it">File Metalink</comment> <comment xml:lang="ja">Metalink ファイル</comment> <comment xml:lang="kk">Metalink файлы</comment> @@ -591,14 +651,14 @@ <comment xml:lang="pt">ficheiro Metalink</comment> <comment xml:lang="pt_BR">Arquivo Metalink</comment> <comment xml:lang="ro">Fișier Metalink</comment> - <comment xml:lang="ru">файл Metalink</comment> + <comment xml:lang="ru">Файл Metalink</comment> <comment xml:lang="sk">Súbor Metalink</comment> <comment xml:lang="sl">Datoteka povezave Metalink</comment> <comment xml:lang="sr">датотека метавезе</comment> <comment xml:lang="sv">Metalink-fil</comment> <comment xml:lang="tr">Metalink dosyası</comment> <comment xml:lang="uk">файл метапосилання</comment> - <comment xml:lang="zh_CN">元链接文件</comment> + <comment xml:lang="zh_CN">Metalink 文件</comment> <comment xml:lang="zh_TW">Metalink 檔案</comment> <sub-class-of type="application/xml"/> <magic priority="50"> @@ -610,12 +670,13 @@ <mime-type type="application/octet-stream"> <comment>unknown</comment> <comment xml:lang="ar">مجهول</comment> + <comment xml:lang="ast">desconozse</comment> <comment xml:lang="be@latin">nieviadomy</comment> <comment xml:lang="bg">Неизвестен тип</comment> <comment xml:lang="ca">desconegut</comment> <comment xml:lang="cs">neznámý</comment> <comment xml:lang="da">ukendt</comment> - <comment xml:lang="de">Unbekannt</comment> + <comment xml:lang="de">unbekannt</comment> <comment xml:lang="el">Άγνωστο</comment> <comment xml:lang="en_GB">unknown</comment> <comment xml:lang="eo">nekonate</comment> @@ -627,7 +688,7 @@ <comment xml:lang="ga">anaithnid</comment> <comment xml:lang="gl">descoñecido</comment> <comment xml:lang="he">לא ידוע</comment> - <comment xml:lang="hr">nepoznato</comment> + <comment xml:lang="hr">Nepoznato</comment> <comment xml:lang="hu">ismeretlen</comment> <comment xml:lang="ia">incognite</comment> <comment xml:lang="id">tak diketahui</comment> @@ -647,7 +708,7 @@ <comment xml:lang="pt">desconhecido</comment> <comment xml:lang="pt_BR">Desconhecido</comment> <comment xml:lang="ro">necunoscut</comment> - <comment xml:lang="ru">неизвестно</comment> + <comment xml:lang="ru">Неизвестно</comment> <comment xml:lang="sk">Neznámy</comment> <comment xml:lang="sl">neznano</comment> <comment xml:lang="sq">Nuk njihet</comment> @@ -658,10 +719,10 @@ <comment xml:lang="vi">không rõ</comment> <comment xml:lang="zh_CN">未知</comment> <comment xml:lang="zh_TW">不明</comment> - <glob pattern="*.bin"/> </mime-type> <mime-type type="application/x-partial-download"> <comment>Partially downloaded file</comment> + <comment xml:lang="ast">Ficheru baxáu parcialmente</comment> <comment xml:lang="ca">fitxer baixat parcialment</comment> <comment xml:lang="cs">částečně stažený soubor</comment> <comment xml:lang="da">Delvist hentet fil</comment> @@ -672,6 +733,7 @@ <comment xml:lang="eu">Partzialki deskargatutako fitxategia</comment> <comment xml:lang="fi">Osittain ladattu tiedosto</comment> <comment xml:lang="fr">fichier partiellement téléchargé</comment> + <comment xml:lang="ga">Comhad leath-íoslódáilte</comment> <comment xml:lang="gl">Ficheiro descargado parcialmente</comment> <comment xml:lang="he">קובץ שהתקבל חלקית</comment> <comment xml:lang="hr">Djelomično preuzeta datoteka</comment> @@ -692,7 +754,7 @@ <comment xml:lang="sv">Delvis hämtad fil</comment> <comment xml:lang="tr">Kısmen indirilmiş dosya</comment> <comment xml:lang="uk">частково отриманий файл</comment> - <comment xml:lang="zh_CN">下载的部分文件</comment> + <comment xml:lang="zh_CN">部分下载的文件</comment> <comment xml:lang="zh_TW">已部份下載的檔案</comment> <generic-icon name="package-x-generic"/> <glob pattern="*.wkdownload"/> @@ -702,6 +764,7 @@ <mime-type type="application/oda"> <comment>ODA document</comment> <comment xml:lang="ar">مستند ODA</comment> + <comment xml:lang="ast">Documentu ODA</comment> <comment xml:lang="az">ODA sənədi</comment> <comment xml:lang="be@latin">Dakument ODA</comment> <comment xml:lang="bg">Документ — ODA</comment> @@ -741,7 +804,7 @@ <comment xml:lang="pt">documento ODA</comment> <comment xml:lang="pt_BR">Documento ODA</comment> <comment xml:lang="ro">Document ODA</comment> - <comment xml:lang="ru">документ ODA</comment> + <comment xml:lang="ru">Документ ODA</comment> <comment xml:lang="sk">Dokument ODA</comment> <comment xml:lang="sl">Dokument ODA</comment> <comment xml:lang="sq">Dokument ODA</comment> @@ -759,6 +822,7 @@ </mime-type> <mime-type type="application/x-wwf"> <comment>WWF document</comment> + <comment xml:lang="ast">Documentu WWF</comment> <comment xml:lang="bg">Документ — WWF</comment> <comment xml:lang="ca">document WWF</comment> <comment xml:lang="cs">dokument WWF</comment> @@ -771,6 +835,7 @@ <comment xml:lang="eu">WWF dokumentua</comment> <comment xml:lang="fi">WWF-asiakirja</comment> <comment xml:lang="fr">document WWF</comment> + <comment xml:lang="ga">cáipéis WWF</comment> <comment xml:lang="gl">documento de WWF</comment> <comment xml:lang="he">מסמך WWF</comment> <comment xml:lang="hr">WWF dokument</comment> @@ -788,7 +853,7 @@ <comment xml:lang="pl">Dokument WWF</comment> <comment xml:lang="pt">documento WWF</comment> <comment xml:lang="pt_BR">Documento WWF</comment> - <comment xml:lang="ru">документ WWF</comment> + <comment xml:lang="ru">Документ WWF</comment> <comment xml:lang="sk">Dokument WWF</comment> <comment xml:lang="sl">Dokument WWF</comment> <comment xml:lang="sr">ВВФ документ</comment> @@ -805,6 +870,7 @@ <mime-type type="application/pdf"> <comment>PDF document</comment> <comment xml:lang="ar">مستند PDF</comment> + <comment xml:lang="ast">Documentu PDF</comment> <comment xml:lang="be@latin">Dakument PDF</comment> <comment xml:lang="bg">Документ — PDF</comment> <comment xml:lang="ca">document PDF</comment> @@ -842,7 +908,7 @@ <comment xml:lang="pt">documento PDF</comment> <comment xml:lang="pt_BR">Documento PDF</comment> <comment xml:lang="ro">Document PDF</comment> - <comment xml:lang="ru">документ PDF</comment> + <comment xml:lang="ru">Документ PDF</comment> <comment xml:lang="sk">Dokument PDF</comment> <comment xml:lang="sl">Dokument PDF</comment> <comment xml:lang="sq">Dokument PDF</comment> @@ -868,6 +934,7 @@ <mime-type type="application/xspf+xml"> <comment>XSPF playlist</comment> <comment xml:lang="ar">قائمة تشغيل XSPF</comment> + <comment xml:lang="ast">Llista de reproducción XSPF</comment> <comment xml:lang="be@latin">Śpis piesień XSPF</comment> <comment xml:lang="bg">Списък за изпълнение — XSPF</comment> <comment xml:lang="ca">llista de reproducció XSPF</comment> @@ -885,7 +952,7 @@ <comment xml:lang="ga">seinmliosta XSPF</comment> <comment xml:lang="gl">lista de reprodución XSPF</comment> <comment xml:lang="he">רשימת נגינה XSPF</comment> - <comment xml:lang="hr">XSPF popis za reprodukciju</comment> + <comment xml:lang="hr">XSPF popis izvođenja</comment> <comment xml:lang="hu">XSPF-lejátszólista</comment> <comment xml:lang="ia">Lista de selection XSPF</comment> <comment xml:lang="id">Senarai pular XSPF</comment> @@ -903,7 +970,7 @@ <comment xml:lang="pt">lista de reprodução XSPF</comment> <comment xml:lang="pt_BR">Lista de reprodução XSPF</comment> <comment xml:lang="ro">Listă XSPF</comment> - <comment xml:lang="ru">список воспроизведения XSPF</comment> + <comment xml:lang="ru">Список воспроизведения XSPF</comment> <comment xml:lang="sk">Zoznam skladieb XSPF</comment> <comment xml:lang="sl">Seznam predvajanja XSPF</comment> <comment xml:lang="sq">Listë titujsh XSPF</comment> @@ -929,11 +996,12 @@ <mime-type type="application/x-windows-themepack"> <comment>Microsoft Windows theme pack</comment> <comment xml:lang="ar">حزمة سمات Microsoft Works</comment> + <comment xml:lang="ast">Paquete de temes de Microsoft Windows</comment> <comment xml:lang="bg">Пакет с тема — Microsoft Windows</comment> <comment xml:lang="ca">paquet de temes de Microsoft Windows</comment> <comment xml:lang="cs">balík motivů Microsoft Windows</comment> <comment xml:lang="da">Microsoft Windows-temapakke</comment> - <comment xml:lang="de">Themenpaket für Microsoft Windows</comment> + <comment xml:lang="de">Microsoft-Windows-Themenpaket</comment> <comment xml:lang="el">Πακέτο θέματος Microsoft Windows</comment> <comment xml:lang="en_GB">Microsoft Windows theme pack</comment> <comment xml:lang="es">paquete de tema para Microsoft Windows</comment> @@ -961,7 +1029,7 @@ <comment xml:lang="pt">pacote de tema Microsoft Windows</comment> <comment xml:lang="pt_BR">Pacote de temas do Microsoft Windows</comment> <comment xml:lang="ro">Pachet de teme Microsoft Windows</comment> - <comment xml:lang="ru">пакет темы Microsoft Windows</comment> + <comment xml:lang="ru">Пакет темы Microsoft Windows</comment> <comment xml:lang="sk">Balík tém Microsoft Windows</comment> <comment xml:lang="sl">Datoteka teme Microsoft Windows</comment> <comment xml:lang="sr">пакет теме Мајкрософт Виндоуза</comment> @@ -976,6 +1044,7 @@ </mime-type> <mime-type type="audio/x-amzxml"> <comment>AmazonMP3 download file</comment> + <comment xml:lang="ast">Ficheru de descarga AmazonMP3</comment> <comment xml:lang="ca">fitxer baixat d'AmazonMP3</comment> <comment xml:lang="cs">soubor stahování AmazonMP3</comment> <comment xml:lang="da">AmazonMP3-downloadfil</comment> @@ -985,6 +1054,7 @@ <comment xml:lang="es">archivo de descarga de AmazonMP3</comment> <comment xml:lang="eu">AmazonMP3 deskarga fitxategia</comment> <comment xml:lang="fr">fichier téléchargé AmazonMP3</comment> + <comment xml:lang="ga">comhad íoslódáilte AmazonMP3</comment> <comment xml:lang="gl">Ficheiro de descarga de AmazonMP3</comment> <comment xml:lang="he">קובץ הורדת AmazonMP3</comment> <comment xml:lang="hr">AmazonMP3 preuzeta datoteka</comment> @@ -1000,7 +1070,7 @@ <comment xml:lang="pl">Pobrany plik AmazonMP3</comment> <comment xml:lang="pt">ficheiro transferido AmazonMP3</comment> <comment xml:lang="pt_BR">Arquivo de download AmazonMP3</comment> - <comment xml:lang="ru">файл загрузки AmazonMP3</comment> + <comment xml:lang="ru">Файл загрузки AmazonMP3</comment> <comment xml:lang="sk">Stiahnutý súbor AmazonMP3 </comment> <comment xml:lang="sl">Datoteka prenosa AmazonMP3</comment> <comment xml:lang="sr">датотека преузимања АмазонаМП3</comment> @@ -1014,6 +1084,7 @@ <mime-type type="audio/x-gsm"> <comment>GSM 06.10 audio</comment> <comment xml:lang="ar">GSM 06.10 سمعي</comment> + <comment xml:lang="ast">Audiu GSM 6.10</comment> <comment xml:lang="bg">Аудио — GSM 06.10</comment> <comment xml:lang="ca">àudio de GSM 06.10</comment> <comment xml:lang="cs">zvuk GSM 06.10</comment> @@ -1029,7 +1100,7 @@ <comment xml:lang="ga">fuaim GSM 06.10</comment> <comment xml:lang="gl">son de GSM 06.10</comment> <comment xml:lang="he">שמע GSM 06.10</comment> - <comment xml:lang="hr">GSM 06.10 audio</comment> + <comment xml:lang="hr">GSM 06.10 zvučni zapis</comment> <comment xml:lang="hu">GSM 06.10 hang</comment> <comment xml:lang="ia">Audio GSM 06.10</comment> <comment xml:lang="id">Audio GSM 06.10</comment> @@ -1046,7 +1117,7 @@ <comment xml:lang="pt">áudio GSM 06.10</comment> <comment xml:lang="pt_BR">Áudio GSM 06.10</comment> <comment xml:lang="ro">GSM 06.10 audio</comment> - <comment xml:lang="ru">аудио GSM 06.10</comment> + <comment xml:lang="ru">Аудио GSM 06.10</comment> <comment xml:lang="sk">Zvuk GSM 06.10</comment> <comment xml:lang="sl">Zvočna datoteka GSM 06.10</comment> <comment xml:lang="sr">ГСМ 06.10 звук</comment> @@ -1063,6 +1134,7 @@ <mime-type type="audio/x-iriver-pla"> <comment>iRiver Playlist</comment> <comment xml:lang="ar">قائمة تشغيل iRiver</comment> + <comment xml:lang="ast">Llista de reproducción iRiver</comment> <comment xml:lang="be@latin">Śpis piesień iRiver</comment> <comment xml:lang="bg">Списък за изпълнение — iRiver</comment> <comment xml:lang="ca">llista de reproducció iRiver</comment> @@ -1080,7 +1152,7 @@ <comment xml:lang="ga">seinmliosta iRiver</comment> <comment xml:lang="gl">lista de reprodución de iRiver</comment> <comment xml:lang="he">רשימת נגינה של iRiver</comment> - <comment xml:lang="hr">iRiver popis za reprodukciju</comment> + <comment xml:lang="hr">iRiver popis izvođenja</comment> <comment xml:lang="hu">iRiver lejátszólista</comment> <comment xml:lang="ia">Lista de selection iRiver</comment> <comment xml:lang="id">iRiver Playlist</comment> @@ -1098,7 +1170,7 @@ <comment xml:lang="pt">lista de reprodução iRiver</comment> <comment xml:lang="pt_BR">Lista de reprodução do iRiver</comment> <comment xml:lang="ro">Listă iRiver</comment> - <comment xml:lang="ru">список воспроизведения iRiver</comment> + <comment xml:lang="ru">Список воспроизведения iRiver</comment> <comment xml:lang="sk">Zoznam skladieb iRiver</comment> <comment xml:lang="sl">Seznam predvajanja iRiver</comment> <comment xml:lang="sq">Listë titujsh iRiver</comment> @@ -1117,6 +1189,7 @@ <mime-type type="application/pgp-encrypted"> <comment>PGP/MIME-encrypted message header</comment> <comment xml:lang="ar">ترويسة رسالة PGP/MIME-مشفرة</comment> + <comment xml:lang="ast">Testera de mensaxe cifrada en PGP/MIME</comment> <comment xml:lang="be@latin">Zahałovak paviedamleńnia, zašyfravany ŭ PGP/MIME</comment> <comment xml:lang="bg">Заглавна част на шифрирано съобщение — PGP/MIME</comment> <comment xml:lang="ca">capçalera de missatge amb xifrat PGP/MIME</comment> @@ -1153,7 +1226,7 @@ <comment xml:lang="pt">cabeçalho de mensagem encriptada com PGP/MIME</comment> <comment xml:lang="pt_BR">Cabeçalho de mensagem criptografada PGP/MIME</comment> <comment xml:lang="ro">Antet de mesaj encriptat PGP/MIME</comment> - <comment xml:lang="ru">заголовок сообщения, зашифрованный PGP/MIME</comment> + <comment xml:lang="ru">Заголовок сообщения, зашифрованный PGP/MIME</comment> <comment xml:lang="sk">Hlavičke správy zašifrovaná pomocou PGP/MIME</comment> <comment xml:lang="sl">Datoteka glave šifriranega sporočila PGP/MIME</comment> <comment xml:lang="sq">Header mesazhi të kriptuar PGP/MIME</comment> @@ -1177,6 +1250,7 @@ <mime-type type="application/pgp-keys"> <comment>PGP keys</comment> <comment xml:lang="ar">مفاتيح PGP</comment> + <comment xml:lang="ast">Claves PGP</comment> <comment xml:lang="az">PGP açarları</comment> <comment xml:lang="be@latin">Klučy PGP</comment> <comment xml:lang="bg">Ключове — PGP</comment> @@ -1215,7 +1289,7 @@ <comment xml:lang="pt">chaves PGP</comment> <comment xml:lang="pt_BR">Chaves PGP</comment> <comment xml:lang="ro">Chei PGP</comment> - <comment xml:lang="ru">ключи PGP</comment> + <comment xml:lang="ru">Ключи PGP</comment> <comment xml:lang="sk">Kľúče PGP</comment> <comment xml:lang="sl">Datoteka ključa PGP</comment> <comment xml:lang="sq">Kyçe PGP</comment> @@ -1252,7 +1326,7 @@ <comment xml:lang="ca">signatura OpenPGP abstreta</comment> <comment xml:lang="cs">oddělený podpis OpenPGP</comment> <comment xml:lang="da">frigjort OpenPGP-signatur</comment> - <comment xml:lang="de">Isolierte OpenPGP-Signatur</comment> + <comment xml:lang="de">isolierte OpenPGP-Signatur</comment> <comment xml:lang="el">Αποκομμένη υπογραφή OpenPGP</comment> <comment xml:lang="en_GB">detached OpenPGP signature</comment> <comment xml:lang="eo">dekroĉa OpenPGP-subskribo</comment> @@ -1264,7 +1338,7 @@ <comment xml:lang="ga">síniú OpenPGP scartha</comment> <comment xml:lang="gl">sinatura de OpenPGP independente</comment> <comment xml:lang="he">חתימת OpenPGP מנותקת</comment> - <comment xml:lang="hr">odvojen OpenPGP potpis</comment> + <comment xml:lang="hr">Odvojen OpenPGP potpis</comment> <comment xml:lang="hu">leválasztott OpenPGP-aláírás</comment> <comment xml:lang="ia">Signatura OpenPGP distachate</comment> <comment xml:lang="id">tanda tangan OpenPGP yang terlepas</comment> @@ -1283,7 +1357,7 @@ <comment xml:lang="pt">assinatura OpenPGP solta</comment> <comment xml:lang="pt_BR">Assinatura OpenPGP destacada</comment> <comment xml:lang="ro">semnătură OpenPGP detașată</comment> - <comment xml:lang="ru">отсоединённая подпись OpenPGP</comment> + <comment xml:lang="ru">Отсоединённая подпись OpenPGP</comment> <comment xml:lang="sk">Oddelený podpis OpenPGP</comment> <comment xml:lang="sl">odpet podpis OpenPGP</comment> <comment xml:lang="sq">Firmë e shkëputur OpenPGP</comment> @@ -1307,6 +1381,7 @@ <mime-type type="application/pkcs7-mime"> <comment>PKCS#7 Message or Certificate</comment> + <comment xml:lang="ast">Mensaxe o certificáu PKCS#7</comment> <comment xml:lang="ca">missatge o certificat PKCS#7</comment> <comment xml:lang="cs">zpráva nebo certifikát PKCS#7</comment> <comment xml:lang="da">PKCS#7-besked eller certifikat</comment> @@ -1317,6 +1392,7 @@ <comment xml:lang="eu">PKCS#7 mezu edo zertifikazioa</comment> <comment xml:lang="fi">PKCS#7-viesti tai -varmenne</comment> <comment xml:lang="fr">Message ou certificat PKCS#7</comment> + <comment xml:lang="ga">Teachtaireacht nó Teastas PKCS#7</comment> <comment xml:lang="gl">Mensaxe ou certificado PKCS#7</comment> <comment xml:lang="he">הודעה או אישור מסוג PKCS#7</comment> <comment xml:lang="hr">PKCS#7 poruka ili vjerodajnica</comment> @@ -1332,7 +1408,7 @@ <comment xml:lang="pl">Wiadomość lub certyfikat PKCS#7</comment> <comment xml:lang="pt">Mensagem ou certificado PKCS#7</comment> <comment xml:lang="pt_BR">Certificado ou Mensagem PKCS#7</comment> - <comment xml:lang="ru">сообщение или сертификат PKCS#7</comment> + <comment xml:lang="ru">Сообщение или сертификат PKCS#7</comment> <comment xml:lang="sk">Správa alebo certifikát PKCS#7</comment> <comment xml:lang="sl">Sporočilo ali dovoljenje PKCS#7</comment> <comment xml:lang="sr">ПКЦС#7 порука или уверење</comment> @@ -1355,7 +1431,7 @@ <comment xml:lang="ca">signatura S/MIME abstreta</comment> <comment xml:lang="cs">oddělený podpis S/MIME</comment> <comment xml:lang="da">frigjort S/MIME-signatur</comment> - <comment xml:lang="de">Isolierte S/MIME-Signatur</comment> + <comment xml:lang="de">isolierte S/MIME-Signatur</comment> <comment xml:lang="el">Αποκομμένη υπογραφή S/MIME</comment> <comment xml:lang="en_GB">detached S/MIME signature</comment> <comment xml:lang="eo">dekroĉa S/MIME-subskribo</comment> @@ -1367,7 +1443,7 @@ <comment xml:lang="ga">síniú S/MIME scartha</comment> <comment xml:lang="gl">sinatura S/MIME independente</comment> <comment xml:lang="he">חתימת S/MIME מנותקת</comment> - <comment xml:lang="hr">odvojen S/MIME potpis</comment> + <comment xml:lang="hr">Odvojen S/MIME potpis</comment> <comment xml:lang="hu">leválasztott S/MIME-aláírás</comment> <comment xml:lang="ia">Signatura S/MIME distachate</comment> <comment xml:lang="id">tanda tangan S/MIME yang terlepas</comment> @@ -1386,7 +1462,7 @@ <comment xml:lang="pt">assinatura S/MIME solta</comment> <comment xml:lang="pt_BR">Assinatura S/MIME destacada</comment> <comment xml:lang="ro">semnătură S/MIME detașată</comment> - <comment xml:lang="ru">отсоединённая подпись S/MIME</comment> + <comment xml:lang="ru">Отсоединённая подпись S/MIME</comment> <comment xml:lang="sk">Oddelený podpis S/MIME</comment> <comment xml:lang="sl">odpet podpis S/MIME</comment> <comment xml:lang="sq">Firmë e shkëputur S/MIME</comment> @@ -1437,7 +1513,7 @@ <comment xml:lang="pt">chave privada PKCS#8</comment> <comment xml:lang="pt_BR">Chave privada PKCS#8</comment> <comment xml:lang="ro">Cheie privată PKCS#8</comment> - <comment xml:lang="ru">личный ключ PKCS#8</comment> + <comment xml:lang="ru">Личный ключ PKCS#8</comment> <comment xml:lang="sk">Súkromný kľúč PKCS#8</comment> <comment xml:lang="sl">Datoteka osebnega ključa PKCS#8</comment> <comment xml:lang="sr">ПКЦС#8 лични кључ</comment> @@ -1450,6 +1526,12 @@ <expanded-acronym>Public-Key Cryptography Standards</expanded-acronym> <glob pattern="*.p8"/> </mime-type> + <mime-type type="application/pkcs8-encrypted"> + <comment>PKCS#8 private key (encrypted)</comment> + <acronym>PKCS</acronym> + <expanded-acronym>Public-Key Cryptography Standards</expanded-acronym> + <glob pattern="*.p8e"/> + </mime-type> <mime-type type="application/pkcs10"> <comment>PKCS#10 certification request</comment> <comment xml:lang="ar">طلب شهادة PKCS#10</comment> @@ -1487,7 +1569,7 @@ <comment xml:lang="pt">pedido de certificação PKCS#10</comment> <comment xml:lang="pt_BR">Pedido de certificação PKCS#12</comment> <comment xml:lang="ro">Cerere de certificat PKCS#10</comment> - <comment xml:lang="ru">запрос сертификации PKCS#10</comment> + <comment xml:lang="ru">Запрос сертификации PKCS#10</comment> <comment xml:lang="sk">Požiadavka na certifikát PKCS#10</comment> <comment xml:lang="sl">Datoteka potrdila PKCS#10</comment> <comment xml:lang="sq">Kërkesë çertifikimi PKCS#10</comment> @@ -1506,6 +1588,7 @@ <mime-type type="application/pkix-cert"> <comment>X.509 certificate</comment> <comment xml:lang="ar">شهادة X.509</comment> + <comment xml:lang="ast">Certificáu X.509</comment> <comment xml:lang="bg">Сертификат — X.509</comment> <comment xml:lang="ca">certificat X.509</comment> <comment xml:lang="cs">certifikát X.509</comment> @@ -1521,7 +1604,7 @@ <comment xml:lang="ga">teastas X.509</comment> <comment xml:lang="gl">Certificado X.509</comment> <comment xml:lang="he">אישור X.509</comment> - <comment xml:lang="hr">X.509 certifikat</comment> + <comment xml:lang="hr">X.509 vjerodajnica</comment> <comment xml:lang="hu">X.509 tanúsítvány</comment> <comment xml:lang="ia">Certificato X.509</comment> <comment xml:lang="id">Sertifikat X.509</comment> @@ -1537,7 +1620,7 @@ <comment xml:lang="pt">certificado X.509</comment> <comment xml:lang="pt_BR">Certificado X.509</comment> <comment xml:lang="ro">Certificat X.509</comment> - <comment xml:lang="ru">сертификат X.509</comment> + <comment xml:lang="ru">Сертификат X.509</comment> <comment xml:lang="sk">Certifikát X.509</comment> <comment xml:lang="sl">Datoteka potrdila X.509</comment> <comment xml:lang="sr">Икс.509 уверење</comment> @@ -1551,6 +1634,7 @@ <mime-type type="application/pkix-crl"> <comment>Certificate revocation list</comment> <comment xml:lang="ar">قائمة إبطال الشهادات</comment> + <comment xml:lang="ast">Llistáu de revocación de certificaos</comment> <comment xml:lang="bg">Списък с отхвърлени сертификати</comment> <comment xml:lang="ca">llista de revocació de certificats</comment> <comment xml:lang="cs">seznam odvolaných certifikátů</comment> @@ -1563,10 +1647,10 @@ <comment xml:lang="fi">Varmenteiden sulkulista</comment> <comment xml:lang="fo">Prógv afturtøkulisti</comment> <comment xml:lang="fr">liste de révocation de certificat</comment> - <comment xml:lang="ga">liosta teastas cúlghairmthe</comment> + <comment xml:lang="ga">Liosta teastas cúlghairmthe</comment> <comment xml:lang="gl">lista de certificados de revogación</comment> <comment xml:lang="he">רשימת אישורים מבוטלים</comment> - <comment xml:lang="hr">popis povučenih certifikata</comment> + <comment xml:lang="hr">Popis opozvanih vjerodajnica</comment> <comment xml:lang="hu">Tanúsítvány-visszavonási lista</comment> <comment xml:lang="ia">Lista de revocation de certificatos</comment> <comment xml:lang="id">Daftar pencabutan sertificat (CRL)</comment> @@ -1596,6 +1680,7 @@ <mime-type type="application/pkix-pkipath"> <comment>PkiPath certification path</comment> <comment xml:lang="ar">مسار شهادة PkiPath</comment> + <comment xml:lang="ast">Camín de certificación PkiPath</comment> <comment xml:lang="bg">Сертификационна верига — PkiPath</comment> <comment xml:lang="ca">camí cap a la certificació PkiPath</comment> <comment xml:lang="cs">cesta k certifikátu PkiPath</comment> @@ -1627,7 +1712,7 @@ <comment xml:lang="pt">caminho de certificação PkiPath</comment> <comment xml:lang="pt_BR">Pedido de certificação PkiPath</comment> <comment xml:lang="ro">Cale certificare PkiPath</comment> - <comment xml:lang="ru">путь сертификации PkiPath</comment> + <comment xml:lang="ru">Путь сертификации PkiPath</comment> <comment xml:lang="sk">Cesta k certifikátu PkiPath</comment> <comment xml:lang="sl">Datoteka poti potrdila PkiPath</comment> <comment xml:lang="sr">путања уверења ПкиПат-а</comment> @@ -1642,6 +1727,7 @@ <mime-type type="application/postscript"> <comment>PS document</comment> <comment xml:lang="ar">مستند PS</comment> + <comment xml:lang="ast">Documentu PS</comment> <comment xml:lang="be@latin">Dakument PS</comment> <comment xml:lang="bg">Документ — PS</comment> <comment xml:lang="ca">document PS</comment> @@ -1677,7 +1763,7 @@ <comment xml:lang="pt">documento PS</comment> <comment xml:lang="pt_BR">Documento PS</comment> <comment xml:lang="ro">Document PS</comment> - <comment xml:lang="ru">документ PS</comment> + <comment xml:lang="ru">Документ PS</comment> <comment xml:lang="sk">Dokument PS</comment> <comment xml:lang="sl">Dokument PS</comment> <comment xml:lang="sq">Dokument PS</comment> @@ -1701,6 +1787,7 @@ <mime-type type="application/prs.plucker"> <comment>Plucker document</comment> <comment xml:lang="ar">مستند Plucker</comment> + <comment xml:lang="ast">Documentu Plucker</comment> <comment xml:lang="be@latin">Dakument Plucker</comment> <comment xml:lang="bg">Документ — Plucker</comment> <comment xml:lang="ca">document Plucker</comment> @@ -1736,7 +1823,7 @@ <comment xml:lang="pt">documento Plucker</comment> <comment xml:lang="pt_BR">Documento do Plucker</comment> <comment xml:lang="ro">Document Plucker</comment> - <comment xml:lang="ru">документ Plucker</comment> + <comment xml:lang="ru">Документ Plucker</comment> <comment xml:lang="sk">Dokument Plucker</comment> <comment xml:lang="sl">Dokument Plucker</comment> <comment xml:lang="sq">Dokument Plucker</comment> @@ -1754,20 +1841,32 @@ </mime-type> <mime-type type="application/raml+yaml"> <comment>RAML document</comment> + <comment xml:lang="ast">Documentu RAML</comment> <comment xml:lang="ca">document RAML</comment> + <comment xml:lang="cs">dokument RAML</comment> <comment xml:lang="da">RAML-dokument</comment> <comment xml:lang="de">RAML-Dokument</comment> + <comment xml:lang="en_GB">RAML document</comment> <comment xml:lang="es">documento RAML</comment> + <comment xml:lang="eu">RAML dokumentua</comment> <comment xml:lang="fi">RAML-asiakirja</comment> <comment xml:lang="fr">document RAML</comment> + <comment xml:lang="ga">cáipéis RAML</comment> <comment xml:lang="he">מסמך RAML</comment> + <comment xml:lang="hr">RAML dokument</comment> <comment xml:lang="hu">RAML dokumentum</comment> + <comment xml:lang="id">dokumen RAML</comment> + <comment xml:lang="it">Documento RAML</comment> <comment xml:lang="kk">RAML құжаты</comment> <comment xml:lang="ko">RAML 문서</comment> + <comment xml:lang="oc">Document RAML</comment> <comment xml:lang="pl">Dokument RAML</comment> <comment xml:lang="pt_BR">Documento RAML</comment> - <comment xml:lang="ru">документ RAML</comment> + <comment xml:lang="ru">Документ RAML</comment> <comment xml:lang="sk">Dokument RAML</comment> + <comment xml:lang="sr">РАМЛ документ</comment> + <comment xml:lang="sv">RAML-dokument</comment> + <comment xml:lang="tr">RAML belgesi</comment> <comment xml:lang="uk">документ RAML</comment> <comment xml:lang="zh_CN">RAML 文档</comment> <comment xml:lang="zh_TW">RAML 文件</comment> @@ -1831,6 +1930,7 @@ <mime-type type="application/rtf"> <comment>RTF document</comment> <comment xml:lang="ar">مستند RTF</comment> + <comment xml:lang="ast">Documentu RTF</comment> <comment xml:lang="be@latin">Dakument RTF</comment> <comment xml:lang="bg">Документ — RTF</comment> <comment xml:lang="ca">document RTF</comment> @@ -1866,7 +1966,7 @@ <comment xml:lang="pt">documento RTF</comment> <comment xml:lang="pt_BR">Documento RTF</comment> <comment xml:lang="ro">Document RTF</comment> - <comment xml:lang="ru">документ RTF</comment> + <comment xml:lang="ru">Документ RTF</comment> <comment xml:lang="sk">Dokument RTF</comment> <comment xml:lang="sl">Dokument RTF</comment> <comment xml:lang="sq">Dokument RTF</comment> @@ -1902,7 +2002,7 @@ <comment xml:lang="eu">Sieve posta-iragazki script-a</comment> <comment xml:lang="fi">Sieve-postinsuodatuskomentotiedosto</comment> <comment xml:lang="fr">script de filtrage de courriel Sieve</comment> - <comment xml:lang="ga">script scagaire phost Sieve</comment> + <comment xml:lang="ga">script scagaire r-phost Sieve</comment> <comment xml:lang="gl">Script de filtro de correo Sieve</comment> <comment xml:lang="he">תסריט סינון דואר של Sieve</comment> <comment xml:lang="hr">Sieve skripta filtriranja pošte</comment> @@ -1923,7 +2023,7 @@ <comment xml:lang="pt">Script de filtragem de correio Sieve</comment> <comment xml:lang="pt_BR">Script de filtro de mensagens do Sieve</comment> <comment xml:lang="ro">Script filtrare email Sieve</comment> - <comment xml:lang="ru">сценарий почтового фильтра Sieve</comment> + <comment xml:lang="ru">Сценарий почтового фильтра Sieve</comment> <comment xml:lang="sk">Skript poštového filtra Sieve</comment> <comment xml:lang="sl">Skriptna datoteka Sieve poštnega filtra</comment> <comment xml:lang="sq">Script filtrim poste Sieve</comment> @@ -1941,6 +2041,7 @@ <mime-type type="application/smil+xml"> <comment>SMIL document</comment> <comment xml:lang="ar">مستند SMIL</comment> + <comment xml:lang="ast">Documentu SMIL</comment> <comment xml:lang="be@latin">Dakument SMIL</comment> <comment xml:lang="bg">Документ — SMIL</comment> <comment xml:lang="ca">document SMIL</comment> @@ -1976,7 +2077,7 @@ <comment xml:lang="pt">documento SMIL</comment> <comment xml:lang="pt_BR">Documento SMIL</comment> <comment xml:lang="ro">Document SMIL</comment> - <comment xml:lang="ru">документ SMIL</comment> + <comment xml:lang="ru">Документ SMIL</comment> <comment xml:lang="sk">Dokument SMIL</comment> <comment xml:lang="sl">Dokument SMIL</comment> <comment xml:lang="sq">Dokument SMIL</comment> @@ -2022,7 +2123,7 @@ <comment xml:lang="ga">seinmliosta WPL</comment> <comment xml:lang="gl">lista de reprodución WPL</comment> <comment xml:lang="he">רשימת נגינה WPL</comment> - <comment xml:lang="hr">WPL popis za reprodukciju</comment> + <comment xml:lang="hr">WPL popis izvođenja</comment> <comment xml:lang="hu">WPL-lejátszólista</comment> <comment xml:lang="ia">Lista de selection WPL</comment> <comment xml:lang="id">Senarai putar WPL</comment> @@ -2038,7 +2139,7 @@ <comment xml:lang="pt">lista de reprodução WPL</comment> <comment xml:lang="pt_BR">Lista de reprodução do WPL</comment> <comment xml:lang="ro">Listă redare WPL</comment> - <comment xml:lang="ru">список воспроизведения WPL</comment> + <comment xml:lang="ru">Список воспроизведения WPL</comment> <comment xml:lang="sk">Zoznam skladieb WPL</comment> <comment xml:lang="sl">Seznam predvajanja WPL</comment> <comment xml:lang="sr">ВПЛ списак нумера</comment> @@ -2094,7 +2195,7 @@ <comment xml:lang="pt">base de dados SQLite2</comment> <comment xml:lang="pt_BR">Banco de dados SQLite2</comment> <comment xml:lang="ro">Bază de date SQLite2</comment> - <comment xml:lang="ru">база данных SQLite2</comment> + <comment xml:lang="ru">База данных SQLite2</comment> <comment xml:lang="sk">Databáza SQLite2</comment> <comment xml:lang="sl">Podatkovna zbirka SQLite2</comment> <comment xml:lang="sq">Bazë me të dhëna SQLite2</comment> @@ -2105,11 +2206,12 @@ <comment xml:lang="vi">Cơ sở dữ liệu SQLite2</comment> <comment xml:lang="zh_CN">SQLite2 数据库</comment> <comment xml:lang="zh_TW">SQLite2 資料庫</comment> + <glob pattern="*.sqlite2"/> <magic> <match value="** This file contains an SQLite" type="string" offset="0"/> </magic> </mime-type> - <mime-type type="application/x-sqlite3"> + <mime-type type="application/vnd.sqlite3"> <comment>SQLite3 database</comment> <comment xml:lang="ar">قاعدة بيانات SQLite3</comment> <comment xml:lang="be@latin">Baza źviestak SQLite3</comment> @@ -2147,7 +2249,7 @@ <comment xml:lang="pt">base de dados SQLite3</comment> <comment xml:lang="pt_BR">Banco de dados SQLite3</comment> <comment xml:lang="ro">Bază de date SQLite3</comment> - <comment xml:lang="ru">база данных SQLite3</comment> + <comment xml:lang="ru">База данных SQLite3</comment> <comment xml:lang="sk">Databáza SQLite3</comment> <comment xml:lang="sl">Podatkovna zbirka SQLite3</comment> <comment xml:lang="sq">Bazë me të dhëna SQLite3</comment> @@ -2158,9 +2260,11 @@ <comment xml:lang="vi">Cơ sở dữ liệu SQLite3</comment> <comment xml:lang="zh_CN">SQLite3 数据库</comment> <comment xml:lang="zh_TW">SQLite3 資料庫</comment> + <glob pattern="*.sqlite3"/> <magic> <match value="SQLite format 3" type="string" offset="0"/> </magic> + <alias type="application/x-sqlite3"/> </mime-type> <mime-type type="application/x-gedcom"> <comment>GEDCOM family history</comment> @@ -2189,7 +2293,7 @@ <comment xml:lang="ja">GEDCOM 家系図データ</comment> <comment xml:lang="ka">GEDCOM ოჯახის ისტორია</comment> <comment xml:lang="kk">GEDCOM отбасы тарихы</comment> - <comment xml:lang="ko">GEDCOM 가족 내력</comment> + <comment xml:lang="ko">GEDCOM 패밀리 기록</comment> <comment xml:lang="lt">GEDCOM šeimos istorija</comment> <comment xml:lang="lv">GEDCOM ģimenes vēsture</comment> <comment xml:lang="nb">GEDCOM-familiehistorikk</comment> @@ -2200,7 +2304,7 @@ <comment xml:lang="pt">história familiar GEDCOM</comment> <comment xml:lang="pt_BR">Histórico familiar do GEDCOM</comment> <comment xml:lang="ro">Tablou genealogic GEDCOM</comment> - <comment xml:lang="ru">история семьи GEDCOM</comment> + <comment xml:lang="ru">История семьи GEDCOM</comment> <comment xml:lang="sk">Rodokmeň GEDCOM</comment> <comment xml:lang="sl">Datoteka družinske zgodovine GEDCOM</comment> <comment xml:lang="sq">Kronollogji familje GEDCOM</comment> @@ -2224,6 +2328,7 @@ <mime-type type="video/x-flv"> <comment>Flash video</comment> <comment xml:lang="ar">Flash مرئي</comment> + <comment xml:lang="ast">Videu en Flash</comment> <comment xml:lang="be@latin">Videa Flash</comment> <comment xml:lang="bg">Видео — Flash</comment> <comment xml:lang="ca">vídeo de Flash</comment> @@ -2241,7 +2346,7 @@ <comment xml:lang="ga">físeán Flash</comment> <comment xml:lang="gl">vídeo Flash</comment> <comment xml:lang="he">וידאו של פלאש</comment> - <comment xml:lang="hr">Flash video</comment> + <comment xml:lang="hr">Flash video snimka</comment> <comment xml:lang="hu">Flash videó</comment> <comment xml:lang="ia">Video Flash</comment> <comment xml:lang="id">Video Flash</comment> @@ -2260,7 +2365,7 @@ <comment xml:lang="pt">vídeo Flash</comment> <comment xml:lang="pt_BR">Vídeo Flash</comment> <comment xml:lang="ro">Video Flash</comment> - <comment xml:lang="ru">видео Flash</comment> + <comment xml:lang="ru">Видео Flash</comment> <comment xml:lang="sk">Video Flash</comment> <comment xml:lang="sl">Video datoteka Flash</comment> <comment xml:lang="sq">Video Flash</comment> @@ -2269,7 +2374,7 @@ <comment xml:lang="tr">Flash video</comment> <comment xml:lang="uk">відеокліп Flash</comment> <comment xml:lang="vi">Ảnh động Flash</comment> - <comment xml:lang="zh_CN">Flash 影片</comment> + <comment xml:lang="zh_CN">Flash 视频</comment> <comment xml:lang="zh_TW">Flash 視訊</comment> <generic-icon name="video-x-generic"/> <magic priority="50"> @@ -2282,6 +2387,7 @@ </mime-type> <mime-type type="video/x-javafx"> <comment>JavaFX video</comment> + <comment xml:lang="ast">Videu en JavaFX</comment> <comment xml:lang="bg">Видео — JavaFX</comment> <comment xml:lang="ca">vídeo de JavaFX</comment> <comment xml:lang="cs">video JavaFX</comment> @@ -2298,7 +2404,7 @@ <comment xml:lang="ga">físeán JavaFX</comment> <comment xml:lang="gl">vídeo JavaFX</comment> <comment xml:lang="he">וידאו JavaFX</comment> - <comment xml:lang="hr">JavaFX video</comment> + <comment xml:lang="hr">JavaFX video snimka</comment> <comment xml:lang="hu">JavaFX videó</comment> <comment xml:lang="ia">Video JavaFX</comment> <comment xml:lang="id">Video JavaFX</comment> @@ -2313,7 +2419,7 @@ <comment xml:lang="pt">vídeo JavaFX</comment> <comment xml:lang="pt_BR">Vídeo JavaFX</comment> <comment xml:lang="ro">Video JavaFX</comment> - <comment xml:lang="ru">видео JavaFX</comment> + <comment xml:lang="ru">Видео JavaFX</comment> <comment xml:lang="sk">Video JavaFX</comment> <comment xml:lang="sl">Video JavaFX</comment> <comment xml:lang="sr">ЈаваФИкс видео</comment> @@ -2367,7 +2473,7 @@ <comment xml:lang="pt">gravação SGF</comment> <comment xml:lang="pt_BR">Gravação SGF</comment> <comment xml:lang="ro">Înregistrare SGF</comment> - <comment xml:lang="ru">запись SGF</comment> + <comment xml:lang="ru">Запись SGF</comment> <comment xml:lang="sk">Záznam SGF</comment> <comment xml:lang="sl">Datoteka shranjene igre SGF</comment> <comment xml:lang="sq">Regjistrim SGF</comment> @@ -2388,9 +2494,10 @@ <match value="(;FF[4]" type="string" offset="0"/> </magic> </mime-type> - <mime-type type="application/x-xliff"> + <mime-type type="application/xliff+xml"> <comment>XLIFF translation file</comment> <comment xml:lang="ar">ملف ترجمة XLIFF</comment> + <comment xml:lang="ast">Ficheru de traducciones XLIFF</comment> <comment xml:lang="be@latin">Fajł pierakładu XLIFF</comment> <comment xml:lang="bg">Превод — XLIFF</comment> <comment xml:lang="ca">fitxer de traducció XLIFF</comment> @@ -2404,7 +2511,7 @@ <comment xml:lang="fi">XLIFF-käännöstiedosto</comment> <comment xml:lang="fo">XLIFF týðingarfíla</comment> <comment xml:lang="fr">fichier de traduction XLIFF</comment> - <comment xml:lang="ga">comhad aistrithe XLIFF</comment> + <comment xml:lang="ga">comhad aistriúcháin XLIFF</comment> <comment xml:lang="gl">ficheiro de tradución XLIFF</comment> <comment xml:lang="he">קובץ תרגום CLIFF</comment> <comment xml:lang="hr">XLIFF datoteka prijevoda</comment> @@ -2425,7 +2532,7 @@ <comment xml:lang="pt">ficheiro de tradução XLIFF</comment> <comment xml:lang="pt_BR">Arquivo de tradução XLIFF</comment> <comment xml:lang="ro">Fișier de traducere XLIFF</comment> - <comment xml:lang="ru">файл перевода XLIFF</comment> + <comment xml:lang="ru">Файл перевода XLIFF</comment> <comment xml:lang="sk">Súbor prekladu XLIFF</comment> <comment xml:lang="sl">Datoteka prevoda XLIFF</comment> <comment xml:lang="sq">File përkthimesh XLIFF</comment> @@ -2434,7 +2541,7 @@ <comment xml:lang="tr">XLIFF çeviri dosyası</comment> <comment xml:lang="uk">файл перекладу XLIFF</comment> <comment xml:lang="vi">Tập tin dịch XLIFF</comment> - <comment xml:lang="zh_CN">XLIFF 消息翻译文件</comment> + <comment xml:lang="zh_CN">XLIFF 翻译文件</comment> <comment xml:lang="zh_TW">XLIFF 翻譯檔</comment> <acronym>XLIFF</acronym> <expanded-acronym>XML Localization Interchange File Format</expanded-acronym> @@ -2446,10 +2553,12 @@ <match value="<xliff" type="string" offset="0:256"/> </magic> <root-XML namespaceURI='urn:oasis:names:tc:xliff:document:1.1' localName='xliff'/> + <alias type="application/x-xliff"/> </mime-type> <mime-type type="application/x-yaml"> <comment>YAML document</comment> <comment xml:lang="ar">مستند YAML</comment> + <comment xml:lang="ast">Documentu YAML</comment> <comment xml:lang="bg">Документ — YAML</comment> <comment xml:lang="ca">document YAML</comment> <comment xml:lang="cs">dokument YAML</comment> @@ -2482,7 +2591,7 @@ <comment xml:lang="pt">documento YAML</comment> <comment xml:lang="pt_BR">Documento YAML</comment> <comment xml:lang="ro">Document YAML</comment> - <comment xml:lang="ru">документ YAML</comment> + <comment xml:lang="ru">Документ YAML</comment> <comment xml:lang="sk">Dokument YAML</comment> <comment xml:lang="sl">Dokument YAML</comment> <comment xml:lang="sr">ЈАМЛ документ</comment> @@ -2506,6 +2615,7 @@ <mime-type type="application/vnd.corel-draw"> <comment>Corel Draw drawing</comment> <comment xml:lang="ar">تصميم Corel Draw</comment> + <comment xml:lang="ast">Dibuxu de Corel Draw</comment> <comment xml:lang="az">Corel Draw çəkimi</comment> <comment xml:lang="be@latin">Rysunak Corel Draw</comment> <comment xml:lang="bg">Чертеж — Corel Draw</comment> @@ -2533,7 +2643,7 @@ <comment xml:lang="ja">Corel Draw ドロー</comment> <comment xml:lang="ka">Corel Draw-ის ნახაზი</comment> <comment xml:lang="kk">Corel Draw суреті</comment> - <comment xml:lang="ko">Corel Draw 드로잉</comment> + <comment xml:lang="ko">코렐 드로우 드로잉</comment> <comment xml:lang="lt">Corel Draw piešinys</comment> <comment xml:lang="lv">Corel Draw zīmējums</comment> <comment xml:lang="ms">Lukisan Corel Draw</comment> @@ -2545,16 +2655,16 @@ <comment xml:lang="pt">desenho Corel Drawdesenho Corel Draw</comment> <comment xml:lang="pt_BR">Desenho do Corel Draw</comment> <comment xml:lang="ro">Desen Corel Draw</comment> - <comment xml:lang="ru">изображение Corel Draw</comment> + <comment xml:lang="ru">Рисунок Corel Draw</comment> <comment xml:lang="sk">Kresba Corel Draw</comment> <comment xml:lang="sl">Datoteka risbe Corel Draw</comment> <comment xml:lang="sq">Vizatim Corel Draw</comment> - <comment xml:lang="sr">Корел Дров цртеж</comment> + <comment xml:lang="sr">Корелов цртеж</comment> <comment xml:lang="sv">Corel Draw-teckning</comment> <comment xml:lang="tr">Corel Draw çizimi</comment> <comment xml:lang="uk">малюнок Corel Draw</comment> <comment xml:lang="vi">Bản vẽ Corel Draw</comment> - <comment xml:lang="zh_CN">Corel Draw 图形</comment> + <comment xml:lang="zh_CN">Corel Draw 绘图</comment> <comment xml:lang="zh_TW">Corel Draw 繪圖</comment> <generic-icon name="image-x-generic"/> <magic priority="80"> @@ -2572,6 +2682,7 @@ <mime-type type="application/vnd.hp-hpgl"> <comment>HPGL file</comment> <comment xml:lang="ar">ملف HPGL</comment> + <comment xml:lang="ast">Ficheru HPGL</comment> <comment xml:lang="be@latin">Fajł HPGL</comment> <comment xml:lang="bg">Файл — HPGL</comment> <comment xml:lang="ca">fitxer HPGL</comment> @@ -2607,7 +2718,7 @@ <comment xml:lang="pt">ficheiro HPGL</comment> <comment xml:lang="pt_BR">Arquivo HPGL</comment> <comment xml:lang="ro">Fișier HPGL</comment> - <comment xml:lang="ru">файл HPGL</comment> + <comment xml:lang="ru">Файл HPGL</comment> <comment xml:lang="sk">Súbor HPGL</comment> <comment xml:lang="sl">Datoteka HPGL</comment> <comment xml:lang="sq">File HPGL</comment> @@ -2626,6 +2737,7 @@ <mime-type type="application/vnd.hp-pcl"> <comment>PCL file</comment> <comment xml:lang="ar">ملف PCL</comment> + <comment xml:lang="ast">FIcheru PCL</comment> <comment xml:lang="be@latin">Fajł PCL</comment> <comment xml:lang="bg">Файл — PCL</comment> <comment xml:lang="ca">fitxer PCL</comment> @@ -2661,7 +2773,7 @@ <comment xml:lang="pt">ficheiro PCL</comment> <comment xml:lang="pt_BR">Arquivo PCL</comment> <comment xml:lang="ro">Fișier PCL</comment> - <comment xml:lang="ru">файл PCL</comment> + <comment xml:lang="ru">Файл PCL</comment> <comment xml:lang="sk">Súbor PCL</comment> <comment xml:lang="sl">Datoteka PCL</comment> <comment xml:lang="sq">File PCL</comment> @@ -2680,6 +2792,7 @@ <mime-type type="application/vnd.lotus-1-2-3"> <comment>Lotus 1-2-3 spreadsheet</comment> <comment xml:lang="ar">جدول Lotus 1-2-3</comment> + <comment xml:lang="ast">Fueya de cálculu de Lotus 1-2-3</comment> <comment xml:lang="az">Lotus 1-2-3 hesab cədvəli</comment> <comment xml:lang="be@latin">Raźlikovy arkuš Lotus 1-2-3</comment> <comment xml:lang="bg">Таблица — Lotus 1-2-3</comment> @@ -2718,7 +2831,7 @@ <comment xml:lang="pt">folha de cálculo Lotus 1-2-3</comment> <comment xml:lang="pt_BR">Planilha do Lotus 1-2-3</comment> <comment xml:lang="ro">Foaie de calcul Lotus 1-2-3</comment> - <comment xml:lang="ru">электронная таблица Lotus 1-2-3</comment> + <comment xml:lang="ru">Электронная таблица Lotus 1-2-3</comment> <comment xml:lang="sk">Zošit Lotus 1-2-3</comment> <comment xml:lang="sl">Preglednica Lotus 1-2-3</comment> <comment xml:lang="sq">Fletë llogaritjesh Lotus 1-2-3</comment> @@ -2727,7 +2840,7 @@ <comment xml:lang="tr">Lotus 1-2-3 hesap tablosu</comment> <comment xml:lang="uk">ел. таблиця Lotus 1-2-3</comment> <comment xml:lang="vi">Bảng tính Lotus 1-2-3</comment> - <comment xml:lang="zh_CN">Lotus 1-2-3 工作簿</comment> + <comment xml:lang="zh_CN">Lotus 1-2-3 电子表格</comment> <comment xml:lang="zh_TW">Lotus 1-2-3 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -2746,6 +2859,7 @@ </mime-type> <mime-type type="application/vnd.lotus-wordpro"> <comment>Lotus Word Pro</comment> + <comment xml:lang="ast">Lotus Word Pro</comment> <comment xml:lang="ca">Lotus Word Pro</comment> <comment xml:lang="cs">Lotus Word Pro</comment> <comment xml:lang="da">Lotus Word Pro</comment> @@ -2756,6 +2870,7 @@ <comment xml:lang="eu">Lotus Word Pro</comment> <comment xml:lang="fi">Lotus Word Pro</comment> <comment xml:lang="fr">Lotus Word Pro</comment> + <comment xml:lang="ga">Lotus Word Pro</comment> <comment xml:lang="gl">Lotus Word Pro</comment> <comment xml:lang="he">Lotus Word Pro</comment> <comment xml:lang="hr">Lotus Word Pro</comment> @@ -2789,6 +2904,7 @@ <mime-type type="application/vnd.ms-access"> <comment>JET database</comment> <comment xml:lang="ar">قاعدة بيانات JET</comment> + <comment xml:lang="ast">Base de datos JETº</comment> <comment xml:lang="be@latin">Baza źviestak JET</comment> <comment xml:lang="bg">База от данни — JET</comment> <comment xml:lang="ca">base de dades JET</comment> @@ -2824,7 +2940,7 @@ <comment xml:lang="pt">base de dados JET</comment> <comment xml:lang="pt_BR">Banco de dados JET</comment> <comment xml:lang="ro">Bază de date JET</comment> - <comment xml:lang="ru">база данных JET</comment> + <comment xml:lang="ru">База данных JET</comment> <comment xml:lang="sk">Databáza JET</comment> <comment xml:lang="sl">Podatkovna zbirka JET</comment> <comment xml:lang="sq">Bazë me të dhëna JET</comment> @@ -2885,7 +3001,7 @@ <comment xml:lang="pt">arquivo Microsoft Cabinet</comment> <comment xml:lang="pt_BR">Pacote Cabinet da Microsoft</comment> <comment xml:lang="ro">Arhivă Microsoft Cabinet</comment> - <comment xml:lang="ru">архив Microsoft Cabinet</comment> + <comment xml:lang="ru">Архив Microsoft Cabinet</comment> <comment xml:lang="sk">Archív Microsoft Cabinet</comment> <comment xml:lang="sl">Datoteka arhiva Microsoft Cabinet</comment> <comment xml:lang="sr">Мајкрософтова кабинет архива</comment> @@ -2893,7 +3009,7 @@ <comment xml:lang="tr">Microsoft Cabinet arşivi</comment> <comment xml:lang="uk">архів Cabinet Microsoft</comment> <comment xml:lang="vi">Kho lưu Cabinet Microsoft</comment> - <comment xml:lang="zh_CN">Microsoft CAB 归档文件</comment> + <comment xml:lang="zh_CN">Microsoft Cabinet 归档文件</comment> <comment xml:lang="zh_TW">微軟 Cabinet 封存檔</comment> <generic-icon name="package-x-generic"/> <magic priority="60"> @@ -2941,7 +3057,7 @@ <comment xml:lang="pt">folha de cálculo Excel</comment> <comment xml:lang="pt_BR">Planilha do Excel</comment> <comment xml:lang="ro">Foaie de calcul Excel</comment> - <comment xml:lang="ru">электронная таблица Excel</comment> + <comment xml:lang="ru">Электронная таблица Excel</comment> <comment xml:lang="sk">Zošit Excel</comment> <comment xml:lang="sl">Razpredelnica Microsoft Excel</comment> <comment xml:lang="sq">Fletë llogaritje Excel</comment> @@ -2950,7 +3066,7 @@ <comment xml:lang="tr">Excel çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Excel</comment> <comment xml:lang="vi">Bảng tính Excel</comment> - <comment xml:lang="zh_CN">Microsoft Excel 工作簿</comment> + <comment xml:lang="zh_CN">Excel 电子表格</comment> <comment xml:lang="zh_TW">Excel 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -2981,9 +3097,10 @@ <comment xml:lang="eu">Excel gehigarria</comment> <comment xml:lang="fi">Excel-lisäosa</comment> <comment xml:lang="fr">complément Excel</comment> + <comment xml:lang="ga">breiseán Excel</comment> <comment xml:lang="gl">complemento de Excel</comment> <comment xml:lang="he">תוסף של Excel</comment> - <comment xml:lang="hr">Excel priključak</comment> + <comment xml:lang="hr">Excel dodatak</comment> <comment xml:lang="hu">Excel bővítmény</comment> <comment xml:lang="ia">Add-in Excel</comment> <comment xml:lang="id">Add-in Excel</comment> @@ -2998,14 +3115,14 @@ <comment xml:lang="pl">Dodatek Excel</comment> <comment xml:lang="pt">Extensão Excel</comment> <comment xml:lang="pt_BR">Suplemento do Excel</comment> - <comment xml:lang="ru">дополнение Excel</comment> + <comment xml:lang="ru">Дополнение Excel</comment> <comment xml:lang="sk">Doplnok aplikácie Excel</comment> <comment xml:lang="sl">Vstavek Excel</comment> <comment xml:lang="sr">Екселов додатак</comment> <comment xml:lang="sv">Excel-tillägg</comment> <comment xml:lang="tr">Excel eklentisi</comment> <comment xml:lang="uk">додаток Excel</comment> - <comment xml:lang="zh_CN">Excel 附加组件</comment> + <comment xml:lang="zh_CN">Excel 外接程序</comment> <comment xml:lang="zh_TW">Excel 增益集</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.xlam"/> @@ -3024,6 +3141,7 @@ <comment xml:lang="eu">Excel 2007 kalkulu-orri binarioa</comment> <comment xml:lang="fi">Excel 2007:n binaarinen taulukko</comment> <comment xml:lang="fr">feuille de calcul binaire Excel 2007</comment> + <comment xml:lang="ga">scarbhileog dhénártha Excel 2007</comment> <comment xml:lang="gl">ficheiro binario de folla de cálculo Excel 2007</comment> <comment xml:lang="he">גיליון נתונים בינרי של Excel 2007</comment> <comment xml:lang="hr">Excel 2007 binarna proračunska tablica</comment> @@ -3041,14 +3159,14 @@ <comment xml:lang="pl">Binarny arkusz Excel 2007</comment> <comment xml:lang="pt">folha de cálculo binária Excel 2007</comment> <comment xml:lang="pt_BR">Planilha binária do Excel 2007</comment> - <comment xml:lang="ru">двоичная электронная таблица Excel 2007</comment> + <comment xml:lang="ru">Двоичная электронная таблица Excel 2007</comment> <comment xml:lang="sk">Binárny zošit Excel 2007</comment> <comment xml:lang="sl">Binarna preglednica Excel 2007</comment> <comment xml:lang="sr">Ексел 2007 бинарна табела</comment> <comment xml:lang="sv">Binärt Excel 2007-kalkylblad</comment> <comment xml:lang="tr">Excel 2007 ikilik çalışma sayfası</comment> <comment xml:lang="uk">бінарна електронна таблиця Excel 2007</comment> - <comment xml:lang="zh_CN">Excel 2007 二进制工作表</comment> + <comment xml:lang="zh_CN">Excel 2007 二进制电子表格</comment> <comment xml:lang="zh_TW">Excel 2007 二進位試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.xlsb"/> @@ -3093,7 +3211,7 @@ <comment xml:lang="pt">folha de cálculo Excel</comment> <comment xml:lang="pt_BR">Planilha do Excel</comment> <comment xml:lang="ro">Foaie de calcul Excel</comment> - <comment xml:lang="ru">электронная таблица Excel</comment> + <comment xml:lang="ru">Электронная таблица Excel</comment> <comment xml:lang="sk">Zošit Excel</comment> <comment xml:lang="sl">Razpredelnica Microsoft Excel</comment> <comment xml:lang="sq">Fletë llogaritje Excel</comment> @@ -3102,7 +3220,7 @@ <comment xml:lang="tr">Excel çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Excel</comment> <comment xml:lang="vi">Bảng tính Excel</comment> - <comment xml:lang="zh_CN">Microsoft Excel 工作簿</comment> + <comment xml:lang="zh_CN">Excel 电子表格</comment> <comment xml:lang="zh_TW">Excel 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.xlsm"/> @@ -3120,6 +3238,7 @@ <comment xml:lang="eu">Excel kalkulu-orri txantiloia</comment> <comment xml:lang="fi">Excel-taulukkomalli</comment> <comment xml:lang="fr">modèle de feuille de calcul Excel</comment> + <comment xml:lang="ga">teimpléad scarbhileoige Excel</comment> <comment xml:lang="he">תבנית גיליון נתונים של Excel</comment> <comment xml:lang="hr">Predložak Excel proračunske tablice</comment> <comment xml:lang="hu">Excel munkafüzetsablon</comment> @@ -3127,18 +3246,18 @@ <comment xml:lang="id">Templat lembar kerja Excel</comment> <comment xml:lang="it">Modello foglio di calcolo Excel</comment> <comment xml:lang="kk">Excel кестесінің үлгісі</comment> - <comment xml:lang="ko">액셀 스프레드시트 양식</comment> + <comment xml:lang="ko">Excel 스프레드시트 서식</comment> <comment xml:lang="oc">Modèl de fuèlh de calcul Excel</comment> <comment xml:lang="pl">Szablon arkusza Excel</comment> <comment xml:lang="pt">modelo de folha de cálculo Excel</comment> <comment xml:lang="pt_BR">Modelo de planilha do Excel</comment> - <comment xml:lang="ru">шаблон таблицы Excel</comment> + <comment xml:lang="ru">Шаблон таблицы Excel</comment> <comment xml:lang="sk">Šablóna tabuľky aplikácie Excel</comment> - <comment xml:lang="sr">Шаблон табеле Ексела</comment> + <comment xml:lang="sr">Екселов шаблон табеле</comment> <comment xml:lang="sv">Excel-kalkylarksmall</comment> <comment xml:lang="tr">Excel hesap tablosu şablonu</comment> <comment xml:lang="uk">шаблон електронної таблиці Excel</comment> - <comment xml:lang="zh_CN">Microsoft Excel 工作簿模板</comment> + <comment xml:lang="zh_CN">Excel 电子表格模板</comment> <comment xml:lang="zh_TW">Excel 試算表範本</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.xltm"/> @@ -3182,16 +3301,16 @@ <comment xml:lang="pt">apresentação PowerPoint</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment> <comment xml:lang="ro">Prezentare PowerPoint</comment> - <comment xml:lang="ru">презентация PowerPoint</comment> + <comment xml:lang="ru">Презентация PowerPoint</comment> <comment xml:lang="sk">Prezentácia PowerPoint</comment> <comment xml:lang="sl">Predstavitev Microsoft PowerPoint</comment> <comment xml:lang="sq">Prezantim PowerPoint</comment> - <comment xml:lang="sr">Пауер Поинт презентација</comment> + <comment xml:lang="sr">Пауер поинт презентација</comment> <comment xml:lang="sv">PowerPoint-presentation</comment> <comment xml:lang="tr">PowerPoint sunumu</comment> <comment xml:lang="uk">презентація PowerPoint</comment> <comment xml:lang="vi">Trình diễn PowerPoint</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment> <comment xml:lang="zh_TW">PowerPoint 簡報</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.ppz"/> @@ -3215,9 +3334,10 @@ <comment xml:lang="eu">PowerPoint gehigarria</comment> <comment xml:lang="fi">PowerPoint-lisäosa</comment> <comment xml:lang="fr">complément PowerPoint</comment> + <comment xml:lang="ga">breiseán PowerPoint</comment> <comment xml:lang="gl">complemento de PowerPoint</comment> <comment xml:lang="he">תוסף של PowerPoint</comment> - <comment xml:lang="hr">PowerPoint priključak</comment> + <comment xml:lang="hr">PowerPoint dodatak</comment> <comment xml:lang="hu">PowerPoint bővítmény</comment> <comment xml:lang="ia">Add-in PowerPoint</comment> <comment xml:lang="id">Add-in PowerPoint</comment> @@ -3232,14 +3352,14 @@ <comment xml:lang="pl">Dodatek PowerPoint</comment> <comment xml:lang="pt">extensão PowerPoint</comment> <comment xml:lang="pt_BR">Suplemento do PowerPoint</comment> - <comment xml:lang="ru">дополнение PowerPoint</comment> + <comment xml:lang="ru">Дополнение PowerPoint</comment> <comment xml:lang="sk">Doplnok aplikácie PowerPoint </comment> <comment xml:lang="sl">Vstavek PowerPoint</comment> - <comment xml:lang="sr">Пауер Поинт додатак</comment> + <comment xml:lang="sr">Пауер поинт додатак</comment> <comment xml:lang="sv">PowerPoint-tillägg</comment> <comment xml:lang="tr">PowerPoint eklentisi</comment> <comment xml:lang="uk">додаток PowerPoint</comment> - <comment xml:lang="zh_CN">PowerPoint 附加组件</comment> + <comment xml:lang="zh_CN">PowerPoint 外接程序</comment> <comment xml:lang="zh_TW">PowerPoint 增益集</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.ppam"/> @@ -3282,16 +3402,16 @@ <comment xml:lang="pt">apresentação PowerPoint</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment> <comment xml:lang="ro">Prezentare PowerPoint</comment> - <comment xml:lang="ru">презентация PowerPoint</comment> + <comment xml:lang="ru">Презентация PowerPoint</comment> <comment xml:lang="sk">Prezentácia PowerPoint</comment> <comment xml:lang="sl">Predstavitev Microsoft PowerPoint</comment> <comment xml:lang="sq">Prezantim PowerPoint</comment> - <comment xml:lang="sr">Пауер Поинт презентација</comment> + <comment xml:lang="sr">Пауер поинт презентација</comment> <comment xml:lang="sv">PowerPoint-presentation</comment> <comment xml:lang="tr">PowerPoint sunumu</comment> <comment xml:lang="uk">презентація PowerPoint</comment> <comment xml:lang="vi">Trình diễn PowerPoint</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment> <comment xml:lang="zh_TW">PowerPoint 簡報</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.pptm"/> @@ -3299,6 +3419,7 @@ </mime-type> <mime-type type="application/vnd.ms-powerpoint.slide.macroEnabled.12"> <comment>PowerPoint slide</comment> + <comment xml:lang="ast">Diapositiva de PowerPoint</comment> <comment xml:lang="ca">dispositiva de PowerPoint</comment> <comment xml:lang="cs">promítání PowerPoint</comment> <comment xml:lang="da">PowerPoint-dias</comment> @@ -3309,6 +3430,7 @@ <comment xml:lang="eu">PowerPoint diapositiba</comment> <comment xml:lang="fi">PowerPoint-dia</comment> <comment xml:lang="fr">diapositive PowerPoint</comment> + <comment xml:lang="ga">sleamhnán PowerPoint</comment> <comment xml:lang="he">שקופית של PowerPoint</comment> <comment xml:lang="hr">PowerPoint prezentacija</comment> <comment xml:lang="hu">PowerPoint dia</comment> @@ -3321,13 +3443,13 @@ <comment xml:lang="pl">Slajd PowerPoint</comment> <comment xml:lang="pt">diapositivo PowerPoint</comment> <comment xml:lang="pt_BR">Slide do PowerPoint</comment> - <comment xml:lang="ru">слайд PowerPoint</comment> + <comment xml:lang="ru">Слайд PowerPoint</comment> <comment xml:lang="sk">Snímka aplikácie PowerPoint</comment> - <comment xml:lang="sr">Слајд Пауер Поинта</comment> + <comment xml:lang="sr">Пауер поинт слајд</comment> <comment xml:lang="sv">PowerPoint-bildspel</comment> <comment xml:lang="tr">PowerPoint sunusu</comment> <comment xml:lang="uk">слайд PowerPoint</comment> - <comment xml:lang="zh_CN">PowerPoint 文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 幻灯片</comment> <comment xml:lang="zh_TW">PowerPoint 投影片</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.sldm"/> @@ -3371,16 +3493,16 @@ <comment xml:lang="pt">apresentação PowerPoint</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment> <comment xml:lang="ro">Prezentare PowerPoint</comment> - <comment xml:lang="ru">презентация PowerPoint</comment> + <comment xml:lang="ru">Презентация PowerPoint</comment> <comment xml:lang="sk">Prezentácia PowerPoint</comment> <comment xml:lang="sl">Predstavitev Microsoft PowerPoint</comment> <comment xml:lang="sq">Prezantim PowerPoint</comment> - <comment xml:lang="sr">Пауер Поинт презентација</comment> + <comment xml:lang="sr">Пауер поинт презентација</comment> <comment xml:lang="sv">PowerPoint-presentation</comment> <comment xml:lang="tr">PowerPoint sunumu</comment> <comment xml:lang="uk">презентація PowerPoint</comment> <comment xml:lang="vi">Trình diễn PowerPoint</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment> <comment xml:lang="zh_TW">PowerPoint 簡報</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.ppsm"/> @@ -3388,6 +3510,7 @@ </mime-type> <mime-type type="application/vnd.ms-powerpoint.template.macroEnabled.12"> <comment>PowerPoint presentation template</comment> + <comment xml:lang="ast">Plantía de presentaciones de PowerPoint</comment> <comment xml:lang="ca">plantilla de presentació de PowerPoint</comment> <comment xml:lang="cs">šablona prezentace PowerPoint</comment> <comment xml:lang="da">PowerPoint-præsentationsskabelon</comment> @@ -3398,6 +3521,7 @@ <comment xml:lang="eu">PowerPoint aurkezpen txantiloia</comment> <comment xml:lang="fi">PowerPoint-esitysmalli</comment> <comment xml:lang="fr">modèle de présentation PowerPoint</comment> + <comment xml:lang="ga">teimpléad láithreoireachta PowerPoint</comment> <comment xml:lang="he">תבנית מצגת PowerPoint</comment> <comment xml:lang="hr">Predložak PowerPoint prezentacije</comment> <comment xml:lang="hu">PowerPoint bemutatósablon</comment> @@ -3405,18 +3529,18 @@ <comment xml:lang="id">Templat presentasi PowerPoint</comment> <comment xml:lang="it">Modello presentazione PowerPoint</comment> <comment xml:lang="kk">PowerPoint презентация үлгісі</comment> - <comment xml:lang="ko">파워포인드 프리젠테이션 양식</comment> + <comment xml:lang="ko">PowerPoint 프리젠테이션 서식</comment> <comment xml:lang="oc">Modèl de presentacion PowerPoint</comment> <comment xml:lang="pl">Szablon prezentacji PowerPoint</comment> <comment xml:lang="pt">modelo de apresentação PowerPoint</comment> <comment xml:lang="pt_BR">Modelo de apresentação do PowerPoint</comment> - <comment xml:lang="ru">шаблон презентации PowerPoint</comment> + <comment xml:lang="ru">Шаблон презентации PowerPoint</comment> <comment xml:lang="sk">Šablóna prezentácie aplikácie PowerPoint</comment> - <comment xml:lang="sr">Шаблон презентације Пауер Поинта</comment> + <comment xml:lang="sr">Шаблон презентације Пауер поинта</comment> <comment xml:lang="sv">PowerPoint-presentationsmall</comment> <comment xml:lang="tr">PowerPoint sunum şablonu</comment> <comment xml:lang="uk">шаблон презентації PowerPoint</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 演示文稿模板</comment> + <comment xml:lang="zh_CN">PowerPoint 演示文稿模板</comment> <comment xml:lang="zh_TW">PowerPoint 簡報範本</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.potm"/> @@ -3434,6 +3558,7 @@ <comment xml:lang="eu">Office Open XML Visio marrazkia</comment> <comment xml:lang="fi">Office Open XML Visio -piirros</comment> <comment xml:lang="fr">dessin Visio Office Open XML</comment> + <comment xml:lang="ga">Líníocht Office Open XML Visio</comment> <comment xml:lang="he">ציור Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Office Open XML Visio crtež</comment> <comment xml:lang="hu">Office Open XML Visio rajz</comment> @@ -3445,13 +3570,13 @@ <comment xml:lang="pl">Rysunek Office Open XML Visio</comment> <comment xml:lang="pt">desenho Office Open XML Visio</comment> <comment xml:lang="pt_BR">Desenho do Visio em Office Open XML</comment> - <comment xml:lang="ru">схема Visio формата Office Open XML</comment> + <comment xml:lang="ru">Рисунок Visio формата Office Open XML</comment> <comment xml:lang="sk">Kresba aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио цртање</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио цртеж</comment> <comment xml:lang="sv">Office Open XML Visio-teckning</comment> <comment xml:lang="tr">Office Open XML Visio Çizimi</comment> <comment xml:lang="uk">схема VIisio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 绘图</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 绘图</comment> <comment xml:lang="zh_TW">Office Open XML Visio 繪圖</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vsdx"/> @@ -3469,6 +3594,7 @@ <comment xml:lang="eu">Office Open XML Visio txantiloia</comment> <comment xml:lang="fi">Office Open XML Visio -malli</comment> <comment xml:lang="fr">modèle Visio Office Open XML</comment> + <comment xml:lang="ga">Teimpléad Office Open XML Visio</comment> <comment xml:lang="he">תבנית Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Predložak Office Open XML Visio</comment> <comment xml:lang="hu">Office Open XML Visio sablon</comment> @@ -3476,17 +3602,17 @@ <comment xml:lang="id">Templat Visio Office Open XML</comment> <comment xml:lang="it">Modello Visio Office Open XML</comment> <comment xml:lang="kk">Office Open XML Visio үлгісі</comment> - <comment xml:lang="ko">오피스 오픈 XML 비지오 양식</comment> + <comment xml:lang="ko">오피스 오픈 XML 비지오 서식</comment> <comment xml:lang="pl">Szablon Office Open XML Visio</comment> <comment xml:lang="pt">modelo Office Open XML Visio</comment> <comment xml:lang="pt_BR">Modelo do Visio em Office Open XML</comment> - <comment xml:lang="ru">шаблон Visio формата Office Open XML</comment> + <comment xml:lang="ru">Шаблон Visio формата Office Open XML</comment> <comment xml:lang="sk">Šablóna aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио шаблон</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment> <comment xml:lang="sv">Office Open XML Visio-mall</comment> <comment xml:lang="tr">Office Open XML Visio Şablonu</comment> <comment xml:lang="uk">шаблон Visio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 模板</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 模板</comment> <comment xml:lang="zh_TW">Office Open XML Visio 範本</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vstx"/> @@ -3500,8 +3626,10 @@ <comment xml:lang="de">Office-Open-XML-Visio-Schablone</comment> <comment xml:lang="en_GB">Office Open XML Visio Stencil</comment> <comment xml:lang="es">esténcil en OOXML de Visio</comment> + <comment xml:lang="eu">Office Open XML Visio txantiloia</comment> <comment xml:lang="fi">Office Open XML Visio -kaavio</comment> <comment xml:lang="fr">stencil Visio Office Open XML</comment> + <comment xml:lang="ga">Stionsal Office Open XML Visio</comment> <comment xml:lang="he">דגם ל־Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Office Open XML Visio šablona</comment> <comment xml:lang="hu">Office Open XML Visio stencil</comment> @@ -3513,13 +3641,13 @@ <comment xml:lang="pl">Wzór Office Open XML Visio</comment> <comment xml:lang="pt">Stencil Office Open XML Visio</comment> <comment xml:lang="pt_BR">Estêncil do Visio em Office Open XML</comment> - <comment xml:lang="ru">трафарет Visio формата Office Open XML</comment> + <comment xml:lang="ru">Трафарет Visio формата Office Open XML</comment> <comment xml:lang="sk">Objekt aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио шаблон</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment> <comment xml:lang="sv">Office Open XML Visio-stencil</comment> <comment xml:lang="tr">Office Open XML Visio Kalıbı</comment> <comment xml:lang="uk">трафарет Visio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 模具</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 模具</comment> <comment xml:lang="zh_TW">Office Open XML Visio 圖形樣本</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vssx"/> @@ -3537,6 +3665,7 @@ <comment xml:lang="eu">Office Open XML Visio marrazkia</comment> <comment xml:lang="fi">Office Open XML Visio -piirros</comment> <comment xml:lang="fr">dessin Visio Office Open XML</comment> + <comment xml:lang="ga">Líníocht Office Open XML Visio</comment> <comment xml:lang="he">ציור Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Office Open XML Visio crtež</comment> <comment xml:lang="hu">Office Open XML Visio rajz</comment> @@ -3548,13 +3677,13 @@ <comment xml:lang="pl">Rysunek Office Open XML Visio</comment> <comment xml:lang="pt">desenho Office Open XML Visio</comment> <comment xml:lang="pt_BR">Desenho do Visio em Office Open XML</comment> - <comment xml:lang="ru">схема Visio формата Office Open XML</comment> + <comment xml:lang="ru">Рисунок Visio формата Office Open XML</comment> <comment xml:lang="sk">Kresba aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио цртање</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио цртеж</comment> <comment xml:lang="sv">Office Open XML Visio-teckning</comment> <comment xml:lang="tr">Office Open XML Visio Çizimi</comment> <comment xml:lang="uk">схема VIisio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 绘图</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 绘图</comment> <comment xml:lang="zh_TW">Office Open XML Visio 繪圖</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vsdm"/> @@ -3572,6 +3701,7 @@ <comment xml:lang="eu">Office Open XML Visio txantiloia</comment> <comment xml:lang="fi">Office Open XML Visio -malli</comment> <comment xml:lang="fr">modèle Visio Office Open XML</comment> + <comment xml:lang="ga">Teimpléad Office Open XML Visio</comment> <comment xml:lang="he">תבנית Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Predložak Office Open XML Visio</comment> <comment xml:lang="hu">Office Open XML Visio sablon</comment> @@ -3579,17 +3709,17 @@ <comment xml:lang="id">Templat Visio Office Open XML</comment> <comment xml:lang="it">Modello Visio Office Open XML</comment> <comment xml:lang="kk">Office Open XML Visio үлгісі</comment> - <comment xml:lang="ko">오피스 오픈 XML 비지오 양식</comment> + <comment xml:lang="ko">오피스 오픈 XML 비지오 서식</comment> <comment xml:lang="pl">Szablon Office Open XML Visio</comment> <comment xml:lang="pt">modelo Office Open XML Visio</comment> <comment xml:lang="pt_BR">Modelo do Visio em Office Open XML</comment> - <comment xml:lang="ru">шаблон Visio формата Office Open XML</comment> + <comment xml:lang="ru">Шаблон Visio формата Office Open XML</comment> <comment xml:lang="sk">Šablóna aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио шаблон</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment> <comment xml:lang="sv">Office Open XML Visio-mall</comment> <comment xml:lang="tr">Office Open XML Visio Şablonu</comment> <comment xml:lang="uk">шаблон Visio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 模板</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 模板</comment> <comment xml:lang="zh_TW">Office Open XML Visio 範本</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vstm"/> @@ -3603,8 +3733,10 @@ <comment xml:lang="de">Office-Open-XML-Visio-Schablone</comment> <comment xml:lang="en_GB">Office Open XML Visio Stencil</comment> <comment xml:lang="es">esténcil en OOXML de Visio</comment> + <comment xml:lang="eu">Office Open XML Visio txantiloia</comment> <comment xml:lang="fi">Office Open XML Visio -kaavio</comment> <comment xml:lang="fr">stencil Visio Office Open XML</comment> + <comment xml:lang="ga">Stionsal Office Open XML Visio</comment> <comment xml:lang="he">דגם ל־Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Office Open XML Visio šablona</comment> <comment xml:lang="hu">Office Open XML Visio stencil</comment> @@ -3616,13 +3748,13 @@ <comment xml:lang="pl">Wzór Office Open XML Visio</comment> <comment xml:lang="pt">Stencil Office Open XML Visio</comment> <comment xml:lang="pt_BR">Estêncil do Visio em Office Open XML</comment> - <comment xml:lang="ru">трафарет Visio формата Office Open XML</comment> + <comment xml:lang="ru">Трафарет Visio формата Office Open XML</comment> <comment xml:lang="sk">Objekt aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио шаблон</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment> <comment xml:lang="sv">Office Open XML Visio-stencil</comment> <comment xml:lang="tr">Office Open XML Visio Kalıbı</comment> <comment xml:lang="uk">трафарет Visio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 模具</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 模具</comment> <comment xml:lang="zh_TW">Office Open XML Visio 圖形樣本</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vssm"/> @@ -3631,6 +3763,7 @@ <mime-type type="application/vnd.ms-word.document.macroEnabled.12"> <comment>Word document</comment> <comment xml:lang="ar">مستند Word</comment> + <comment xml:lang="ast">Documentu de Word</comment> <comment xml:lang="be@latin">Dakument Word</comment> <comment xml:lang="bg">Документ — Word</comment> <comment xml:lang="ca">document Word</comment> @@ -3666,16 +3799,16 @@ <comment xml:lang="pt">documento Word</comment> <comment xml:lang="pt_BR">Documento do Word</comment> <comment xml:lang="ro">Document Word</comment> - <comment xml:lang="ru">документ Word</comment> + <comment xml:lang="ru">Документ Word</comment> <comment xml:lang="sk">Dokument Word</comment> <comment xml:lang="sl">Dokument Word</comment> <comment xml:lang="sq">Dokument Word</comment> - <comment xml:lang="sr">Вордов документ</comment> + <comment xml:lang="sr">Ворд документ</comment> <comment xml:lang="sv">Word-dokument</comment> <comment xml:lang="tr">Word belgesi</comment> <comment xml:lang="uk">документ Word</comment> <comment xml:lang="vi">Tài liệu Word</comment> - <comment xml:lang="zh_CN">Microsoft Word 文档</comment> + <comment xml:lang="zh_CN">Word 文档</comment> <comment xml:lang="zh_TW">Word 文件</comment> <generic-icon name="x-office-document"/> <glob pattern="*.docm"/> @@ -3683,6 +3816,7 @@ </mime-type> <mime-type type="application/vnd.ms-word.template.macroEnabled.12"> <comment>Word document template</comment> + <comment xml:lang="ast">Plantía de documentu de Word</comment> <comment xml:lang="ca">plantilla de document Word</comment> <comment xml:lang="cs">šablona dokumentu Word</comment> <comment xml:lang="da">Word-dokumentskabelon</comment> @@ -3693,6 +3827,7 @@ <comment xml:lang="eu">Word dokumentuaren txantiloia</comment> <comment xml:lang="fi">Word-asiakirjamalli</comment> <comment xml:lang="fr">modèle de document Word</comment> + <comment xml:lang="ga">teimpléad Word</comment> <comment xml:lang="he">תבנית מסמך Word</comment> <comment xml:lang="hr">Predložak Word dokumenta</comment> <comment xml:lang="hu">Word dokumentumsablon</comment> @@ -3700,18 +3835,18 @@ <comment xml:lang="id">Templat dokumen Word</comment> <comment xml:lang="it">Modello documento Word</comment> <comment xml:lang="kk">Word құжатының үлгісі</comment> - <comment xml:lang="ko">워드 문서 양식</comment> + <comment xml:lang="ko">Word 문서 서식</comment> <comment xml:lang="oc">modèl de document Word</comment> <comment xml:lang="pl">Szablon dokumentu Word</comment> <comment xml:lang="pt">modelo de documento Word</comment> <comment xml:lang="pt_BR">Modelo de documento do Word</comment> - <comment xml:lang="ru">шаблон документа Word</comment> + <comment xml:lang="ru">Шаблон документа Word</comment> <comment xml:lang="sk">Šablóna dokumentu aplikácie Word</comment> - <comment xml:lang="sr">Шаблон документа Ворда</comment> + <comment xml:lang="sr">Шаблон Ворд документа</comment> <comment xml:lang="sv">Word-dokumentmall</comment> <comment xml:lang="tr">Word belgesi şablonu</comment> <comment xml:lang="uk">шаблон документа Word</comment> - <comment xml:lang="zh_CN">Microsoft Word 文档模板</comment> + <comment xml:lang="zh_CN">Word 文档模板</comment> <comment xml:lang="zh_TW">Word 文件範本</comment> <generic-icon name="x-office-document"/> <glob pattern="*.dotm"/> @@ -3720,6 +3855,7 @@ <mime-type type="application/oxps"> <comment>XPS document</comment> <comment xml:lang="ar">مستند XPS</comment> + <comment xml:lang="ast">Documentu XPS</comment> <comment xml:lang="be@latin">Dakument XPS</comment> <comment xml:lang="bg">Документ — XPS</comment> <comment xml:lang="ca">document XPS</comment> @@ -3755,7 +3891,7 @@ <comment xml:lang="pt">documento XPS</comment> <comment xml:lang="pt_BR">Documento XPS</comment> <comment xml:lang="ro">Document XPS</comment> - <comment xml:lang="ru">документ XPS</comment> + <comment xml:lang="ru">Документ XPS</comment> <comment xml:lang="sk">Dokument XPS</comment> <comment xml:lang="sl">Dokument XPS</comment> <comment xml:lang="sq">Dokument XPS</comment> @@ -3773,10 +3909,12 @@ <glob pattern="*.oxps"/> <glob pattern="*.xps"/> <alias type="application/vnd.ms-xpsdocument"/> + <alias type="application/xps"/> </mime-type> <mime-type type="application/vnd.ms-works"> <comment>Microsoft Works document</comment> <comment xml:lang="ar">مستند Microsoft Works</comment> + <comment xml:lang="ast">Documentu de Microsoft Works</comment> <comment xml:lang="be@latin">Dakument Microsoft Works</comment> <comment xml:lang="bg">Документ — Microsoft Works</comment> <comment xml:lang="ca">document de Microsoft Works</comment> @@ -3812,11 +3950,11 @@ <comment xml:lang="pt">documento Microsoft Works</comment> <comment xml:lang="pt_BR">Documento do Microsoft Works</comment> <comment xml:lang="ro">Document Microsoft Works</comment> - <comment xml:lang="ru">документ Microsoft Works</comment> + <comment xml:lang="ru">Документ Microsoft Works</comment> <comment xml:lang="sk">Dokument Microsoft Works</comment> <comment xml:lang="sl">Dokument Microsoft Works</comment> <comment xml:lang="sq">Dokument Microsoft Works</comment> - <comment xml:lang="sr">Микрософтов Воркс документ</comment> + <comment xml:lang="sr">документ Мајкрософт Воркса</comment> <comment xml:lang="sv">Microsoft Works-dokument</comment> <comment xml:lang="tr">Microsoft Works belgesi</comment> <comment xml:lang="uk">документ Microsoft Works</comment> @@ -3833,6 +3971,7 @@ </mime-type> <mime-type type="application/vnd.visio"> <comment>Microsoft Visio document</comment> + <comment xml:lang="ast">Documentu de Microsoft Visio</comment> <comment xml:lang="bg">Документ — Microsoft Visio</comment> <comment xml:lang="ca">document de Microsoft Visio</comment> <comment xml:lang="cs">dokument Microsoft Visio</comment> @@ -3844,6 +3983,7 @@ <comment xml:lang="eu">Microsoft Visio dokumentua</comment> <comment xml:lang="fi">Microsoft Visio -asiakirja</comment> <comment xml:lang="fr">document Microsoft Visio</comment> + <comment xml:lang="ga">cáipéis Microsoft Visio</comment> <comment xml:lang="gl">Documento de Microsoft Visio</comment> <comment xml:lang="he">מסמך </comment> <comment xml:lang="hr">Microsoft Visio dokument</comment> @@ -3861,10 +4001,10 @@ <comment xml:lang="pl">Dokument Microsoft Visio</comment> <comment xml:lang="pt">documento Microsoft Visio</comment> <comment xml:lang="pt_BR">Documento do Microsoft Visio</comment> - <comment xml:lang="ru">документ Microsoft Visio</comment> + <comment xml:lang="ru">Документ Microsoft Visio</comment> <comment xml:lang="sk">Dokument Microsoft Visio</comment> <comment xml:lang="sl">Dokument Microsoft Visio</comment> - <comment xml:lang="sr">Микрософтов Визио документ</comment> + <comment xml:lang="sr">документ Мајкрософт Визиа</comment> <comment xml:lang="sv">Microsoft Visio-dokument</comment> <comment xml:lang="tr">Microsoft Visio belgesi</comment> <comment xml:lang="uk">документ Microsoft Visio</comment> @@ -3880,6 +4020,7 @@ <mime-type type="application/msword"> <comment>Word document</comment> <comment xml:lang="ar">مستند Word</comment> + <comment xml:lang="ast">Documentu de Word</comment> <comment xml:lang="be@latin">Dakument Word</comment> <comment xml:lang="bg">Документ — Word</comment> <comment xml:lang="ca">document Word</comment> @@ -3915,16 +4056,16 @@ <comment xml:lang="pt">documento Word</comment> <comment xml:lang="pt_BR">Documento do Word</comment> <comment xml:lang="ro">Document Word</comment> - <comment xml:lang="ru">документ Word</comment> + <comment xml:lang="ru">Документ Word</comment> <comment xml:lang="sk">Dokument Word</comment> <comment xml:lang="sl">Dokument Word</comment> <comment xml:lang="sq">Dokument Word</comment> - <comment xml:lang="sr">Вордов документ</comment> + <comment xml:lang="sr">Ворд документ</comment> <comment xml:lang="sv">Word-dokument</comment> <comment xml:lang="tr">Word belgesi</comment> <comment xml:lang="uk">документ Word</comment> <comment xml:lang="vi">Tài liệu Word</comment> - <comment xml:lang="zh_CN">Microsoft Word 文档</comment> + <comment xml:lang="zh_CN">Word 文档</comment> <comment xml:lang="zh_TW">Word 文件</comment> <sub-class-of type="application/x-ole-storage"/> <generic-icon name="x-office-document"/> @@ -3947,6 +4088,7 @@ <mime-type type="application/msword-template"> <comment>Word template</comment> <comment xml:lang="ar">قالب Word</comment> + <comment xml:lang="ast">Plantía de Word</comment> <comment xml:lang="be@latin">Šablon Word</comment> <comment xml:lang="bg">Шаблон за документи — Word</comment> <comment xml:lang="ca">plantilla de Word</comment> @@ -3982,11 +4124,11 @@ <comment xml:lang="pt">modelo Word</comment> <comment xml:lang="pt_BR">Modelo do Word</comment> <comment xml:lang="ro">Șablon Word</comment> - <comment xml:lang="ru">шаблон Word</comment> + <comment xml:lang="ru">Шаблон Word</comment> <comment xml:lang="sk">Šablóna Word</comment> <comment xml:lang="sl">Predloga dokumenta Microsoft Word</comment> <comment xml:lang="sq">Model Word</comment> - <comment xml:lang="sr">Вордов шаблон</comment> + <comment xml:lang="sr">Ворд шаблон</comment> <comment xml:lang="sv">Word-mall</comment> <comment xml:lang="tr">Word şablonu</comment> <comment xml:lang="uk">шаблон Word</comment> @@ -3999,6 +4141,7 @@ </mime-type> <mime-type type="application/gml+xml"> <comment>GML document</comment> + <comment xml:lang="ast">Documentu GML</comment> <comment xml:lang="ca">document GML</comment> <comment xml:lang="cs">dokument GML</comment> <comment xml:lang="da">GML-dokument</comment> @@ -4009,6 +4152,7 @@ <comment xml:lang="eu">GML dokumentua</comment> <comment xml:lang="fi">GML-asiakirja</comment> <comment xml:lang="fr">document GML</comment> + <comment xml:lang="ga">cáipéis GML</comment> <comment xml:lang="gl">Documento GML</comment> <comment xml:lang="he">מסמך GML</comment> <comment xml:lang="hr">GML dokument</comment> @@ -4024,7 +4168,7 @@ <comment xml:lang="pl">Dokument GML</comment> <comment xml:lang="pt">documento GML</comment> <comment xml:lang="pt_BR">Documento GML</comment> - <comment xml:lang="ru">документ GML</comment> + <comment xml:lang="ru">Документ GML</comment> <comment xml:lang="sk">Dokument GML</comment> <comment xml:lang="sl">Dokument GML</comment> <comment xml:lang="sr">ГМЛ документ</comment> @@ -4077,7 +4221,7 @@ <comment xml:lang="pt">ficheiro de procura GNUnet</comment> <comment xml:lang="pt_BR">Arquivo de pesquisa do GNUnet</comment> <comment xml:lang="ro">Fișier căutare GNUnet</comment> - <comment xml:lang="ru">файл поиска GNUnet</comment> + <comment xml:lang="ru">Файл поиска GNUnet</comment> <comment xml:lang="sk">Vyhľadávací súbor GNUnet</comment> <comment xml:lang="sl">Iskalna datoteka GNUnet</comment> <comment xml:lang="sq">File kërkimi GNUnet</comment> @@ -4096,6 +4240,7 @@ <mime-type type="application/vnd.ms-tnef"> <comment>TNEF message</comment> <comment xml:lang="ar">رسالة TNEF</comment> + <comment xml:lang="ast">Mensaxe TNEF</comment> <comment xml:lang="be@latin">List TNEF</comment> <comment xml:lang="bg">Съобщение — TNEF</comment> <comment xml:lang="ca">missatge TNEF</comment> @@ -4130,7 +4275,7 @@ <comment xml:lang="pt">mensagem TNEF</comment> <comment xml:lang="pt_BR">Mensagem TNEF</comment> <comment xml:lang="ro">Mesaj TNEF</comment> - <comment xml:lang="ru">сообщение TNEF</comment> + <comment xml:lang="ru">Сообщение TNEF</comment> <comment xml:lang="sk">Správa TNEF</comment> <comment xml:lang="sl">Datoteka sporočila TNEF</comment> <comment xml:lang="sq">Mesazh TNEF</comment> @@ -4192,16 +4337,16 @@ <comment xml:lang="pt">folha de cálculo do StarCalc</comment> <comment xml:lang="pt_BR">Planilha do StarCalc</comment> <comment xml:lang="ro">Foaie de calcul StarCalc</comment> - <comment xml:lang="ru">электронная таблица StarCalc</comment> + <comment xml:lang="ru">Электронная таблица StarCalc</comment> <comment xml:lang="sk">Zošit StarCalc</comment> <comment xml:lang="sl">Preglednica StarCalc</comment> <comment xml:lang="sq">Fletë llogaritjesh StarCalc</comment> - <comment xml:lang="sr">Табела Стар Рачуна</comment> + <comment xml:lang="sr">Стар калк табела</comment> <comment xml:lang="sv">StarCalc-kalkylblad</comment> <comment xml:lang="tr">StarCalc çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця StarCalc</comment> <comment xml:lang="vi">Bảng tính StarCalc</comment> - <comment xml:lang="zh_CN">STarCalc 工作簿</comment> + <comment xml:lang="zh_CN">StarCalc 电子表格</comment> <comment xml:lang="zh_TW">StarCalc 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.sdc"/> @@ -4247,7 +4392,7 @@ <comment xml:lang="pt">gráfico do StarChart</comment> <comment xml:lang="pt_BR">Gráfico do StarChart</comment> <comment xml:lang="ro">Diagramă StarChart</comment> - <comment xml:lang="ru">диаграмма StarChart</comment> + <comment xml:lang="ru">Диаграмма StarChart</comment> <comment xml:lang="sk">Graf StarChart</comment> <comment xml:lang="sl">Datoteka grafikona StarChart</comment> <comment xml:lang="sq">Grafik StarChart</comment> @@ -4256,7 +4401,7 @@ <comment xml:lang="tr">StarChart çizgelgesi</comment> <comment xml:lang="uk">діаграма StarChart</comment> <comment xml:lang="vi">Đồ thị StarChart</comment> - <comment xml:lang="zh_CN">STarChart 图表</comment> + <comment xml:lang="zh_CN">StarCalc 图表</comment> <comment xml:lang="zh_TW">StarChart 圖表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.sds"/> @@ -4302,7 +4447,7 @@ <comment xml:lang="pt">desenho do StarDraw</comment> <comment xml:lang="pt_BR">Desenho do StarDraw</comment> <comment xml:lang="ro">Desen StarDraw</comment> - <comment xml:lang="ru">изображение StarDraw</comment> + <comment xml:lang="ru">Рисунок StarDraw</comment> <comment xml:lang="sk">Kresba StarDraw</comment> <comment xml:lang="sl">Datoteka risbe StarDraw</comment> <comment xml:lang="sq">Vizatim StarDraw</comment> @@ -4311,7 +4456,7 @@ <comment xml:lang="tr">StarDraw çizimi</comment> <comment xml:lang="uk">малюнок StarDraw</comment> <comment xml:lang="vi">Bản vẽ StarDraw</comment> - <comment xml:lang="zh_CN">STarDraw 绘图</comment> + <comment xml:lang="zh_CN">StarDraw 绘图</comment> <comment xml:lang="zh_TW">StarDraw 繪圖</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.sda"/> @@ -4357,7 +4502,7 @@ <comment xml:lang="pt">apresentação do StarImpress</comment> <comment xml:lang="pt_BR">Apresentação do StarImpress</comment> <comment xml:lang="ro">Prezentare StarImpress</comment> - <comment xml:lang="ru">презентация StarImpress</comment> + <comment xml:lang="ru">Презентация StarImpress</comment> <comment xml:lang="sk">Prezentácia StarImpress</comment> <comment xml:lang="sl">Predstavitev StarImpress</comment> <comment xml:lang="sq">Prezantim StarImpress</comment> @@ -4366,7 +4511,7 @@ <comment xml:lang="tr">StarImpress sunumu</comment> <comment xml:lang="uk">презентація StarImpress</comment> <comment xml:lang="vi">Trình diễn StarImpress</comment> - <comment xml:lang="zh_CN">STarImpress 演示文稿</comment> + <comment xml:lang="zh_CN">StarImpress 演示文稿</comment> <comment xml:lang="zh_TW">StarImpress 簡報檔</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.sdd"/> @@ -4411,7 +4556,7 @@ <comment xml:lang="pt">email do StarMail</comment> <comment xml:lang="pt_BR">E-mail do StarMail</comment> <comment xml:lang="ro">Email StarEmail</comment> - <comment xml:lang="ru">электронное письмо StarMail</comment> + <comment xml:lang="ru">Электронное письмо StarMail</comment> <comment xml:lang="sk">E-mail StarMail</comment> <comment xml:lang="sl">Datoteka pošte StarMail</comment> <comment xml:lang="sq">Mesazh StarMail</comment> @@ -4420,7 +4565,7 @@ <comment xml:lang="tr">StarMail epostası</comment> <comment xml:lang="uk">поштове повідомлення StarMail</comment> <comment xml:lang="vi">Thư điện tử StarMail</comment> - <comment xml:lang="zh_CN">STarMail 电子邮件</comment> + <comment xml:lang="zh_CN">StarMail 电子邮件</comment> <comment xml:lang="zh_TW">StarMail 郵件</comment> <glob pattern="*.smd"/> </mime-type> @@ -4463,7 +4608,7 @@ <comment xml:lang="pt">fórmula do StarMath</comment> <comment xml:lang="pt_BR">Fórmula do StarMath</comment> <comment xml:lang="ro">Formulă StarMath</comment> - <comment xml:lang="ru">формула StarMath</comment> + <comment xml:lang="ru">Формула StarMath</comment> <comment xml:lang="sk">Vzorec StarMath</comment> <comment xml:lang="sl">Datoteka formule StarMath</comment> <comment xml:lang="sq">Formulë StarMath</comment> @@ -4472,7 +4617,7 @@ <comment xml:lang="tr">StarMath formülü</comment> <comment xml:lang="uk">формула StarMath</comment> <comment xml:lang="vi">Công thức StarMath</comment> - <comment xml:lang="zh_CN">STarMath 公式</comment> + <comment xml:lang="zh_CN">StarMath 公式</comment> <comment xml:lang="zh_TW">StarMath 公式</comment> <generic-icon name="x-office-document"/> <glob pattern="*.smf"/> @@ -4480,6 +4625,7 @@ <mime-type type="application/vnd.stardivision.writer"> <comment>StarWriter document</comment> <comment xml:lang="ar">مستند StarWriter</comment> + <comment xml:lang="ast">Documentu de StarWriter</comment> <comment xml:lang="az">StarWriter sənədi</comment> <comment xml:lang="be@latin">Dakument StarWriter</comment> <comment xml:lang="bg">Документ — StarWriter</comment> @@ -4518,7 +4664,7 @@ <comment xml:lang="pt">documento do StarWriter</comment> <comment xml:lang="pt_BR">Documento do StarWriter</comment> <comment xml:lang="ro">Document StarWriter</comment> - <comment xml:lang="ru">документ StarWriter</comment> + <comment xml:lang="ru">Документ StarWriter</comment> <comment xml:lang="sk">Dokument StarWriter</comment> <comment xml:lang="sl">Dokument StarWriter</comment> <comment xml:lang="sq">Dokument StarWriter</comment> @@ -4527,7 +4673,7 @@ <comment xml:lang="tr">StarWriter belgesi</comment> <comment xml:lang="uk">документ StarWriter</comment> <comment xml:lang="vi">Tài liệu StarWriter</comment> - <comment xml:lang="zh_CN">STarWriter 文档</comment> + <comment xml:lang="zh_CN">StarWriter 文档</comment> <comment xml:lang="zh_TW">StarWriter 文件</comment> <generic-icon name="x-office-document"/> <glob pattern="*.sdw"/> @@ -4576,7 +4722,7 @@ <comment xml:lang="pt">folha de cálculo OpenOffice Calc</comment> <comment xml:lang="pt_BR">Planilha do OpenOffice Calc</comment> <comment xml:lang="ro">Foaie de calcul OpenOffice Calc</comment> - <comment xml:lang="ru">электронная таблица OpenOffice Calc</comment> + <comment xml:lang="ru">Электронная таблица OpenOffice Calc</comment> <comment xml:lang="sk">Zošit OpenOffice Calc</comment> <comment xml:lang="sl">Razpredelnica OpenOffice.org Calc</comment> <comment xml:lang="sq">Fletë llogaritjesh OpenOffice Calc</comment> @@ -4585,7 +4731,7 @@ <comment xml:lang="tr">OpenOffice Calc çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця OpenOffice Calc</comment> <comment xml:lang="vi">Bảng tính Calc của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Calc 工作簿</comment> + <comment xml:lang="zh_CN">OpenOffice Calc 电子表格</comment> <comment xml:lang="zh_TW">OpenOffice Calc 試算表</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-spreadsheet"/> @@ -4636,7 +4782,7 @@ <comment xml:lang="pt">modelo OpenOffice Calc</comment> <comment xml:lang="pt_BR">Modelo do OpenOffice Calc</comment> <comment xml:lang="ro">Șablon OpenOffice Calc</comment> - <comment xml:lang="ru">шаблон OpenOffice Calc</comment> + <comment xml:lang="ru">Шаблон OpenOffice Calc</comment> <comment xml:lang="sk">Šablóna OpenOffice Calc</comment> <comment xml:lang="sl">Predloga OpenOffice.org Calc</comment> <comment xml:lang="sq">Model OpenOffice Calc</comment> @@ -4645,7 +4791,7 @@ <comment xml:lang="tr">OpenOffice Calc şablonu</comment> <comment xml:lang="uk">шаблон ел.таблиці OpenOffice Calc</comment> <comment xml:lang="vi">Mẫu bảng tính Calc của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Calc 工作簿模板</comment> + <comment xml:lang="zh_CN">OpenOffice Calc 模板</comment> <comment xml:lang="zh_TW">OpenOffice Calc 範本</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-spreadsheet"/> @@ -4696,7 +4842,7 @@ <comment xml:lang="pt">desenho OpenOffice Draw</comment> <comment xml:lang="pt_BR">Desenho do OpenOffice Draw</comment> <comment xml:lang="ro">Desen OpenOffice Draw</comment> - <comment xml:lang="ru">изображение OpenOffice Draw</comment> + <comment xml:lang="ru">Рисунок OpenOffice Draw</comment> <comment xml:lang="sk">Kresba OpenOffice Draw</comment> <comment xml:lang="sl">Datoteka risbe OpenOffice.org Draw</comment> <comment xml:lang="sq">Vizatim OpenOffice Draw</comment> @@ -4705,7 +4851,7 @@ <comment xml:lang="tr">OpenOffice Draw çizimi</comment> <comment xml:lang="uk">малюнок OpenOffice Draw</comment> <comment xml:lang="vi">Bản vẽ Draw của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Draw 绘图</comment> + <comment xml:lang="zh_CN">OpenOffice Draw 绘图</comment> <comment xml:lang="zh_TW">OpenOffice Draw 繪圖</comment> <sub-class-of type="application/zip"/> <generic-icon name="image-x-generic"/> @@ -4756,7 +4902,7 @@ <comment xml:lang="pt">modelo OpenOffice Draw</comment> <comment xml:lang="pt_BR">Modelo do OpenOffice Draw</comment> <comment xml:lang="ro">Șablon OpenOffice Draw</comment> - <comment xml:lang="ru">шаблон OpenOffice Draw</comment> + <comment xml:lang="ru">Шаблон OpenOffice Draw</comment> <comment xml:lang="sk">Šablóna OpenOffice Draw</comment> <comment xml:lang="sl">Predloga OpenOffice.org Draw</comment> <comment xml:lang="sq">Model OpenOffice Draw</comment> @@ -4765,7 +4911,7 @@ <comment xml:lang="tr">OpenOffice Draw şablonu</comment> <comment xml:lang="uk">шаблон малюнку OpenOffice Draw</comment> <comment xml:lang="vi">Mẫu bản vẽ Draw của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Draw 绘图模板</comment> + <comment xml:lang="zh_CN">OpenOffice Draw 模板</comment> <comment xml:lang="zh_TW">OpenOffice Draw 範本</comment> <sub-class-of type="application/zip"/> <generic-icon name="image-x-generic"/> @@ -4818,7 +4964,7 @@ <comment xml:lang="pt">apresentação OpenOffice Impress</comment> <comment xml:lang="pt_BR">Apresentação do OpenOffice Impress</comment> <comment xml:lang="ro">Prezentare OpenOffice Impress</comment> - <comment xml:lang="ru">презентация OpenOffice Impress</comment> + <comment xml:lang="ru">Презентация OpenOffice Impress</comment> <comment xml:lang="sk">Prezentácia OpenOffice Impress</comment> <comment xml:lang="sl">Predstavitev OpenOffice.org Impress</comment> <comment xml:lang="sq">Prezantim OpenOffice Impress</comment> @@ -4827,7 +4973,7 @@ <comment xml:lang="tr">OpenOffice Impress sunumu</comment> <comment xml:lang="uk">презентація OpenOffice Impress</comment> <comment xml:lang="vi">Trình diễn Impress của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Impress 演示文稿</comment> + <comment xml:lang="zh_CN">OpenOffice Impress 演示文稿</comment> <comment xml:lang="zh_TW">OpenOffice Impress 簡報</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-presentation"/> @@ -4878,7 +5024,7 @@ <comment xml:lang="pt">modelo OpenOffice Impress</comment> <comment xml:lang="pt_BR">Modelo do OpenOffice Impress</comment> <comment xml:lang="ro">Șablon OpenOffice Impress</comment> - <comment xml:lang="ru">шаблон OpenOffice Impress</comment> + <comment xml:lang="ru">Шаблон OpenOffice Impress</comment> <comment xml:lang="sk">Šablóna OpenOffice Impress</comment> <comment xml:lang="sl">Predloga OpenOffice.org Impress</comment> <comment xml:lang="sq">Model OpenOffice Impress</comment> @@ -4887,7 +5033,7 @@ <comment xml:lang="tr">OpenOffice Impress şablonu</comment> <comment xml:lang="uk">шаблон презентації OpenOffice Impress</comment> <comment xml:lang="vi">Mẫu trình diễn Impress của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Impress 演示文稿模板</comment> + <comment xml:lang="zh_CN">OpenOffice Impress 模板</comment> <comment xml:lang="zh_TW">OpenOffice Impress 範本</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-presentation"/> @@ -4938,7 +5084,7 @@ <comment xml:lang="pt">fórmula OpenOffice Math</comment> <comment xml:lang="pt_BR">Fórmula do OpenOffice Math</comment> <comment xml:lang="ro">Formulă OpenOffice Math</comment> - <comment xml:lang="ru">формула OpenOffice Math</comment> + <comment xml:lang="ru">Формула OpenOffice Math</comment> <comment xml:lang="sk">Vzorec OpenOffice Math</comment> <comment xml:lang="sl">Dokument formule OpenOffice.org Math</comment> <comment xml:lang="sq">Formulë OpenOffice Math</comment> @@ -4947,7 +5093,7 @@ <comment xml:lang="tr">OpenOffice Math formülü</comment> <comment xml:lang="uk">формула OpenOffice Math</comment> <comment xml:lang="vi">Công thức Math của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Math 公式</comment> + <comment xml:lang="zh_CN">OpenOffice Math 公式</comment> <comment xml:lang="zh_TW">OpenOffice Math 公式</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -4963,6 +5109,7 @@ <mime-type type="application/vnd.sun.xml.writer"> <comment>OpenOffice Writer document</comment> <comment xml:lang="ar">مستند Writer المكتب المفتوح</comment> + <comment xml:lang="ast">Documentu d'OpenOffice Writer</comment> <comment xml:lang="az">OpenOffice Writer sənədi</comment> <comment xml:lang="be@latin">Dakument OpenOffice Writer</comment> <comment xml:lang="bg">Документ — OpenOffice Writer</comment> @@ -5000,7 +5147,7 @@ <comment xml:lang="pt">documento OpenOffice Writer</comment> <comment xml:lang="pt_BR">Documento do OpenOffice Writer</comment> <comment xml:lang="ro">Document OpenOffice Writer</comment> - <comment xml:lang="ru">документ OpenOffice Writer</comment> + <comment xml:lang="ru">Документ OpenOffice Writer</comment> <comment xml:lang="sk">Dokument OpenOffice Writer</comment> <comment xml:lang="sl">Dokument OpenOffice.org Writer</comment> <comment xml:lang="sq">Dokument OpenOffice Writer</comment> @@ -5009,7 +5156,7 @@ <comment xml:lang="tr">OpenOffice Writer belgesi</comment> <comment xml:lang="uk">документ OpenOffice Writer</comment> <comment xml:lang="vi">Tài liệu Writer của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Writer 文档</comment> + <comment xml:lang="zh_CN">OpenOffice Writer 文档</comment> <comment xml:lang="zh_TW">OpenOffice Writer 文件</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -5025,6 +5172,7 @@ <mime-type type="application/vnd.sun.xml.writer.global"> <comment>OpenOffice Writer global document</comment> <comment xml:lang="ar">مستند المكتب المفتوح Writer العالمي</comment> + <comment xml:lang="ast">Documentu global d'OpenOffice Writer</comment> <comment xml:lang="az">OpenOffice Writer qlobal sənədi</comment> <comment xml:lang="be@latin">Hlabalny dakument OpenOffice Writer</comment> <comment xml:lang="bg">Документ - глобален — OpenOffice Writer</comment> @@ -5062,7 +5210,7 @@ <comment xml:lang="pt">documento global OpenOffice Writer</comment> <comment xml:lang="pt_BR">Documento global do OpenOffice Writer</comment> <comment xml:lang="ro">Document global OpenOffice Writer</comment> - <comment xml:lang="ru">основной документ OpenOffice Writer</comment> + <comment xml:lang="ru">Основной документ OpenOffice Writer</comment> <comment xml:lang="sk">Globálny dokument OpenOffice Writer</comment> <comment xml:lang="sl">Splošni dokument OpenOffice.org Writer</comment> <comment xml:lang="sq">Dokument i përgjithshëm OpenOffice Writer</comment> @@ -5071,7 +5219,7 @@ <comment xml:lang="tr">OpenOffice Writer global belgesi</comment> <comment xml:lang="uk">загальний документ OpenOffice Writer</comment> <comment xml:lang="vi">Tài liệu toàn cục Writer của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Writer 全局文档</comment> + <comment xml:lang="zh_CN">OpenOffice Writer 全局文档</comment> <comment xml:lang="zh_TW">OpenOffice Writer 主控文件</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -5125,7 +5273,7 @@ <comment xml:lang="pt">modelo OpenOffice Writer</comment> <comment xml:lang="pt_BR">Modelo do OpenOffice Writer</comment> <comment xml:lang="ro">Șablon OpenOffice Writer</comment> - <comment xml:lang="ru">шаблон OpenOffice Writer</comment> + <comment xml:lang="ru">Шаблон OpenOffice Writer</comment> <comment xml:lang="sk">Šablóna OpenOffice Writer</comment> <comment xml:lang="sl">Predloga OpenOffice.org Writer</comment> <comment xml:lang="sq">Model OpenOffice Writer</comment> @@ -5134,7 +5282,7 @@ <comment xml:lang="tr">OpenOffice Writer şablonu</comment> <comment xml:lang="uk">шаблон документа OpenOffice Writer</comment> <comment xml:lang="vi">Mẫu tài liệu Writer của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Writer 文档模板</comment> + <comment xml:lang="zh_CN">OpenOffice Writer 模板</comment> <comment xml:lang="zh_TW">OpenOffice Writer 範本</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -5150,6 +5298,7 @@ <mime-type type="application/vnd.oasis.opendocument.text"> <comment>ODT document</comment> <comment xml:lang="ar">مستند ODT</comment> + <comment xml:lang="ast">Documentu ODT</comment> <comment xml:lang="be@latin">Dakument ODT</comment> <comment xml:lang="bg">Документ — ODT</comment> <comment xml:lang="ca">document ODT</comment> @@ -5186,7 +5335,7 @@ <comment xml:lang="pt">documento ODT</comment> <comment xml:lang="pt_BR">Documento ODT</comment> <comment xml:lang="ro">Document ODT</comment> - <comment xml:lang="ru">документ ODT</comment> + <comment xml:lang="ru">Документ ODT</comment> <comment xml:lang="sk">Dokument ODT</comment> <comment xml:lang="sl">Dokument ODT</comment> <comment xml:lang="sq">Dokument ODT</comment> @@ -5213,6 +5362,7 @@ <mime-type type="application/vnd.oasis.opendocument.text-flat-xml"> <comment>ODT document (Flat XML)</comment> <comment xml:lang="ar">مستند ODT (Flat XML)</comment> + <comment xml:lang="ast">Documentu ODT (XML planu)</comment> <comment xml:lang="bg">Документ — ODT (само XML)</comment> <comment xml:lang="ca">document ODT (XML pla)</comment> <comment xml:lang="cs">dokument ODT (Flat XML)</comment> @@ -5245,14 +5395,14 @@ <comment xml:lang="pt">documento ODT (XML plano)</comment> <comment xml:lang="pt_BR">Documento ODT (Flat XML)</comment> <comment xml:lang="ro">Document ODT (XML simplu)</comment> - <comment xml:lang="ru">документ ODT (простой XML)</comment> + <comment xml:lang="ru">Документ ODT (простой XML)</comment> <comment xml:lang="sk">Dokument ODT (čisté XML)</comment> <comment xml:lang="sl">Datoteka dokumenta ODT (nepovezan XML)</comment> <comment xml:lang="sr">ОДТ документ (Обични ИксМЛ)</comment> <comment xml:lang="sv">ODT-dokument (platt XML)</comment> <comment xml:lang="tr">ODT belgesi (Düz XML)</comment> <comment xml:lang="uk">документ ODT (Flat XML)</comment> - <comment xml:lang="zh_CN">ODT 文档(Flat XML)</comment> + <comment xml:lang="zh_CN">ODT 文档（Flat XML）</comment> <comment xml:lang="zh_TW">ODT 文件 (Flat XML)</comment> <acronym>FODT</acronym> <expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym> @@ -5299,7 +5449,7 @@ <comment xml:lang="pt">modelo ODT</comment> <comment xml:lang="pt_BR">Modelo ODT</comment> <comment xml:lang="ro">Șablon ODT</comment> - <comment xml:lang="ru">шаблон ODT</comment> + <comment xml:lang="ru">Шаблон ODT</comment> <comment xml:lang="sk">Šablóna ODT</comment> <comment xml:lang="sl">Predloga dokumenta ODT</comment> <comment xml:lang="sq">Model ODT</comment> @@ -5362,7 +5512,7 @@ <comment xml:lang="pt">modelo OTH</comment> <comment xml:lang="pt_BR">Modelo OTH</comment> <comment xml:lang="ro">Șablon OTH</comment> - <comment xml:lang="ru">шаблон OTH</comment> + <comment xml:lang="ru">Шаблон OTH</comment> <comment xml:lang="sk">Šablóna OTH</comment> <comment xml:lang="sl">Predloga OTH</comment> <comment xml:lang="sq">Model OTH</comment> @@ -5389,6 +5539,7 @@ <mime-type type="application/vnd.oasis.opendocument.text-master"> <comment>ODM document</comment> <comment xml:lang="ar">مستند ODM</comment> + <comment xml:lang="ast">Documentu ODM</comment> <comment xml:lang="be@latin">Dakument ODM</comment> <comment xml:lang="bg">Документ — ODM</comment> <comment xml:lang="ca">document ODM</comment> @@ -5425,7 +5576,7 @@ <comment xml:lang="pt">documento ODM</comment> <comment xml:lang="pt_BR">Documento ODM</comment> <comment xml:lang="ro">Document ODM</comment> - <comment xml:lang="ru">документ ODM</comment> + <comment xml:lang="ru">Документ ODM</comment> <comment xml:lang="sk">Dokument ODM</comment> <comment xml:lang="sl">Dokument ODM</comment> <comment xml:lang="sq">Dokument ODM</comment> @@ -5488,7 +5639,7 @@ <comment xml:lang="pt">desenho ODG</comment> <comment xml:lang="pt_BR">Desenho ODG</comment> <comment xml:lang="ro">Desen ODG</comment> - <comment xml:lang="ru">изображение ODG</comment> + <comment xml:lang="ru">Рисунок ODG</comment> <comment xml:lang="sk">Kresba ODG</comment> <comment xml:lang="sl">Datoteka risbe ODG</comment> <comment xml:lang="sq">Vizatim ODG</comment> @@ -5547,14 +5698,14 @@ <comment xml:lang="pt">desenho ODG (XML plano)</comment> <comment xml:lang="pt_BR">Desenho ODG (Flat XML)</comment> <comment xml:lang="ro">Desen ODG (XML simplu)</comment> - <comment xml:lang="ru">изображение ODG (простой XML)</comment> + <comment xml:lang="ru">Рисунок ODG (простой XML)</comment> <comment xml:lang="sk">Kresba ODG (čisté XML)</comment> <comment xml:lang="sl">Datoteka risbe ODG (nepovezan XML)</comment> <comment xml:lang="sr">ОДГ цртеж (Обичан ИксМЛ)</comment> <comment xml:lang="sv">ODG-teckning (platt XML)</comment> <comment xml:lang="tr">ODG çizimi (Düz XML)</comment> <comment xml:lang="uk">малюнок ODG (Flat XML)</comment> - <comment xml:lang="zh_CN">ODG 绘图(Flat XML)</comment> + <comment xml:lang="zh_CN">ODG 绘图（Flat XML）</comment> <comment xml:lang="zh_TW">ODG 繪圖 (Flat XML)</comment> <acronym>FODG</acronym> <expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym> @@ -5601,7 +5752,7 @@ <comment xml:lang="pt">modelo ODG</comment> <comment xml:lang="pt_BR">Modelo ODG</comment> <comment xml:lang="ro">Șablon ODG</comment> - <comment xml:lang="ru">шаблон ODG</comment> + <comment xml:lang="ru">Шаблон ODG</comment> <comment xml:lang="sk">Šablóna ODG</comment> <comment xml:lang="sl">Predloga dokumenta ODG</comment> <comment xml:lang="sq">Model ODG</comment> @@ -5664,7 +5815,7 @@ <comment xml:lang="pt">apresentação ODP</comment> <comment xml:lang="pt_BR">Apresentação ODP</comment> <comment xml:lang="ro">Prezentare ODP</comment> - <comment xml:lang="ru">презентация ODP</comment> + <comment xml:lang="ru">Презентация ODP</comment> <comment xml:lang="sk">Prezentácia ODP</comment> <comment xml:lang="sl">Predstavitev ODP</comment> <comment xml:lang="sq">Prezantim ODP</comment> @@ -5723,14 +5874,14 @@ <comment xml:lang="pt">apresentação ODP (XML plano)</comment> <comment xml:lang="pt_BR">Apresentação ODP (Flat XML)</comment> <comment xml:lang="ro">Prezentare ODP (XML simplu)</comment> - <comment xml:lang="ru">презентация ODP (простой XML)</comment> + <comment xml:lang="ru">Презентация ODP (простой XML)</comment> <comment xml:lang="sk">Prezentácia ODP (čisté XML)</comment> <comment xml:lang="sl">Predstavitev ODP (nepovezan XML)</comment> <comment xml:lang="sr">ОДП презентација (Обични ИксМЛ)</comment> <comment xml:lang="sv">ODP-presentation (platt XML)</comment> <comment xml:lang="tr">ODP sunumu (Düz XML)</comment> <comment xml:lang="uk">презентація ODP (Flat XML)</comment> - <comment xml:lang="zh_CN">ODP 演示文稿(Flat XML)</comment> + <comment xml:lang="zh_CN">ODP 演示文稿（Flat XML）</comment> <comment xml:lang="zh_TW">ODP 範本 (Flat XML)</comment> <acronym>FODP</acronym> <expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym> @@ -5777,7 +5928,7 @@ <comment xml:lang="pt">modelo ODP</comment> <comment xml:lang="pt_BR">Modelo ODP</comment> <comment xml:lang="ro">Șablon ODP</comment> - <comment xml:lang="ru">шаблон ODP</comment> + <comment xml:lang="ru">Шаблон ODP</comment> <comment xml:lang="sk">Šablóna ODP</comment> <comment xml:lang="sl">Predloga dokumenta ODP</comment> <comment xml:lang="sq">Model ODP</comment> @@ -5840,16 +5991,16 @@ <comment xml:lang="pt">folha de cálculo ODS</comment> <comment xml:lang="pt_BR">Planilha ODS</comment> <comment xml:lang="ro">Foaie de calcul ODS</comment> - <comment xml:lang="ru">электронная таблица ODS</comment> + <comment xml:lang="ru">Электронная таблица ODS</comment> <comment xml:lang="sk">Zošit ODS</comment> <comment xml:lang="sl">Preglednica ODS</comment> <comment xml:lang="sq">Fletë llogaritjesh ODS</comment> - <comment xml:lang="sr">ОДС spreadsheet</comment> + <comment xml:lang="sr">ОДС табела</comment> <comment xml:lang="sv">ODS-kalkylblad</comment> <comment xml:lang="tr">ODS çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця ODS</comment> <comment xml:lang="vi">Bảng tính ODS</comment> - <comment xml:lang="zh_CN">ODS 工作簿</comment> + <comment xml:lang="zh_CN">ODS 电子表格</comment> <comment xml:lang="zh_TW">ODS 試算表</comment> <acronym>ODS</acronym> <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym> @@ -5899,14 +6050,14 @@ <comment xml:lang="pt">folha de cálculo ODS (XML plano)</comment> <comment xml:lang="pt_BR">Planilha ODS (Flat XML)</comment> <comment xml:lang="ro">Foaie de calcul ODS (XML simplu)</comment> - <comment xml:lang="ru">электронная таблица ODS (простой XML)</comment> + <comment xml:lang="ru">Электронная таблица ODS (простой XML)</comment> <comment xml:lang="sk">Zošit ODS (čisté XML)</comment> <comment xml:lang="sl">Preglednica ODS (nepovezan XML)</comment> - <comment xml:lang="sr">ОДС spreadsheet (Обични ИксМЛ)</comment> + <comment xml:lang="sr">ОДС табела (обични ИксМЛ)</comment> <comment xml:lang="sv">ODS-kalkylblad (platt XML)</comment> <comment xml:lang="tr">ODS sunumu (Düz XML)</comment> <comment xml:lang="uk">ел. таблиця ODS (Flat XML)</comment> - <comment xml:lang="zh_CN">ODS 工作簿(Flat XML)</comment> + <comment xml:lang="zh_CN">ODS 电子表格 (Flat XML)</comment> <comment xml:lang="zh_TW">ODS 試算表 (Flat XML)</comment> <acronym>FODS</acronym> <expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym> @@ -5953,7 +6104,7 @@ <comment xml:lang="pt">modelo ODS</comment> <comment xml:lang="pt_BR">Modelo ODS</comment> <comment xml:lang="ro">Șablon ODS</comment> - <comment xml:lang="ru">шаблон ODS</comment> + <comment xml:lang="ru">Шаблон ODS</comment> <comment xml:lang="sk">Šablóna ODS</comment> <comment xml:lang="sl">Predloga dokumenta ODS</comment> <comment xml:lang="sq">Model ODS</comment> @@ -6015,11 +6166,11 @@ <comment xml:lang="pt">gráfico ODC</comment> <comment xml:lang="pt_BR">Gráfico ODC</comment> <comment xml:lang="ro">Diagramă ODC</comment> - <comment xml:lang="ru">диаграмма ODC</comment> + <comment xml:lang="ru">Диаграмма ODC</comment> <comment xml:lang="sk">Graf ODC</comment> <comment xml:lang="sl">Datoteka grafikona ODC</comment> <comment xml:lang="sq">Grafik ODC</comment> - <comment xml:lang="sr">ОДЦ chart</comment> + <comment xml:lang="sr">ОДЦ график</comment> <comment xml:lang="sv">ODC-diagram</comment> <comment xml:lang="tr">ODC çizelgesi</comment> <comment xml:lang="uk">діаграма ODC</comment> @@ -6075,7 +6226,7 @@ <comment xml:lang="pt">modelo ODC</comment> <comment xml:lang="pt_BR">Modelo ODC</comment> <comment xml:lang="ro">Șablon ODC</comment> - <comment xml:lang="ru">шаблон ODC</comment> + <comment xml:lang="ru">Шаблон ODC</comment> <comment xml:lang="sk">Šablóna ODC</comment> <comment xml:lang="sl">Predloga ODC</comment> <comment xml:lang="sr">ОДЦ шаблон</comment> @@ -6137,11 +6288,11 @@ <comment xml:lang="pt">fórmula ODF</comment> <comment xml:lang="pt_BR">Fórmula ODF</comment> <comment xml:lang="ro">Formulă ODF</comment> - <comment xml:lang="ru">формула ODF</comment> + <comment xml:lang="ru">Формула ODF</comment> <comment xml:lang="sk">Vzorec ODF</comment> <comment xml:lang="sl">Dokument formule ODF</comment> <comment xml:lang="sq">Formulë ODF</comment> - <comment xml:lang="sr">ОДФ formula</comment> + <comment xml:lang="sr">ОДФ формула</comment> <comment xml:lang="sv">ODF-formel</comment> <comment xml:lang="tr">ODF formülü</comment> <comment xml:lang="uk">формула ODF</comment> @@ -6197,7 +6348,7 @@ <comment xml:lang="pt">modelo ODF</comment> <comment xml:lang="pt_BR">Modelo ODF</comment> <comment xml:lang="ro">Șablon ODF</comment> - <comment xml:lang="ru">шаблон ODF</comment> + <comment xml:lang="ru">Шаблон ODF</comment> <comment xml:lang="sk">Šablóna ODF</comment> <comment xml:lang="sl">Predloga dokumenta ODF</comment> <comment xml:lang="sr">ОДФ шаблон</comment> @@ -6259,7 +6410,7 @@ <comment xml:lang="pt">base de dados ODB</comment> <comment xml:lang="pt_BR">Banco de dados ODB</comment> <comment xml:lang="ro">Bază de date ODB</comment> - <comment xml:lang="ru">база данных ODB</comment> + <comment xml:lang="ru">База данных ODB</comment> <comment xml:lang="sk">Databáza ODB</comment> <comment xml:lang="sl">Podatkovna zbirka ODB</comment> <comment xml:lang="sq">Bazë me të dhëna ODB</comment> @@ -6287,6 +6438,7 @@ <mime-type type="application/vnd.oasis.opendocument.image"> <comment>ODI image</comment> <comment xml:lang="ar">صورة ODI</comment> + <comment xml:lang="ast">Imaxe ODI</comment> <comment xml:lang="be@latin">Vyjava ODI</comment> <comment xml:lang="bg">Изображение — ODI</comment> <comment xml:lang="ca">imatge ODI</comment> @@ -6323,7 +6475,7 @@ <comment xml:lang="pt">imagem ODI</comment> <comment xml:lang="pt_BR">Imagem ODI</comment> <comment xml:lang="ro">Imagine ODI</comment> - <comment xml:lang="ru">изображение ODI</comment> + <comment xml:lang="ru">Изображение ODI</comment> <comment xml:lang="sk">Obrázok ODI</comment> <comment xml:lang="sl">Slikovna datoteka ODI</comment> <comment xml:lang="sq">Figurë ODI</comment> @@ -6350,6 +6502,7 @@ <mime-type type="application/vnd.openofficeorg.extension"> <comment>OpenOffice.org extension</comment> <comment xml:lang="ar">امتداد OpenOffice.org</comment> + <comment xml:lang="ast">Estensión d'OpenOffice.org</comment> <comment xml:lang="be@latin">Pašyreńnie OpenOffice.org</comment> <comment xml:lang="bg">Разширение — OpenOffice</comment> <comment xml:lang="ca">extensió d'OpenOffice.org</comment> @@ -6384,7 +6537,7 @@ <comment xml:lang="pt">extensão OpenOffice.org</comment> <comment xml:lang="pt_BR">Extensão do OpenOffice</comment> <comment xml:lang="ro">Extensie OpenOffice.org</comment> - <comment xml:lang="ru">расширение OpenOffice.org</comment> + <comment xml:lang="ru">Расширение OpenOffice.org</comment> <comment xml:lang="sk">Rozšírenie OpenOffice.org</comment> <comment xml:lang="sl">Razširitev OpenOffice.org</comment> <comment xml:lang="sq">Shtojcë për OpenOffice.org</comment> @@ -6401,6 +6554,7 @@ </mime-type> <mime-type type="application/vnd.android.package-archive"> <comment>Android package</comment> + <comment xml:lang="ast">Paquete d'Android</comment> <comment xml:lang="bg">Пакет — Android</comment> <comment xml:lang="ca">paquet d'Android</comment> <comment xml:lang="cs">balíčky systému Android</comment> @@ -6413,6 +6567,7 @@ <comment xml:lang="eu">Android paketea</comment> <comment xml:lang="fi">Android-paketti</comment> <comment xml:lang="fr">paquet Android</comment> + <comment xml:lang="ga">pacáiste Android</comment> <comment xml:lang="gl">paquete de Android</comment> <comment xml:lang="he">חבילת אנדרויד</comment> <comment xml:lang="hr">Android paket</comment> @@ -6430,14 +6585,14 @@ <comment xml:lang="pl">Pakiet Androida</comment> <comment xml:lang="pt">pacote Android</comment> <comment xml:lang="pt_BR">Pacote do Android</comment> - <comment xml:lang="ru">пакет Android</comment> + <comment xml:lang="ru">Пакет Android</comment> <comment xml:lang="sk">Balík Android</comment> <comment xml:lang="sl">Paket Android</comment> <comment xml:lang="sr">Андроидов пакет</comment> <comment xml:lang="sv">Android-paket</comment> <comment xml:lang="tr">Android paketi</comment> <comment xml:lang="uk">пакунок Android</comment> - <comment xml:lang="zh_CN">Android</comment> + <comment xml:lang="zh_CN">Android 应用包</comment> <comment xml:lang="zh_TW">Android 軟體包</comment> <sub-class-of type="application/x-java-archive"/> <glob pattern="*.apk"/> @@ -6445,6 +6600,7 @@ <mime-type type="application/vnd.symbian.install"> <comment>SIS package</comment> <comment xml:lang="ar">حزمة SIS</comment> + <comment xml:lang="ast">Paquete SIS</comment> <comment xml:lang="be@latin">Pakunak SIS</comment> <comment xml:lang="bg">Пакет — SIS</comment> <comment xml:lang="ca">paquet SIS</comment> @@ -6480,7 +6636,7 @@ <comment xml:lang="pt">pacote SIS</comment> <comment xml:lang="pt_BR">Pacote SIS</comment> <comment xml:lang="ro">Pachet SIS</comment> - <comment xml:lang="ru">пакет SIS</comment> + <comment xml:lang="ru">Пакет SIS</comment> <comment xml:lang="sk">Balíček SIS</comment> <comment xml:lang="sl">Datoteka paketa SIS</comment> <comment xml:lang="sq">Paketë SIS</comment> @@ -6502,6 +6658,7 @@ <mime-type type="x-epoc/x-sisx-app"> <comment>SISX package</comment> <comment xml:lang="ar">حزمة SISX</comment> + <comment xml:lang="ast">Paquete SISX</comment> <comment xml:lang="be@latin">Pakunak SISX</comment> <comment xml:lang="bg">Пакет — SISX</comment> <comment xml:lang="ca">paquet SISX</comment> @@ -6537,7 +6694,7 @@ <comment xml:lang="pt">pacote SISX</comment> <comment xml:lang="pt_BR">Pacote SISX</comment> <comment xml:lang="ro">Pachet SISX</comment> - <comment xml:lang="ru">пакет SISX</comment> + <comment xml:lang="ru">Пакет SISX</comment> <comment xml:lang="sk">Balíček SISX</comment> <comment xml:lang="sl">Datoteka paketa SISX</comment> <comment xml:lang="sq">Paketë SISX</comment> @@ -6569,6 +6726,7 @@ <comment xml:lang="eu">Sareko pakete kaptura</comment> <comment xml:lang="fi">Verkkopakettien kaappaus</comment> <comment xml:lang="fr">capture de paquet réseau</comment> + <comment xml:lang="ga">Gabháltas Paicéid Líonra</comment> <comment xml:lang="gl">Captura de Network Packet</comment> <comment xml:lang="he">לכידה של מנות נתונים ברשת</comment> <comment xml:lang="hr">Mrežno hvatanje paketa</comment> @@ -6586,7 +6744,7 @@ <comment xml:lang="pl">Przechwycenie pakietu sieciowego</comment> <comment xml:lang="pt">captura Network Packet</comment> <comment xml:lang="pt_BR">Pacote de captura de rede</comment> - <comment xml:lang="ru">захваченные сетевые пакеты</comment> + <comment xml:lang="ru">Захваченные сетевые пакеты</comment> <comment xml:lang="sk">Zachytené sieťové pakety</comment> <comment xml:lang="sl">Zajem omrežnih paketov</comment> <comment xml:lang="sr">Снимање мрежног пакета</comment> @@ -6608,6 +6766,7 @@ <mime-type type="application/vnd.wordperfect"> <comment>WordPerfect document</comment> <comment xml:lang="ar">مستند WordPerfect</comment> + <comment xml:lang="ast">Documentu de WordPerfect</comment> <comment xml:lang="az">WordPerfect sənədi</comment> <comment xml:lang="be@latin">Dakument WordPerfect</comment> <comment xml:lang="bg">Документ — WordPerfect</comment> @@ -6646,11 +6805,11 @@ <comment xml:lang="pt">documento WordPerfect</comment> <comment xml:lang="pt_BR">Documento do WordPerfect</comment> <comment xml:lang="ro">Document WordPerfect</comment> - <comment xml:lang="ru">документ WordPerfect</comment> + <comment xml:lang="ru">Документ WordPerfect</comment> <comment xml:lang="sk">Dokument WordPerfect</comment> <comment xml:lang="sl">Dokument WordPerfect</comment> <comment xml:lang="sq">Dokument WordPerfect</comment> - <comment xml:lang="sr">документ Ворд Перфекта</comment> + <comment xml:lang="sr">документ Ворд перфекта</comment> <comment xml:lang="sv">WordPerfect-dokument</comment> <comment xml:lang="tr">WordPerfect belgesi</comment> <comment xml:lang="uk">документ WordPerfect</comment> @@ -6671,6 +6830,12 @@ <glob pattern="*.wpd"/> <glob pattern="*.wpp"/> </mime-type> + <mime-type type="application/vnd.youtube.yt"> + <comment>YouTube Media Archive</comment> + <generic-icon name="video-x-generic"/> + <glob pattern="*.yt"/> + <sub-class-of type="application/zip"/> + </mime-type> <mime-type type="application/x-spss-por"> <comment>SPSS Portable Data File</comment> <comment xml:lang="ar">ملف بيانات SPSS متنقلة</comment> @@ -6704,7 +6869,7 @@ <comment xml:lang="pt">ficheiro de dados portátil SPSS</comment> <comment xml:lang="pt_BR">Arquivo de Dados Portáteis SPSS</comment> <comment xml:lang="ro">Fișier portabil de date SPSS</comment> - <comment xml:lang="ru">файл переносимых данных SPSS</comment> + <comment xml:lang="ru">Файл переносимых данных SPSS</comment> <comment xml:lang="sk">Súbor prenosných dát SPSS</comment> <comment xml:lang="sl">Prenosna podatkovna datoteka SPSS</comment> <comment xml:lang="sr">СПСС датотека преносних података</comment> @@ -6730,6 +6895,7 @@ <comment xml:lang="en_GB">SPSS Data File</comment> <comment xml:lang="es">archivo de datos SPSS</comment> <comment xml:lang="eu">SPSS datuen fitxategia</comment> + <comment xml:lang="fi">SPSS-datatiedosto</comment> <comment xml:lang="fo">SPSS dátufíla</comment> <comment xml:lang="fr">fichier de données SPSS</comment> <comment xml:lang="ga">comhad sonraí SPSS</comment> @@ -6751,7 +6917,7 @@ <comment xml:lang="pt">ficheiro de dados SPSS</comment> <comment xml:lang="pt_BR">Arquivo de dados SPSS</comment> <comment xml:lang="ro">Fișier date SPSS</comment> - <comment xml:lang="ru">файл данных SPSS</comment> + <comment xml:lang="ru">Файл данных SPSS</comment> <comment xml:lang="sk">Dátový súbor SPSS</comment> <comment xml:lang="sl">Podatkovna datoteka SPSS</comment> <comment xml:lang="sr">СПСС датотека података</comment> @@ -6788,7 +6954,7 @@ <comment xml:lang="ga">leabharmharcanna XBEL</comment> <comment xml:lang="gl">Marcadores XBEL</comment> <comment xml:lang="he">סימניית XBEL</comment> - <comment xml:lang="hr">XBEL knjižne oznake</comment> + <comment xml:lang="hr">XBEL zabilješka</comment> <comment xml:lang="hu">XBEL-könyvjelzők</comment> <comment xml:lang="ia">Marcapaginas XBEL</comment> <comment xml:lang="id">Bookmark XBEL</comment> @@ -6807,7 +6973,7 @@ <comment xml:lang="pt">marcadores XBEL</comment> <comment xml:lang="pt_BR">Marcadores do XBEL</comment> <comment xml:lang="ro">Semne de carte XBEL</comment> - <comment xml:lang="ru">закладки XBEL</comment> + <comment xml:lang="ru">Закладки XBEL</comment> <comment xml:lang="sk">Záložky XBEL</comment> <comment xml:lang="sl">Datoteka zaznamkov XBEL</comment> <comment xml:lang="sq">Libërshënues XBEL</comment> @@ -6830,6 +6996,7 @@ <mime-type type="application/x-7z-compressed"> <comment>7-zip archive</comment> <comment xml:lang="ar">أرشيف 7-zip</comment> + <comment xml:lang="ast">Archivu 7-zip</comment> <comment xml:lang="be@latin">Archiŭ 7-zip</comment> <comment xml:lang="bg">Архив — 7-zip</comment> <comment xml:lang="ca">arxiu 7-zip</comment> @@ -6866,7 +7033,7 @@ <comment xml:lang="pt">arquivo 7-zip</comment> <comment xml:lang="pt_BR">Pacote 7-Zip</comment> <comment xml:lang="ro">Arhivă 7-zip</comment> - <comment xml:lang="ru">архив 7-zip</comment> + <comment xml:lang="ru">Архив 7-zip</comment> <comment xml:lang="sk">Archív 7-zip</comment> <comment xml:lang="sl">Datoteka arhiva 7-zip</comment> <comment xml:lang="sq">Arkiv 7-zip</comment> @@ -6886,6 +7053,7 @@ <mime-type type="application/x-abiword"> <comment>AbiWord document</comment> <comment xml:lang="ar">مستند آبي وورد</comment> + <comment xml:lang="ast">Documentu d'AbiWord</comment> <comment xml:lang="be@latin">Dakument AbiWord</comment> <comment xml:lang="bg">Документ — AbiWord</comment> <comment xml:lang="ca">document AbiWord</comment> @@ -6923,7 +7091,7 @@ <comment xml:lang="pt">documento AbiWord</comment> <comment xml:lang="pt_BR">Documento do AbiWord</comment> <comment xml:lang="ro">Document AbiWord</comment> - <comment xml:lang="ru">документ AbiWord</comment> + <comment xml:lang="ru">Документ AbiWord</comment> <comment xml:lang="sk">Dokument AbiWord</comment> <comment xml:lang="sl">Dokument AbiWord</comment> <comment xml:lang="sq">Dokument AbiWord</comment> @@ -6961,7 +7129,7 @@ <comment xml:lang="eu">CD irudiaren CUE orria</comment> <comment xml:lang="fi">CD-vedos cuesheet</comment> <comment xml:lang="fr">index de pistes de CD</comment> - <comment xml:lang="ga">bileog chiúáil íomhá CD</comment> + <comment xml:lang="ga">bileog chiúála íomhá CD</comment> <comment xml:lang="gl">cue sheet dunha imaxe de CD</comment> <comment xml:lang="he">גליון נתונים לתמונת דיסק</comment> <comment xml:lang="hr">CD slika s meta podacima</comment> @@ -6982,11 +7150,11 @@ <comment xml:lang="pt">índice de CD de imagem</comment> <comment xml:lang="pt_BR">Índice de Imagem de CD</comment> <comment xml:lang="ro">Imagine CD cuesheet</comment> - <comment xml:lang="ru">таблица содержания образа CD</comment> + <comment xml:lang="ru">Таблица содержания образа CD</comment> <comment xml:lang="sk">Rozvrhnutie stôp obrazu CD</comment> <comment xml:lang="sl">Datoteka razpredelnice odtisa CD cue</comment> <comment xml:lang="sq">Cuesheet imazhi CD</comment> - <comment xml:lang="sr">редослед слика ЦД-а</comment> + <comment xml:lang="sr">Кју лист ЦД одраза</comment> <comment xml:lang="sv">Indexblad för cd-avbild</comment> <comment xml:lang="tr">CD görüntüsü belgesi</comment> <comment xml:lang="uk">таблиця CUE образу CD</comment> @@ -7000,6 +7168,7 @@ <mime-type type="application/x-amipro"> <comment>Lotus AmiPro document</comment> <comment xml:lang="ar">مستند Lotus AmiPro</comment> + <comment xml:lang="ast">Documentu de Lotus AmiPro</comment> <comment xml:lang="az">Lotus AmiPro sənədi</comment> <comment xml:lang="be@latin">Dakument Lotus AmiPro</comment> <comment xml:lang="bg">Документ — Lotus AmiPro</comment> @@ -7038,7 +7207,7 @@ <comment xml:lang="pt">documento Lotus AmiPro</comment> <comment xml:lang="pt_BR">Documento do Lotus AmiPro</comment> <comment xml:lang="ro">Document Lotus AmiPro</comment> - <comment xml:lang="ru">документ Lotus AmiPro</comment> + <comment xml:lang="ru">Документ Lotus AmiPro</comment> <comment xml:lang="sk">Dokument Lotus AmiPro</comment> <comment xml:lang="sl">Dokument Lotus AmiPro</comment> <comment xml:lang="sq">Dokument Lotus AmiPro</comment> @@ -7055,6 +7224,7 @@ <mime-type type="application/x-aportisdoc"> <comment>AportisDoc document</comment> <comment xml:lang="ar">مستند AportisDoc</comment> + <comment xml:lang="ast">Documentu d'AportisDoc</comment> <comment xml:lang="bg">Документ — AportisDoc</comment> <comment xml:lang="ca">document AportisDoc</comment> <comment xml:lang="cs">dokument AportisDoc</comment> @@ -7088,7 +7258,7 @@ <comment xml:lang="pt">documento AportisDoc</comment> <comment xml:lang="pt_BR">Documento do AportisDoc</comment> <comment xml:lang="ro">Document AportisDoc</comment> - <comment xml:lang="ru">документ AportisDoc</comment> + <comment xml:lang="ru">Документ AportisDoc</comment> <comment xml:lang="sk">Dokument AportisDoc</comment> <comment xml:lang="sl">Dokument AportisDoc</comment> <comment xml:lang="sr">Апортис Док документ</comment> @@ -7147,7 +7317,7 @@ <comment xml:lang="pt">folha de cálculo Applix Spreadsheets</comment> <comment xml:lang="pt_BR">Planilha do Applix Spreadsheets</comment> <comment xml:lang="ro">Foaie de calcul Applix</comment> - <comment xml:lang="ru">электронная таблица Applix Spreadsheets</comment> + <comment xml:lang="ru">Электронная таблица Applix Spreadsheets</comment> <comment xml:lang="sk">Zošit Applix Spreadsheets</comment> <comment xml:lang="sl">Razpredelnica Applix Spreadsheets</comment> <comment xml:lang="sq">Fletë llogaritjesh Applix Spreadsheets</comment> @@ -7156,7 +7326,7 @@ <comment xml:lang="tr">Applix Spreadsheets çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Applix Spreadsheets</comment> <comment xml:lang="vi">Bảng tính Applix Spreadsheets</comment> - <comment xml:lang="zh_CN">Applix Spreadsheets 工作簿</comment> + <comment xml:lang="zh_CN">Applix Spreadsheets 电子表格</comment> <comment xml:lang="zh_TW">Applix Spreadsheets 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -7170,6 +7340,7 @@ <mime-type type="application/x-applix-word"> <comment>Applix Words document</comment> <comment xml:lang="ar">مستند كلمات Applix</comment> + <comment xml:lang="ast">Documentu d'Applix Words</comment> <comment xml:lang="az">Applix Words sənədi</comment> <comment xml:lang="be@latin">Dakument Applix Words</comment> <comment xml:lang="bg">Документ — Applix Words</comment> @@ -7209,7 +7380,7 @@ <comment xml:lang="pt">documento Applix Words</comment> <comment xml:lang="pt_BR">Documento do Applix Words</comment> <comment xml:lang="ro">Document Applix Words</comment> - <comment xml:lang="ru">документ Applix Words</comment> + <comment xml:lang="ru">Документ Applix Words</comment> <comment xml:lang="sk">Dokument Applix Words</comment> <comment xml:lang="sl">Dokument Applix Words</comment> <comment xml:lang="sq">Dokument Applix Words</comment> @@ -7267,7 +7438,7 @@ <comment xml:lang="pt">arquivo ARC</comment> <comment xml:lang="pt_BR">Pacote ARC</comment> <comment xml:lang="ro">Arhivă ARC</comment> - <comment xml:lang="ru">архив ARC</comment> + <comment xml:lang="ru">Архив ARC</comment> <comment xml:lang="sk">Archív ARC</comment> <comment xml:lang="sl">Datoteka arhiva ARC</comment> <comment xml:lang="sq">Arkiv ARC</comment> @@ -7328,7 +7499,7 @@ <comment xml:lang="pt">arquivo AR</comment> <comment xml:lang="pt_BR">Pacote AR</comment> <comment xml:lang="ro">Arhivă AR</comment> - <comment xml:lang="ru">архив AR</comment> + <comment xml:lang="ru">Архив AR</comment> <comment xml:lang="sk">Archív AR</comment> <comment xml:lang="sl">Datoteka arhiva AR</comment> <comment xml:lang="sq">Arkiv AR</comment> @@ -7389,7 +7560,7 @@ <comment xml:lang="pt">arquivo ARJ</comment> <comment xml:lang="pt_BR">Pacote ARJ</comment> <comment xml:lang="ro">Arhivă ARJ</comment> - <comment xml:lang="ru">архив ARJ</comment> + <comment xml:lang="ru">Архив ARJ</comment> <comment xml:lang="sk">Archív ARJ</comment> <comment xml:lang="sl">Datoteka arhiva ARJ</comment> <comment xml:lang="sq">Arkiv ARJ</comment> @@ -7411,6 +7582,7 @@ <mime-type type="application/x-asp"> <comment>ASP page</comment> <comment xml:lang="ar">صفحة ASP</comment> + <comment xml:lang="ast">Páxina ASP</comment> <comment xml:lang="be@latin">Staronka ASP</comment> <comment xml:lang="bg">Страница — ASP</comment> <comment xml:lang="ca">pàgina ASP</comment> @@ -7447,7 +7619,7 @@ <comment xml:lang="pt">página ASP</comment> <comment xml:lang="pt_BR">Página ASP</comment> <comment xml:lang="ro">Pagină ASP</comment> - <comment xml:lang="ru">страница ASP</comment> + <comment xml:lang="ru">Страница ASP</comment> <comment xml:lang="sk">Stránka ASP</comment> <comment xml:lang="sl">Datoteka spletne strani ASP</comment> <comment xml:lang="sq">Faqe ASP</comment> @@ -7467,6 +7639,7 @@ <mime-type type="application/x-awk"> <comment>AWK script</comment> <comment xml:lang="ar">سكربت AWK</comment> + <comment xml:lang="ast">Script AWK</comment> <comment xml:lang="az">AWK skripti</comment> <comment xml:lang="be@latin">Skrypt AWK</comment> <comment xml:lang="bg">Скрипт — AWK</comment> @@ -7506,7 +7679,7 @@ <comment xml:lang="pt">script AWK</comment> <comment xml:lang="pt_BR">Script AWK</comment> <comment xml:lang="ro">Script AWK</comment> - <comment xml:lang="ru">сценарий AWK</comment> + <comment xml:lang="ru">Сценарий AWK</comment> <comment xml:lang="sk">Skript AWK</comment> <comment xml:lang="sl">Skriptna datoteka AWK</comment> <comment xml:lang="sq">Script AWK</comment> @@ -7537,6 +7710,7 @@ <mime-type type="application/x-bcpio"> <comment>BCPIO document</comment> <comment xml:lang="ar">مستند BCPIO</comment> + <comment xml:lang="ast">Documentu BCPIO</comment> <comment xml:lang="az">BCPIO sənədi</comment> <comment xml:lang="be@latin">Dakument BCPIO</comment> <comment xml:lang="bg">Документ — BCPIO</comment> @@ -7576,7 +7750,7 @@ <comment xml:lang="pt">documento BCPIO</comment> <comment xml:lang="pt_BR">Documento BCPIO</comment> <comment xml:lang="ro">Document BCPIO</comment> - <comment xml:lang="ru">документ BCPIO</comment> + <comment xml:lang="ru">Документ BCPIO</comment> <comment xml:lang="sk">Dokument BCPIO</comment> <comment xml:lang="sl">Dokument BCPIO</comment> <comment xml:lang="sq">Dokument BCPIO</comment> @@ -7633,7 +7807,7 @@ <comment xml:lang="pt">ficheiro de semente BitTorrent</comment> <comment xml:lang="pt_BR">Arquivo semente BitTorrent</comment> <comment xml:lang="ro">Fișier sursă-completă BitTorrent</comment> - <comment xml:lang="ru">файл источника BitTorrent</comment> + <comment xml:lang="ru">Файл источника BitTorrent</comment> <comment xml:lang="sk">Súbor BitTorrent</comment> <comment xml:lang="sl">Datoteka sejanja BitTorrent</comment> <comment xml:lang="sq">File bazë BitTorrent</comment> @@ -7652,6 +7826,7 @@ <mime-type type="application/x-blender"> <comment>Blender scene</comment> <comment xml:lang="ar">مشهد بلندر</comment> + <comment xml:lang="ast">Escena de Blender</comment> <comment xml:lang="be@latin">Scena Blender</comment> <comment xml:lang="bg">Сцена — Blender</comment> <comment xml:lang="ca">escena de Blender</comment> @@ -7689,7 +7864,7 @@ <comment xml:lang="pt">cenário Blender</comment> <comment xml:lang="pt_BR">Cena do Blender</comment> <comment xml:lang="ro">Scenă Blender</comment> - <comment xml:lang="ru">сцена Blender</comment> + <comment xml:lang="ru">Сцена Blender</comment> <comment xml:lang="sk">Scéna Blender</comment> <comment xml:lang="sl">Datoteka scene Blender</comment> <comment xml:lang="sq">Skenë Blender</comment> @@ -7711,6 +7886,7 @@ <mime-type type="application/x-bzdvi"> <comment>TeX DVI document (bzip-compressed)</comment> <comment xml:lang="ar">مستند TeX DVI (مضغوط-bzip)</comment> + <comment xml:lang="ast">Documentu Tex DVI (comprimíu en bzip)</comment> <comment xml:lang="be@latin">Dakument TeX DVI (bzip-skampresavany)</comment> <comment xml:lang="bg">Документ — TeX DVI, компресиран с bzip</comment> <comment xml:lang="ca">document de TeX DVI (amb compressió bzip)</comment> @@ -7727,7 +7903,7 @@ <comment xml:lang="ga">cáipéis DVI TeX (comhbhrúite le bzip)</comment> <comment xml:lang="gl">documento DVI de TeX (comprimido con bzip)</comment> <comment xml:lang="he">מסמך מסוג TeX DVI (מכווץ ע״י bzip)</comment> - <comment xml:lang="hr">TeX DVI dokument (komprimiran bzip-om)</comment> + <comment xml:lang="hr">TeX DVI dokument (bzip sažeto)</comment> <comment xml:lang="hu">TeX DVI dokumentum (bzip-pel tömörítve)</comment> <comment xml:lang="ia">Documento TeX DVI (comprimite con bzip)</comment> <comment xml:lang="id">Dokumen TeX DVI (terkompresi bzip)</comment> @@ -7745,7 +7921,7 @@ <comment xml:lang="pt">documento TeX DVI (compressão bzip)</comment> <comment xml:lang="pt_BR">Documento DVI TeX (compactado com bzip)</comment> <comment xml:lang="ro">Document TeX DVI (comprimat bzip)</comment> - <comment xml:lang="ru">документ TeX DVI (сжатый bzip)</comment> + <comment xml:lang="ru">Документ TeX DVI (сжатый bzip)</comment> <comment xml:lang="sk">Dokument TeX DVI (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Dokument TeX DVI (stisnjen z bzip)</comment> <comment xml:lang="sq">Dokument Tex DVI (i kompresuar me bzip)</comment> @@ -7754,7 +7930,7 @@ <comment xml:lang="tr">TeX DVI belgesi (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ TeX DVI (стиснений bzip)</comment> <comment xml:lang="vi">Tài liệu DVI TeX (đã nén bzip)</comment> - <comment xml:lang="zh_CN">TeX DVI 文档(gzip 压缩)</comment> + <comment xml:lang="zh_CN">TeX DVI 文档（gzip 压缩）</comment> <comment xml:lang="zh_TW">TeX DVI 文件 (bzip 格式壓縮)</comment> <sub-class-of type="application/x-bzip"/> <generic-icon name="x-office-document"/> @@ -7763,6 +7939,7 @@ <mime-type type="application/x-bzip"> <comment>Bzip archive</comment> <comment xml:lang="ar">أرشيف Bzip</comment> + <comment xml:lang="ast">Archivu Bzip</comment> <comment xml:lang="be@latin">Archiŭ bzip</comment> <comment xml:lang="bg">Архив — bzip</comment> <comment xml:lang="ca">arxiu bzip</comment> @@ -7799,7 +7976,7 @@ <comment xml:lang="pt">arquivo Bzip</comment> <comment xml:lang="pt_BR">Pacote Bzip</comment> <comment xml:lang="ro">Arhivă Bzip</comment> - <comment xml:lang="ru">архив BZIP</comment> + <comment xml:lang="ru">Архив BZIP</comment> <comment xml:lang="sk">Archív bzip</comment> <comment xml:lang="sl">Datoteka arhiva Bzip</comment> <comment xml:lang="sq">Arkiv bzip</comment> @@ -7808,7 +7985,7 @@ <comment xml:lang="tr">Bzip arşivi</comment> <comment xml:lang="uk">архів bzip</comment> <comment xml:lang="vi">Kho nén bzip</comment> - <comment xml:lang="zh_CN">bzip 归档文件</comment> + <comment xml:lang="zh_CN">Bzip 归档文件</comment> <comment xml:lang="zh_TW">Bzip 封存檔</comment> <generic-icon name="package-x-generic"/> <magic priority="50"> @@ -7821,6 +7998,7 @@ <mime-type type="application/x-bzip-compressed-tar"> <comment>Tar archive (bzip-compressed)</comment> <comment xml:lang="ar">أرشيف Tar (مضغوط-bzip)</comment> + <comment xml:lang="ast">Archivu Tar (comprimíu en bzip)</comment> <comment xml:lang="be@latin">Archiŭ tar (bzip-skampresavany)</comment> <comment xml:lang="bg">Архив — tar, компресиран с bzip</comment> <comment xml:lang="ca">arxiu tar (amb compressió bzip)</comment> @@ -7837,7 +8015,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le bzip)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con bzip)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י bzip)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana bzip-om)</comment> + <comment xml:lang="hr">Tar arhiva (bzip sažeto)</comment> <comment xml:lang="hu">Tar archívum (bzip-pel tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con bzip)</comment> <comment xml:lang="id">Arsip Tar (terkompresi bzip)</comment> @@ -7855,7 +8033,7 @@ <comment xml:lang="pt">arquivo Tar (compressão bzip)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com bzip)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată bzip)</comment> - <comment xml:lang="ru">архив TAR (сжатый BZIP)</comment> + <comment xml:lang="ru">Архив TAR (сжатый bzip)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z bzip)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar me bzip)</comment> @@ -7864,7 +8042,7 @@ <comment xml:lang="tr">Tar arşivi (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений bzip)</comment> <comment xml:lang="vi">Kho nén tar (đã nén bzip)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(bzip 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（bzip 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (bzip 格式壓縮)</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="application/x-bzip"/> @@ -7877,6 +8055,7 @@ <mime-type type="application/x-bzpdf"> <comment>PDF document (bzip-compressed)</comment> <comment xml:lang="ar">مستند PDF (مضغوط-bzip)</comment> + <comment xml:lang="ast">Documentu PDF (comprimíu en bzip)</comment> <comment xml:lang="be@latin">Dakument PDF (bzip-skampresavany)</comment> <comment xml:lang="bg">Документ — PDF, компресиран с bzip</comment> <comment xml:lang="ca">document PDF (amb compressió bzip)</comment> @@ -7911,7 +8090,7 @@ <comment xml:lang="pt">documento PDF (compressão bzip)</comment> <comment xml:lang="pt_BR">Documento PDF (compactado com bzip)</comment> <comment xml:lang="ro">Document PDF (comprimat bzip)</comment> - <comment xml:lang="ru">документ PDF (сжатый bzip)</comment> + <comment xml:lang="ru">Документ PDF (сжатый bzip)</comment> <comment xml:lang="sk">Dokument PDF (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Dokument PDF (stisnjen z bzip)</comment> <comment xml:lang="sq">Dokument PDF (i kompresuar me bzip)</comment> @@ -7920,7 +8099,7 @@ <comment xml:lang="tr">PDF belgesi (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PDF (стиснений bzip)</comment> <comment xml:lang="vi">Tài liệu PDF (đã nén bzip)</comment> - <comment xml:lang="zh_CN">PDF 文档(bzip 压缩)</comment> + <comment xml:lang="zh_CN">PDF 文档（bzip 压缩）</comment> <comment xml:lang="zh_TW">PDF 文件 (bzip 格式壓縮)</comment> <sub-class-of type="application/x-bzip"/> <generic-icon name="x-office-document"/> @@ -7929,6 +8108,7 @@ <mime-type type="application/x-bzpostscript"> <comment>PostScript document (bzip-compressed)</comment> <comment xml:lang="ar">مستند PostScript (مضغوط-bzip)</comment> + <comment xml:lang="ast">Documentu PostScript (comprimíu en bzip)</comment> <comment xml:lang="be@latin">Dakument PostScript (bzip-skampresavany)</comment> <comment xml:lang="bg">Документ — PostScript, компресиран с bzip</comment> <comment xml:lang="ca">document PostScript (amb compressió bzip)</comment> @@ -7963,7 +8143,7 @@ <comment xml:lang="pt">documento PostScript (compressão bzip)</comment> <comment xml:lang="pt_BR">Documento PostScript (compactado com bzip)</comment> <comment xml:lang="ro">Document PostScript (comprimat bzip)</comment> - <comment xml:lang="ru">документ PostScript (сжатый bzip)</comment> + <comment xml:lang="ru">Документ PostScript (сжатый bzip)</comment> <comment xml:lang="sk">Dokument PostScript (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Dokument PostScript (stisnjen z bzip)</comment> <comment xml:lang="sq">Dokument PostScript (i kompresuar me bzip)</comment> @@ -7972,13 +8152,13 @@ <comment xml:lang="tr">PostScript belgesi (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PostScript (стиснене bzip)</comment> <comment xml:lang="vi">Tài liệu PostScript (đã nén bzip)</comment> - <comment xml:lang="zh_CN">PostScript 文档(bzip 压缩)</comment> + <comment xml:lang="zh_CN">PostScript 文档（bzip 压缩）</comment> <comment xml:lang="zh_TW">PostScript 文件 (bzip 格式壓縮)</comment> <sub-class-of type="application/x-bzip"/> <generic-icon name="x-office-document"/> <glob pattern="*.ps.bz2"/> </mime-type> - <mime-type type="application/x-cbr"> + <mime-type type="application/vnd.comicbook-rar"> <comment>comic book archive</comment> <comment xml:lang="ar">أرشيف comic book</comment> <comment xml:lang="be@latin">archiŭ komiksaŭ</comment> @@ -8015,7 +8195,7 @@ <comment xml:lang="pt">arquivo de banda desenhada</comment> <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment> <comment xml:lang="ro">arhivă benzi desenate</comment> - <comment xml:lang="ru">архив комиксов</comment> + <comment xml:lang="ru">Архив комиксов</comment> <comment xml:lang="sk">Archív knihy komiksov</comment> <comment xml:lang="sl">Datoteka arhiva stripov</comment> <comment xml:lang="sq">Arkiv comic book</comment> @@ -8024,11 +8204,12 @@ <comment xml:lang="tr">çizgi roman arşivi</comment> <comment xml:lang="uk">архів коміксів</comment> <comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment> - <comment xml:lang="zh_CN">Comic Book 归档文件</comment> + <comment xml:lang="zh_CN">漫画书归档文件</comment> <comment xml:lang="zh_TW">漫畫書封存檔</comment> <sub-class-of type="application/vnd.rar"/> <generic-icon name="x-office-document"/> <glob pattern="*.cbr"/> + <alias type="application/x-cbr"/> </mime-type> <mime-type type="application/x-cb7"> <comment>comic book archive</comment> @@ -8067,7 +8248,7 @@ <comment xml:lang="pt">arquivo de banda desenhada</comment> <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment> <comment xml:lang="ro">arhivă benzi desenate</comment> - <comment xml:lang="ru">архив комиксов</comment> + <comment xml:lang="ru">Архив комиксов</comment> <comment xml:lang="sk">Archív knihy komiksov</comment> <comment xml:lang="sl">Datoteka arhiva stripov</comment> <comment xml:lang="sq">Arkiv comic book</comment> @@ -8076,7 +8257,7 @@ <comment xml:lang="tr">çizgi roman arşivi</comment> <comment xml:lang="uk">архів коміксів</comment> <comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment> - <comment xml:lang="zh_CN">Comic Book 归档文件</comment> + <comment xml:lang="zh_CN">漫画书归档文件</comment> <comment xml:lang="zh_TW">漫畫書封存檔</comment> <sub-class-of type="application/x-7z-compressed"/> <generic-icon name="x-office-document"/> @@ -8119,7 +8300,7 @@ <comment xml:lang="pt">arquivo de banda desenhada</comment> <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment> <comment xml:lang="ro">arhivă benzi desenate</comment> - <comment xml:lang="ru">архив комиксов</comment> + <comment xml:lang="ru">Архив комиксов</comment> <comment xml:lang="sk">Archív knihy komiksov</comment> <comment xml:lang="sl">Datoteka arhiva stripov</comment> <comment xml:lang="sq">Arkiv comic book</comment> @@ -8128,7 +8309,7 @@ <comment xml:lang="tr">çizgi roman arşivi</comment> <comment xml:lang="uk">архів коміксів</comment> <comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment> - <comment xml:lang="zh_CN">Comic Book 归档文件</comment> + <comment xml:lang="zh_CN">漫画书归档文件</comment> <comment xml:lang="zh_TW">漫畫書封存檔</comment> <sub-class-of type="application/x-tar"/> <generic-icon name="x-office-document"/> @@ -8171,7 +8352,7 @@ <comment xml:lang="pt">arquivo de banda desenhada</comment> <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment> <comment xml:lang="ro">arhivă benzi desenate</comment> - <comment xml:lang="ru">архив комиксов</comment> + <comment xml:lang="ru">Архив комиксов</comment> <comment xml:lang="sk">Archív knihy komiksov</comment> <comment xml:lang="sl">Datoteka arhiva stripov</comment> <comment xml:lang="sq">Arkiv comic book</comment> @@ -8180,7 +8361,7 @@ <comment xml:lang="tr">çizgi roman arşivi</comment> <comment xml:lang="uk">архів коміксів</comment> <comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment> - <comment xml:lang="zh_CN">Comic Book 归档文件</comment> + <comment xml:lang="zh_CN">漫画书归档文件</comment> <comment xml:lang="zh_TW">漫畫書封存檔</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -8222,7 +8403,7 @@ <comment xml:lang="pt">arquivo Lrzip</comment> <comment xml:lang="pt_BR">Pacote Lrzip</comment> <comment xml:lang="ro">Arhivă Lrzip</comment> - <comment xml:lang="ru">архив LRZIP</comment> + <comment xml:lang="ru">Архив LRZIP</comment> <comment xml:lang="sk">Archív Lrzip</comment> <comment xml:lang="sl">Datoteka arhiva Lrzip</comment> <comment xml:lang="sr">Лрзип архива</comment> @@ -8255,7 +8436,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le lrzip)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con lrzip)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י lrzip)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana lrzip-om)</comment> + <comment xml:lang="hr">Tar arhiva (lrzip sažeta)</comment> <comment xml:lang="hu">Tar archívum (lrzip-pel tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con lrzip)</comment> <comment xml:lang="id">Arsip Tar (terkompresi lrzip)</comment> @@ -8271,14 +8452,14 @@ <comment xml:lang="pt">arquivo Tar (compressão Lrzip)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com lrzip)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată lrzip)</comment> - <comment xml:lang="ru">архив TAR (сжатый LRZIP)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lrzip)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou lrzip)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z lrzip)</comment> <comment xml:lang="sr">Тар архива (запакована лрзипом)</comment> <comment xml:lang="sv">Tar-arkiv (lrzip-komprimerat)</comment> <comment xml:lang="tr">Tar arşivi (lrzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений lrzip)</comment> - <comment xml:lang="zh_CN">Tar 归档文件 (lrzip 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（lrzip 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (lrzip 格式壓縮)</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="application/x-lrzip"/> @@ -8287,6 +8468,7 @@ </mime-type> <mime-type type="application/x-apple-diskimage"> <comment>Apple disk image</comment> + <comment xml:lang="ast">Imaxe de discu d'Apple</comment> <comment xml:lang="bg">Диск — Apple</comment> <comment xml:lang="ca">imatge de disc d'Apple</comment> <comment xml:lang="cs">obraz disku Apple</comment> @@ -8298,9 +8480,10 @@ <comment xml:lang="eu">Apple disko irudia</comment> <comment xml:lang="fi">Apple-levytiedosto</comment> <comment xml:lang="fr">image disque Apple</comment> + <comment xml:lang="ga">íomhá diosca Apple</comment> <comment xml:lang="gl">imaxe de disco de Appl</comment> <comment xml:lang="he">תמונת כונן Apple</comment> - <comment xml:lang="hr">Apple snimka diska</comment> + <comment xml:lang="hr">Apple slika diska</comment> <comment xml:lang="hu">Apple lemezkép</comment> <comment xml:lang="ia">Imagine de disco Apple</comment> <comment xml:lang="id">Image disk Apple</comment> @@ -8315,95 +8498,107 @@ <comment xml:lang="pl">Obraz dysku Apple</comment> <comment xml:lang="pt">imagem de disco Apple</comment> <comment xml:lang="pt_BR">Imagem de disco Apple</comment> - <comment xml:lang="ru">образ диска Apple Mac OS X</comment> + <comment xml:lang="ru">Образ диска Apple Mac OS X</comment> <comment xml:lang="sk">Obraz disku Apple</comment> <comment xml:lang="sl">Odtis diska Apple</comment> - <comment xml:lang="sr">Еплова слика диска</comment> + <comment xml:lang="sr">Еплов одраз диска</comment> <comment xml:lang="sv">Apple-diskavbild</comment> <comment xml:lang="tr">Apple disk görüntüsü</comment> <comment xml:lang="uk">образ диска Apple</comment> - <comment xml:lang="zh_CN">Apple 磁盘镜像</comment> - <comment xml:lang="zh_TW">Apple 磁碟映像</comment> + <comment xml:lang="zh_CN">Apple 磁盘映像</comment> + <comment xml:lang="zh_TW">Apple 磁碟映像檔</comment> <glob pattern="*.dmg"/> </mime-type> <mime-type type="application/x-raw-disk-image"> - <comment>Raw disk image</comment> - <comment xml:lang="ca">imatge de disc RAW</comment> - <comment xml:lang="cs">surový obraz disku</comment> - <comment xml:lang="da">Rå diskaftryk</comment> - <comment xml:lang="de">Rohes Datenträgerabbild</comment> - <comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου</comment> - <comment xml:lang="en_GB">Raw disk image</comment> - <comment xml:lang="es">imagen de disco en bruto</comment> - <comment xml:lang="eu">Disko gordinaren irudia</comment> - <comment xml:lang="fi">Raaka levytiedosto</comment> - <comment xml:lang="fr">image disque Raw</comment> - <comment xml:lang="gl">Imaxe de disco en bruto</comment> - <comment xml:lang="he">דמות גולמית של כונן</comment> - <comment xml:lang="hr">Osnovna slika diska</comment> - <comment xml:lang="hu">Nyers lemezkép</comment> - <comment xml:lang="ia">Imagine de disco crude</comment> - <comment xml:lang="id">Image disk mentah</comment> - <comment xml:lang="it">Immagine disco raw</comment> - <comment xml:lang="kk">Шикі диск бейнесі</comment> - <comment xml:lang="ko">RAW 디스크 이미지</comment> - <comment xml:lang="oc">imatge disc Raw</comment> - <comment xml:lang="pl">Surowy obraz dysku</comment> - <comment xml:lang="pt">imagem de disco Raw</comment> - <comment xml:lang="pt_BR">Imagem bruta de disco</comment> - <comment xml:lang="ru">необработанный образ диска</comment> - <comment xml:lang="sk">Obraz disku</comment> - <comment xml:lang="sl">Surovi odtis diska</comment> - <comment xml:lang="sr">сирова слика диска</comment> - <comment xml:lang="sv">Rå diskavbild</comment> - <comment xml:lang="tr">İşlem görmemiş disk imajı</comment> - <comment xml:lang="uk">простий образ диска</comment> - <comment xml:lang="zh_CN">原始磁盘镜像</comment> - <comment xml:lang="zh_TW">原生磁碟映像</comment> - <glob pattern="*.raw-disk-image"/> - <glob pattern="*.img"/> - </mime-type> - <mime-type type="application/x-raw-disk-image-xz-compressed"> - <comment>Raw disk image (XZ-compressed)</comment> - <comment xml:lang="ca">imatge de disc RAW (amb compressió XZ)</comment> - <comment xml:lang="cs">surový obraz disku (komprimovaný pomocí XZ)</comment> - <comment xml:lang="da">Rå diskaftryk (XZ-komprimeret)</comment> - <comment xml:lang="de">Rohes Datenträgerabbild (XZ-komprimiert)</comment> - <comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου (συμπιεσμένη XZ)</comment> - <comment xml:lang="en_GB">Raw disk image (XZ-compressed)</comment> - <comment xml:lang="es">imagen de disco en bruto (comprimida con XZ)</comment> - <comment xml:lang="eu">Disko gordinaren irudia (XZ-rekin konprimitua)</comment> - <comment xml:lang="fi">Raaka levytiedosto (XZ-pakattu)</comment> - <comment xml:lang="fr">image disque Raw (compression XZ)</comment> - <comment xml:lang="gl">Imaxe de disco en bruto (comprimida en XZ)</comment> - <comment xml:lang="he">דמות גולמית של כונן (בדחיסת XZ)</comment> - <comment xml:lang="hr">Osnovna slika diska (XZ sažeta)</comment> - <comment xml:lang="hu">Nyers lemezkép (XZ-vel tömörítve)</comment> - <comment xml:lang="ia">Imagine de disco crude (comprimite con XZ)</comment> - <comment xml:lang="id">Image disk mentah (terkompresi XZ)</comment> - <comment xml:lang="it">Immagine disco raw (compressa XZ)</comment> - <comment xml:lang="kk">Шикі диск бейнесі (XZ-мен сығылған)</comment> - <comment xml:lang="ko">RAW 디스크 이미지(XZ 압축)</comment> - <comment xml:lang="oc">imatge disc Raw (compression XZ)</comment> - <comment xml:lang="pl">Surowy obraz dysku (kompresja XZ)</comment> - <comment xml:lang="pt">imagem de disco Raw (compressão XZ)</comment> - <comment xml:lang="pt_BR">Imagem bruta de disco (compactada com XZ)</comment> - <comment xml:lang="ru">необработанный образ диска (XZ-сжатый)</comment> - <comment xml:lang="sk">Obraz disku (komprimovaný pomocou XZ)</comment> - <comment xml:lang="sl">Surovi odtis diska (stisnjeno z XZ)</comment> - <comment xml:lang="sr">сирова слика диска (запакована ИксЗ-ом)</comment> - <comment xml:lang="sv">Rå diskavbild (XZ-komprimerad)</comment> - <comment xml:lang="tr">İşlem görmemiş disk imajı (XZ ile sıkıştırılmış)</comment> - <comment xml:lang="uk">простий образ диска (стиснений XZ)</comment> - <comment xml:lang="zh_CN">原始磁盘镜像(XZ 压缩)</comment> - <comment xml:lang="zh_TW">原生磁碟映像 (XZ 格式壓縮)</comment> - <sub-class-of type="application/x-xz"/> - <glob pattern="*.raw-disk-image.xz"/> - <glob pattern="*.img.xz"/> - </mime-type> + <comment>Raw disk image</comment> + <comment xml:lang="ast">Imaxe de discu en bruto</comment> + <comment xml:lang="ca">imatge de disc RAW</comment> + <comment xml:lang="cs">surový obraz disku</comment> + <comment xml:lang="da">Rå diskaftryk</comment> + <comment xml:lang="de">Rohes Datenträgerabbild</comment> + <comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου</comment> + <comment xml:lang="en_GB">Raw disk image</comment> + <comment xml:lang="es">imagen de disco en bruto</comment> + <comment xml:lang="eu">Disko gordinaren irudia</comment> + <comment xml:lang="fi">Raaka levytiedosto</comment> + <comment xml:lang="fr">image disque Raw</comment> + <comment xml:lang="ga">Amhíomha diosca</comment> + <comment xml:lang="gl">Imaxe de disco en bruto</comment> + <comment xml:lang="he">דמות גולמית של כונן</comment> + <comment xml:lang="hr">Osnovna slika diska</comment> + <comment xml:lang="hu">Nyers lemezkép</comment> + <comment xml:lang="ia">Imagine de disco crude</comment> + <comment xml:lang="id">Image disk mentah</comment> + <comment xml:lang="it">Immagine disco raw</comment> + <comment xml:lang="kk">Шикі диск бейнесі</comment> + <comment xml:lang="ko">RAW 디스크 이미지</comment> + <comment xml:lang="oc">imatge disc Raw</comment> + <comment xml:lang="pl">Surowy obraz dysku</comment> + <comment xml:lang="pt">imagem de disco Raw</comment> + <comment xml:lang="pt_BR">Imagem bruta de disco</comment> + <comment xml:lang="ru">Необработанный образ диска</comment> + <comment xml:lang="sk">Obraz disku</comment> + <comment xml:lang="sl">Surovi odtis diska</comment> + <comment xml:lang="sr">сиров одраз диска</comment> + <comment xml:lang="sv">Rå diskavbild</comment> + <comment xml:lang="tr">İşlem görmemiş disk imajı</comment> + <comment xml:lang="uk">простий образ диска</comment> + <comment xml:lang="zh_CN">原始磁盘映像</comment> + <comment xml:lang="zh_TW">原生磁碟映像檔</comment> + <glob pattern="*.raw-disk-image"/> + <glob pattern="*.img"/> + </mime-type> + <mime-type type="application/x-raw-floppy-disk-image"> + <comment>Floppy disk image</comment> + <sub-class-of type="application/x-raw-disk-image"/> + <alias type="application/x-fd-file"/> + <glob pattern="*.fd"/> + <glob pattern="*.qd"/> + </mime-type> + <mime-type type="application/x-raw-disk-image-xz-compressed"> + <comment>Raw disk image (XZ-compressed)</comment> + <comment xml:lang="ast">Imaxe de discu en bruto (comprimida en XZ)</comment> + <comment xml:lang="ca">imatge de disc RAW (amb compressió XZ)</comment> + <comment xml:lang="cs">surový obraz disku (komprimovaný pomocí XZ)</comment> + <comment xml:lang="da">Rå diskaftryk (XZ-komprimeret)</comment> + <comment xml:lang="de">Rohes Datenträgerabbild (XZ-komprimiert)</comment> + <comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου (συμπιεσμένη XZ)</comment> + <comment xml:lang="en_GB">Raw disk image (XZ-compressed)</comment> + <comment xml:lang="es">imagen de disco en bruto (comprimida con XZ)</comment> + <comment xml:lang="eu">Disko gordinaren irudia (XZ-rekin konprimitua)</comment> + <comment xml:lang="fi">Raaka levytiedosto (XZ-pakattu)</comment> + <comment xml:lang="fr">image disque Raw (compression XZ)</comment> + <comment xml:lang="ga">Amhíomhá (comhbhrúite le XZ)</comment> + <comment xml:lang="gl">Imaxe de disco en bruto (comprimida en XZ)</comment> + <comment xml:lang="he">דמות גולמית של כונן (בדחיסת XZ)</comment> + <comment xml:lang="hr">Osnovna slika diska (XZ sažeta)</comment> + <comment xml:lang="hu">Nyers lemezkép (XZ-vel tömörítve)</comment> + <comment xml:lang="ia">Imagine de disco crude (comprimite con XZ)</comment> + <comment xml:lang="id">Image disk mentah (terkompresi XZ)</comment> + <comment xml:lang="it">Immagine disco raw (compressa XZ)</comment> + <comment xml:lang="kk">Шикі диск бейнесі (XZ-мен сығылған)</comment> + <comment xml:lang="ko">RAW 디스크 이미지(XZ 압축)</comment> + <comment xml:lang="oc">imatge disc Raw (compression XZ)</comment> + <comment xml:lang="pl">Surowy obraz dysku (kompresja XZ)</comment> + <comment xml:lang="pt">imagem de disco Raw (compressão XZ)</comment> + <comment xml:lang="pt_BR">Imagem bruta de disco (compactada com XZ)</comment> + <comment xml:lang="ru">Необработанный образ диска (сжатый xz)</comment> + <comment xml:lang="sk">Obraz disku (komprimovaný pomocou XZ)</comment> + <comment xml:lang="sl">Surovi odtis diska (stisnjeno z XZ)</comment> + <comment xml:lang="sr">сиров одраз диска (запакована ИксЗ-ом)</comment> + <comment xml:lang="sv">Rå diskavbild (XZ-komprimerad)</comment> + <comment xml:lang="tr">İşlem görmemiş disk imajı (XZ ile sıkıştırılmış)</comment> + <comment xml:lang="uk">простий образ диска (стиснений XZ)</comment> + <comment xml:lang="zh_CN">原始磁盘映像（XZ 压缩）</comment> + <comment xml:lang="zh_TW">原生磁碟映像 (XZ 格式壓縮)</comment> + <sub-class-of type="application/x-xz"/> + <glob pattern="*.raw-disk-image.xz"/> + <glob pattern="*.img.xz"/> + </mime-type> <mime-type type="application/x-cd-image"> <comment>raw CD image</comment> <comment xml:lang="ar">صورة CD خامة</comment> + <comment xml:lang="ast">imaxe de CD en bruto</comment> <comment xml:lang="be@latin">suvoraja vyjava CD</comment> <comment xml:lang="bg">Изображение — raw CD</comment> <comment xml:lang="ca">imatge de CD en cru</comment> @@ -8440,17 +8635,17 @@ <comment xml:lang="pt">imagem em bruto de CD</comment> <comment xml:lang="pt_BR">Imagem bruta de CD</comment> <comment xml:lang="ro">imagine de CD brută</comment> - <comment xml:lang="ru">необработанный образ компакт-диска</comment> + <comment xml:lang="ru">Необработанный образ компакт-диска</comment> <comment xml:lang="sk">Surový obraz CD</comment> <comment xml:lang="sl">surovi CD odtis</comment> <comment xml:lang="sq">Imazh raw CD</comment> - <comment xml:lang="sr">сирова слика ЦД-а</comment> + <comment xml:lang="sr">сиров одраз ЦД-а</comment> <comment xml:lang="sv">rå cd-avbild</comment> <comment xml:lang="tr">Ham CD görüntüsü</comment> <comment xml:lang="uk">образ raw CD</comment> <comment xml:lang="vi">ảnh đĩa CD thô</comment> <comment xml:lang="zh_CN">原始 CD 映像</comment> - <comment xml:lang="zh_TW">原生 CD 映像</comment> + <comment xml:lang="zh_TW">原生 CD 映像檔</comment> <sub-class-of type="application/x-raw-disk-image"/> <alias type="application/x-iso9660-image"/> @@ -8460,20 +8655,31 @@ <mime-type type="application/x-iso9660-appimage"> <comment>AppImage application bundle</comment> <comment xml:lang="ca">paquet d'aplicació AppImage</comment> + <comment xml:lang="cs">balíček AppImage s aplikací</comment> <comment xml:lang="da">Applmage-programsamling</comment> <comment xml:lang="de">AppImage-Anwendungspaket</comment> + <comment xml:lang="en_GB">AppImage application bundle</comment> <comment xml:lang="es">paquete de aplicación AppImage</comment> + <comment xml:lang="eu">AppImage aplikazio bilduma</comment> + <comment xml:lang="fi">AppImage-sovelluspaketti</comment> <comment xml:lang="fr">lot applicatif AppImage</comment> + <comment xml:lang="ga">burla feidhmchláir AppImage</comment> <comment xml:lang="he">חבילת יישומי AppImage</comment> + <comment xml:lang="hr">AppImage paket aplikacije</comment> <comment xml:lang="hu">AppImage alkalmazáscsomag</comment> + <comment xml:lang="id">bundel aplikasi AppImage</comment> + <comment xml:lang="it">Bundle applicazione AppImage</comment> <comment xml:lang="kk">AppImage қолданбалар дестесі</comment> <comment xml:lang="ko">AppImage 프로그램 번들</comment> <comment xml:lang="pl">Pakiet programu AppImage</comment> <comment xml:lang="pt_BR">Pacote de aplicativo AppImage</comment> - <comment xml:lang="ru">пакет приложений AppImage</comment> + <comment xml:lang="ru">Пакет приложения AppImage</comment> <comment xml:lang="sk">Balík aplikácií AppImage</comment> + <comment xml:lang="sr">скуп програма Ап-слике</comment> + <comment xml:lang="sv">AppImage-programbunt</comment> + <comment xml:lang="tr">AppImage uygulama paketi</comment> <comment xml:lang="uk">пакунок із програмами AppImage</comment> - <comment xml:lang="zh_CN">AppImage 应用包</comment> + <comment xml:lang="zh_CN">AppImage 应用组合包</comment> <comment xml:lang="zh_TW">AppImage 應用程式套組</comment> <sub-class-of type="application/x-executable"/> <sub-class-of type="application/x-iso9660-image"/> @@ -8488,7 +8694,6 @@ </match> </magic> <glob pattern="*.appimage"/> - <glob pattern="*.AppImage"/> </mime-type> <mime-type type="application/x-cdrdao-toc"> <comment>CD Table Of Contents</comment> @@ -8527,7 +8732,7 @@ <comment xml:lang="pt">Tabela de conteúdos de CD</comment> <comment xml:lang="pt_BR">Sumário de CD</comment> <comment xml:lang="ro">Tabel conținut CD</comment> - <comment xml:lang="ru">таблица содержания CD</comment> + <comment xml:lang="ru">Таблица содержания CD</comment> <comment xml:lang="sk">Obsah CD</comment> <comment xml:lang="sl">Kazalo vsebine CD nosilca</comment> <comment xml:lang="sq">Tregues CD</comment> @@ -8588,7 +8793,7 @@ <comment xml:lang="pt">notação de jogo de xadrez PGN</comment> <comment xml:lang="pt_BR">Notação de jogo de xadrez PGN</comment> <comment xml:lang="ro">Notație joc șah PGN</comment> - <comment xml:lang="ru">шахматная партия PGN</comment> + <comment xml:lang="ru">Шахматная партия PGN</comment> <comment xml:lang="sk">Šachová notácia PGN</comment> <comment xml:lang="sl">Datoteka opomb šahovske igre PGN</comment> <comment xml:lang="sq">Njoftim loje shahu PGN</comment> @@ -8612,6 +8817,7 @@ <mime-type type="application/vnd.ms-htmlhelp"> <comment>CHM document</comment> <comment xml:lang="ar">مستند CHM</comment> + <comment xml:lang="ast">Documentu CHM</comment> <comment xml:lang="be@latin">Dakument CHM</comment> <comment xml:lang="bg">Документ — CHM</comment> <comment xml:lang="ca">document CHM</comment> @@ -8648,7 +8854,7 @@ <comment xml:lang="pt">documento CHM</comment> <comment xml:lang="pt_BR">Documento CHM</comment> <comment xml:lang="ro">Document CHM</comment> - <comment xml:lang="ru">документ CHM</comment> + <comment xml:lang="ru">Документ CHM</comment> <comment xml:lang="sk">Dokument CHM</comment> <comment xml:lang="sl">Dokument CHM</comment> <comment xml:lang="sq">Dokument CHM</comment> @@ -8706,7 +8912,7 @@ <comment xml:lang="pt">byte-code Java</comment> <comment xml:lang="pt_BR">Código compilado Java</comment> <comment xml:lang="ro">Bytecode Java</comment> - <comment xml:lang="ru">байт-код Java</comment> + <comment xml:lang="ru">Байт-код Java</comment> <comment xml:lang="sk">Bajtový kód Java</comment> <comment xml:lang="sl">Datoteka bitne kode Java</comment> <comment xml:lang="sq">Byte code Java</comment> @@ -8738,7 +8944,7 @@ <comment xml:lang="ga">comhad UNIX-comhbhrúite</comment> <comment xml:lang="gl">ficheiro comprimido de UNIX</comment> <comment xml:lang="he">קובץ בכיווץ UNIX</comment> - <comment xml:lang="hr">UNIX-komprimirana datoteka</comment> + <comment xml:lang="hr">UNIX sažeta datoteka</comment> <comment xml:lang="hu">Tömörített UNIX-fájl</comment> <comment xml:lang="ia">File comprimite de UNIX</comment> <comment xml:lang="id">Berkas terkompresi UNIX</comment> @@ -8757,7 +8963,7 @@ <comment xml:lang="pt">ficheiro comprimido UNIX</comment> <comment xml:lang="pt_BR">Arquivo compactado do UNIX</comment> <comment xml:lang="ro">Fișier comprimat UNIX</comment> - <comment xml:lang="ru">файл (UNIX-сжатый)</comment> + <comment xml:lang="ru">Файл (UNIX-сжатый)</comment> <comment xml:lang="sk">Súbor komprimovaný v Unixe</comment> <comment xml:lang="sl">Skrčena Unix datoteka</comment> <comment xml:lang="sq">File i kompresuar UNIX</comment> @@ -8793,7 +8999,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le gzip)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con gzip)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana gzip-om)</comment> + <comment xml:lang="hr">Tar arhiva (gzip sažeta)</comment> <comment xml:lang="hu">Tar archívum (gzip-pel tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con gzip)</comment> <comment xml:lang="id">Arsip Tar (terkompresi gzip)</comment> @@ -8811,7 +9017,7 @@ <comment xml:lang="pt">arquivo Tar (compressão gzip)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com gzip)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată gzip)</comment> - <comment xml:lang="ru">архив TAR (сжатый GZIP)</comment> + <comment xml:lang="ru">Архив TAR (сжатый gzip)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z gzip)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar me gzip)</comment> @@ -8820,7 +9026,7 @@ <comment xml:lang="tr">Tar arşivi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений gzip)</comment> <comment xml:lang="vi">Kho nén tar (đã nén gzip)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(gzip 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（gzip 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="package-x-generic"/> @@ -8844,7 +9050,7 @@ <comment xml:lang="fi">ohjelman kaatumistiedot</comment> <comment xml:lang="fo">forrits sordáta</comment> <comment xml:lang="fr">données de plantage de programme</comment> - <comment xml:lang="ga">sonraí thuairt ríomhchláir</comment> + <comment xml:lang="ga">sonraí tuairte ríomhchláir</comment> <comment xml:lang="gl">datos de colgue do programa</comment> <comment xml:lang="he">מידע מקריסת תכנית</comment> <comment xml:lang="hr">podaci o rušenju programa</comment> @@ -8866,7 +9072,7 @@ <comment xml:lang="pt">dados de rebentamento de aplicação</comment> <comment xml:lang="pt_BR">Dados de travamento de programa</comment> <comment xml:lang="ro">date eroare program</comment> - <comment xml:lang="ru">данные аварийного завершения</comment> + <comment xml:lang="ru">Данные аварийного завершения программы</comment> <comment xml:lang="sk">Údaje o páde programu</comment> <comment xml:lang="sl">podatki sesutja programa</comment> <comment xml:lang="sq">Të dhëna nga programi i bllokuar</comment> @@ -8897,6 +9103,7 @@ <mime-type type="application/x-cpio"> <comment>CPIO archive</comment> <comment xml:lang="ar">أرشيف CPIO</comment> + <comment xml:lang="ast">Archivu CPIO</comment> <comment xml:lang="az">CPIO arxivi</comment> <comment xml:lang="be@latin">Archiŭ CPIO</comment> <comment xml:lang="bg">Архив — CPIO</comment> @@ -8936,7 +9143,7 @@ <comment xml:lang="pt">arquivo CPIO</comment> <comment xml:lang="pt_BR">Pacote CPIO</comment> <comment xml:lang="ro">Arhivă CPIO</comment> - <comment xml:lang="ru">архив CPIO</comment> + <comment xml:lang="ru">Архив CPIO</comment> <comment xml:lang="sk">Archív CPIO</comment> <comment xml:lang="sl">Datoteka arhiva CPIO</comment> <comment xml:lang="sq">Arkiv CPIO</comment> @@ -8978,7 +9185,7 @@ <comment xml:lang="ga">cartlann CPIO (comhbhrúite le gzip)</comment> <comment xml:lang="gl">arquivo CPIO (comprimido con gzip)</comment> <comment xml:lang="he">ארכיון CPIO (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">CPIO arhiva (komprimirana gzip-om)</comment> + <comment xml:lang="hr">CPIO arhiva (gzip sažeta)</comment> <comment xml:lang="hu">CPIO-archívum (gzip-pel tömörítve)</comment> <comment xml:lang="ia">Archivo CPIO (comprimite con gzip)</comment> <comment xml:lang="id">Arsip CPIO (terkompresi gzip)</comment> @@ -8998,7 +9205,7 @@ <comment xml:lang="pt">arquivo CPIO (compressão gzip)</comment> <comment xml:lang="pt_BR">Pacote CPIO (compactado com gzip)</comment> <comment xml:lang="ro">Arhivă CPIO (compresie gzip)</comment> - <comment xml:lang="ru">архив CPIO (сжатый GZIP)</comment> + <comment xml:lang="ru">Архив CPIO (сжатый gzip)</comment> <comment xml:lang="sk">Archív CPIO (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Datoteka arhiva CPIO (skrčena z gzip)</comment> <comment xml:lang="sq">Arkiv CPIO (kompresuar me gzip)</comment> @@ -9007,7 +9214,7 @@ <comment xml:lang="tr">CPIO arşivi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів CPIO (стиснений gzip)</comment> <comment xml:lang="vi">Kho nén CPIO (đã nén gzip)</comment> - <comment xml:lang="zh_CN">CPIO 归档文件(gzip 压缩)</comment> + <comment xml:lang="zh_CN">CPIO 归档文件（gzip 压缩）</comment> <comment xml:lang="zh_TW">CPIO 封存檔 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="package-x-generic"/> @@ -9019,7 +9226,7 @@ <comment xml:lang="az">C qabıq skripti</comment> <comment xml:lang="be@latin">Skrypt abałonki C</comment> <comment xml:lang="bg">Скрипт — обвивка C</comment> - <comment xml:lang="ca">script de C shell</comment> + <comment xml:lang="ca">script C shell</comment> <comment xml:lang="cs">skript shellu C</comment> <comment xml:lang="cy">Sgript plisgyn C</comment> <comment xml:lang="da">C-skalprogram</comment> @@ -9032,10 +9239,10 @@ <comment xml:lang="fi">Csh-komentotiedosto</comment> <comment xml:lang="fo">C skel boðrøð</comment> <comment xml:lang="fr">script C shell</comment> - <comment xml:lang="ga">script bhlaosc C</comment> + <comment xml:lang="ga">script bhlaoisce C</comment> <comment xml:lang="gl">script de C shell</comment> <comment xml:lang="he">תסריט מעטפת C</comment> - <comment xml:lang="hr">C skripta</comment> + <comment xml:lang="hr">C skripta ljuske</comment> <comment xml:lang="hu">C héj-parancsfájl</comment> <comment xml:lang="ia">Script C-shell</comment> <comment xml:lang="id">Skrip shell C</comment> @@ -9054,11 +9261,11 @@ <comment xml:lang="pt">script de terminal C</comment> <comment xml:lang="pt_BR">Script de shell C</comment> <comment xml:lang="ro">Script C shell</comment> - <comment xml:lang="ru">сценарий C shell</comment> + <comment xml:lang="ru">Сценарий C shell</comment> <comment xml:lang="sk">Skript shellu C</comment> <comment xml:lang="sl">Skriptna datoteka lupine C</comment> <comment xml:lang="sq">Script shell C</comment> - <comment xml:lang="sr">скрипта Ц љуске</comment> + <comment xml:lang="sr">скрипта Ц шкољке</comment> <comment xml:lang="sv">Skalskript (csh)</comment> <comment xml:lang="tr">C kabuk betiği</comment> <comment xml:lang="uk">скрипт оболонки C</comment> @@ -9079,6 +9286,7 @@ <mime-type type="application/x-dbf"> <comment>Xbase document</comment> <comment xml:lang="ar">مستند Xbase</comment> + <comment xml:lang="ast">Documentu Xbase</comment> <comment xml:lang="be@latin">Dakument Xbase</comment> <comment xml:lang="bg">Документ — Xbase</comment> <comment xml:lang="ca">document Xbase</comment> @@ -9114,7 +9322,7 @@ <comment xml:lang="pt">documento Xbase</comment> <comment xml:lang="pt_BR">Documento do Xbase</comment> <comment xml:lang="ro">Document Xbase</comment> - <comment xml:lang="ru">документ Xbase</comment> + <comment xml:lang="ru">Документ Xbase</comment> <comment xml:lang="sk">Dokument Xbase</comment> <comment xml:lang="sl">Dokument Xbase</comment> <comment xml:lang="sq">Dokument Xbase</comment> @@ -9169,7 +9377,7 @@ <comment xml:lang="pt">programa ECMAScript</comment> <comment xml:lang="pt_BR">Programa ECMAScript</comment> <comment xml:lang="ro">Program ECMAScript</comment> - <comment xml:lang="ru">программа ECMAScript</comment> + <comment xml:lang="ru">Программа ECMAScript</comment> <comment xml:lang="sk">Program ECMAScript</comment> <comment xml:lang="sl">Programska datoteka ECMAScript</comment> <comment xml:lang="sq">Program ECMAScript</comment> @@ -9181,6 +9389,7 @@ <comment xml:lang="zh_CN">ECMAScript 程序</comment> <comment xml:lang="zh_TW">ECMAScript 程式</comment> <alias type="text/ecmascript"/> + <sub-class-of type='application/x-executable'/> <sub-class-of type="text/plain"/> <generic-icon name="text-x-script"/> <glob pattern="*.es"/> @@ -9188,22 +9397,33 @@ <mime-type type="application/x-sega-cd-rom"> <comment>Sega CD disc image</comment> + <comment xml:lang="ast">Imaxe de discu de Sega CD</comment> <comment xml:lang="ca">imatge de disc de Sega CD</comment> + <comment xml:lang="cs">obraz disku CD pro Sega</comment> <comment xml:lang="da">Sega CD-diskaftryk</comment> <comment xml:lang="de">Sega-CD-Datenträgerabbild</comment> + <comment xml:lang="en_GB">Sega CD disc image</comment> <comment xml:lang="es">imagen de disco CD de Sega</comment> + <comment xml:lang="eu">Sega CD disko irudia</comment> <comment xml:lang="fi">Sega CD -levykuva</comment> <comment xml:lang="fr">image disque Sega CD</comment> + <comment xml:lang="ga">íomhá dlúthdhiosca Sega</comment> <comment xml:lang="he">דמות כונן Sega CD</comment> + <comment xml:lang="hr">Sega CD slika diska</comment> <comment xml:lang="hu">Sega CD-lemezkép</comment> + <comment xml:lang="id">image cakram CD Sega</comment> + <comment xml:lang="it">Immagine disco Sega Mega CD</comment> <comment xml:lang="kk">Sega CD диск бейнесі</comment> <comment xml:lang="ko">세가 CD 디스크 이미지</comment> <comment xml:lang="pl">Obraz płyty konsoli Mega-CD</comment> <comment xml:lang="pt_BR">Imagem de disco Sega CD</comment> - <comment xml:lang="ru">образ диска CD Sega</comment> + <comment xml:lang="ru">Образ диска CD Sega</comment> <comment xml:lang="sk">Obraz disku CD Sega</comment> + <comment xml:lang="sr">одраз диска Сега ЦД-а</comment> + <comment xml:lang="sv">Mega-CD-skivavbild</comment> + <comment xml:lang="tr">Sega CD disk kalıbı</comment> <comment xml:lang="uk">образ диска Sega CD</comment> - <comment xml:lang="zh_CN">Sega CD 光盘镜像</comment> + <comment xml:lang="zh_CN">Sega CD 光盘映像</comment> <comment xml:lang="zh_TW">Sega CD 光碟映像檔</comment> <generic-icon name="application-x-executable"/> @@ -9221,6 +9441,32 @@ <mime-type type="application/x-sega-pico-rom"> <comment>Sega Pico ROM</comment> + <comment xml:lang="ast">ROM de Sega Pico</comment> + <comment xml:lang="ca">ROM de Sega Pico</comment> + <comment xml:lang="cs">ROM pro Sega Pico</comment> + <comment xml:lang="de">Sega Pico ROM</comment> + <comment xml:lang="en_GB">Sega Pico ROM</comment> + <comment xml:lang="es">ROM de Sega Pico</comment> + <comment xml:lang="eu">Sega Pico ROM</comment> + <comment xml:lang="fi">Sega Pico ROM</comment> + <comment xml:lang="fr">ROM Sega Pico</comment> + <comment xml:lang="ga">ROM Sega Pico</comment> + <comment xml:lang="hr">Sega Pico ROM</comment> + <comment xml:lang="hu">Sega Pico ROM</comment> + <comment xml:lang="id">ROM Sega Pico</comment> + <comment xml:lang="it">ROM Sega Pico</comment> + <comment xml:lang="kk">Sega Pico ROM</comment> + <comment xml:lang="ko">세카 피코 롬</comment> + <comment xml:lang="pl">Plik ROM konsoli Sega Pico</comment> + <comment xml:lang="pt_BR">ROM de Sega Pico</comment> + <comment xml:lang="ru">Sega Pico ROM</comment> + <comment xml:lang="sk">ROM pre Sega Pico</comment> + <comment xml:lang="sr">Сега Пико РОМ</comment> + <comment xml:lang="sv">Sega Pico-rom</comment> + <comment xml:lang="tr">Sega Pico ROM</comment> + <comment xml:lang="uk">ППП Sega Pico</comment> + <comment xml:lang="zh_CN">Sega Pico ROM</comment> + <comment xml:lang="zh_TW">Sega Pico ROM</comment> <generic-icon name="application-x-executable"/> <magic priority="50"> <match value="SEGA PICO" type="string" offset="256"/> @@ -9228,6 +9474,7 @@ </mime-type> <mime-type type="application/x-saturn-rom"> <comment>Sega Saturn disc image</comment> + <comment xml:lang="ast">Imaxe de discu de Sega Saturn</comment> <comment xml:lang="ca">imatge de disc de Sega Saturn</comment> <comment xml:lang="cs">obraz disku pro Sega Saturn</comment> <comment xml:lang="da">Sega Saturn-diskaftryk</comment> @@ -9238,6 +9485,7 @@ <comment xml:lang="eu">Sega Saturn disko irudia</comment> <comment xml:lang="fi">Sega Saturn -levykuva</comment> <comment xml:lang="fr">image disque Sega Saturn</comment> + <comment xml:lang="ga">íomhá diosca Sega Saturn</comment> <comment xml:lang="he">דמות כונן Sega Saturn</comment> <comment xml:lang="hr">Sega Saturn slika diska</comment> <comment xml:lang="hu">Sega Saturn lemezkép</comment> @@ -9250,13 +9498,13 @@ <comment xml:lang="pl">Obraz płyty konsoli Sega Saturn</comment> <comment xml:lang="pt">imagem de disco Sega Saturn</comment> <comment xml:lang="pt_BR">Imagem de disco do Sega Saturn</comment> - <comment xml:lang="ru">образ диска Sega Saturn</comment> + <comment xml:lang="ru">Образ диска Sega Saturn</comment> <comment xml:lang="sk">Obraz disku Sega Saturn</comment> - <comment xml:lang="sr">слика диска Сега Сатурна</comment> + <comment xml:lang="sr">одраз диска Сега Сатурна</comment> <comment xml:lang="sv">Sega Saturn-skivavbild</comment> <comment xml:lang="tr">Sega Saturn disk kalıbı</comment> <comment xml:lang="uk">образ диска Sega Saturn</comment> - <comment xml:lang="zh_CN">Sega Saturn 光盘镜像</comment> + <comment xml:lang="zh_CN">Sega Saturn 光盘映像</comment> <comment xml:lang="zh_TW">Sega Saturn 光碟映像檔</comment> <generic-icon name="application-x-executable"/> <magic priority="50"> @@ -9268,6 +9516,7 @@ </mime-type> <mime-type type="application/x-dc-rom"> <comment>Dreamcast GD-ROM</comment> + <comment xml:lang="ast">GD-ROM de Dreamcast</comment> <comment xml:lang="ca">GD-ROM de Dreamcast</comment> <comment xml:lang="cs">GD-ROM pro Dreamcast</comment> <comment xml:lang="da">Dreamcast GD-ROM</comment> @@ -9277,6 +9526,7 @@ <comment xml:lang="es">GD-ROM de Dreamcast</comment> <comment xml:lang="eu">Dreamcast GD-ROM</comment> <comment xml:lang="fr">GD-ROM Dreamcast</comment> + <comment xml:lang="ga">GD-ROM Dreamcast</comment> <comment xml:lang="he">Dreamcast GD-ROM</comment> <comment xml:lang="hr">Dreamcast GD-ROM</comment> <comment xml:lang="hu">Dreamcast GD-ROM</comment> @@ -9288,8 +9538,8 @@ <comment xml:lang="oc">GD-ROM Dreamcast</comment> <comment xml:lang="pl">Plik GD-ROM konsoli Dreamcast</comment> <comment xml:lang="pt">GD-ROM Dreamcast</comment> - <comment xml:lang="pt_BR">GD-ROM do Dreamcast</comment> - <comment xml:lang="ru">GD-ROM Dreamcast</comment> + <comment xml:lang="pt_BR">GD-ROM de Dreamcast</comment> + <comment xml:lang="ru">Dreamcast GD-ROM</comment> <comment xml:lang="sk">Dreamcast GD-ROM</comment> <comment xml:lang="sr">Дримкаст ГД-РОМ</comment> <comment xml:lang="sv">Dreamcast-gd-rom</comment> @@ -9303,6 +9553,7 @@ <mime-type type="application/x-nintendo-ds-rom"> <comment>Nintendo DS ROM</comment> <comment xml:lang="ar">Nintendo DS ROM</comment> + <comment xml:lang="ast">ROM de Nintendo DS</comment> <comment xml:lang="be@latin">Nintendo DS ROM</comment> <comment xml:lang="bg">ROM — Nintendo DS</comment> <comment xml:lang="ca">ROM de Nintendo DS</comment> @@ -9335,7 +9586,7 @@ <comment xml:lang="oc">ROM Nintendo DS</comment> <comment xml:lang="pl">Plik ROM konsoli Nintendo DS</comment> <comment xml:lang="pt">ROM Nintendo DS</comment> - <comment xml:lang="pt_BR">ROM do Nintendo DS</comment> + <comment xml:lang="pt_BR">ROM de Nintendo DS</comment> <comment xml:lang="ro">ROM Nintendo DS</comment> <comment xml:lang="ru">Nintendo DS ROM</comment> <comment xml:lang="sk">ROM pre Nintendo DS</comment> @@ -9346,13 +9597,14 @@ <comment xml:lang="tr">Nintendo DS ROM</comment> <comment xml:lang="uk">ППП Nintendo</comment> <comment xml:lang="vi">ROM DS Nintendo</comment> - <comment xml:lang="zh_CN">Nintendo DS ROM</comment> + <comment xml:lang="zh_CN">任天堂 DS ROM</comment> <comment xml:lang="zh_TW">任天堂 DS ROM</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.nds"/> </mime-type> <mime-type type="application/x-pc-engine-rom"> <comment>PC Engine ROM</comment> + <comment xml:lang="ast">ROM de PC Engine</comment> <comment xml:lang="ca">ROM de PC Engine</comment> <comment xml:lang="cs">ROM pro PC Engine</comment> <comment xml:lang="da">PC Engine ROM</comment> @@ -9363,6 +9615,7 @@ <comment xml:lang="eu">PC Engine ROM</comment> <comment xml:lang="fi">PC Engine ROM</comment> <comment xml:lang="fr">ROM PC Engine</comment> + <comment xml:lang="ga">ROM PC Engine</comment> <comment xml:lang="gl">ROM de máquina de PC</comment> <comment xml:lang="he">ROM של PC Engine</comment> <comment xml:lang="hr">PC Engine ROM</comment> @@ -9390,6 +9643,7 @@ </mime-type> <mime-type type="application/x-wii-rom"> <comment>Wii disc image</comment> + <comment xml:lang="ast">Imaxe de discu de Wii</comment> <comment xml:lang="ca">imatge de disc de Wii</comment> <comment xml:lang="cs">obraz disku pro Wii</comment> <comment xml:lang="da">Wii-diskaftryk</comment> @@ -9400,6 +9654,7 @@ <comment xml:lang="eu">Wii disko irudia</comment> <comment xml:lang="fi">Wii-levykuva</comment> <comment xml:lang="fr">image disque Wii</comment> + <comment xml:lang="ga">íomhá diosca Wii</comment> <comment xml:lang="gl">Imaxe de disco de Wii</comment> <comment xml:lang="he">דמות כונן Wii</comment> <comment xml:lang="hr">Wii slika diska</comment> @@ -9413,14 +9668,14 @@ <comment xml:lang="pl">Obraz płyty konsoli Wii</comment> <comment xml:lang="pt">imagem de disco Wii</comment> <comment xml:lang="pt_BR">Imagem de disco Wii</comment> - <comment xml:lang="ru">образ диска Wii</comment> + <comment xml:lang="ru">Образ диска Wii</comment> <comment xml:lang="sk">Obraz disku Wii</comment> <comment xml:lang="sl">Odtis diska Wii</comment> - <comment xml:lang="sr">слика диска Вии-ја</comment> + <comment xml:lang="sr">одраз диска Вии-ја</comment> <comment xml:lang="sv">Wii-skivavbild</comment> <comment xml:lang="tr">Wii disk görüntüsü</comment> <comment xml:lang="uk">образ диска Wii</comment> - <comment xml:lang="zh_CN">Wii光盘镜像</comment> + <comment xml:lang="zh_CN">Wii 光盘映像</comment> <comment xml:lang="zh_TW">Wii 光碟映像檔</comment> <alias type="application/x-wii-iso-image"/> <alias type="application/x-wbfs"/> @@ -9441,7 +9696,9 @@ <comment xml:lang="de">WiiWare-Paket</comment> <comment xml:lang="en_GB">WiiWare bundle</comment> <comment xml:lang="es">conjunto de WiiWare</comment> + <comment xml:lang="eu">WiiWare bilduma</comment> <comment xml:lang="fr">lot WiiWare</comment> + <comment xml:lang="ga">burla WiiWare</comment> <comment xml:lang="he">מאגד WiiWare</comment> <comment xml:lang="hr">WiiWare paket</comment> <comment xml:lang="hu">WiiWare csomag</comment> @@ -9454,13 +9711,13 @@ <comment xml:lang="pl">Pakiet WiiWare</comment> <comment xml:lang="pt">pacote WiiWare</comment> <comment xml:lang="pt_BR">Pacote WiiWare</comment> - <comment xml:lang="ru">пакет WiiWare</comment> + <comment xml:lang="ru">Пакет WiiWare</comment> <comment xml:lang="sk">Balík WiiWare</comment> <comment xml:lang="sr">ВииВер комплет</comment> <comment xml:lang="sv">WiiWare-paket</comment> <comment xml:lang="tr">WiiWare paketi</comment> <comment xml:lang="uk">пакет WiiWare</comment> - <comment xml:lang="zh_CN">WiiWare bundle</comment> + <comment xml:lang="zh_CN">WiiWare 捆绑包</comment> <comment xml:lang="zh_TW">WiiWare 綁包</comment> <generic-icon name="application-x-executable"/> <magic priority="50"> @@ -9482,6 +9739,7 @@ <comment xml:lang="eu">GameCube disko irudia</comment> <comment xml:lang="fi">GameCube-levykuva</comment> <comment xml:lang="fr">image disque GameCube</comment> + <comment xml:lang="ga">íomhá diosca GameCube</comment> <comment xml:lang="gl">Imae de disco de GameCube</comment> <comment xml:lang="he">דמות כונן GameCube</comment> <comment xml:lang="hr">GameCube slika diska</comment> @@ -9495,14 +9753,14 @@ <comment xml:lang="pl">Obraz płyty konsoli GameCube</comment> <comment xml:lang="pt">imagem de disco GameCube</comment> <comment xml:lang="pt_BR">Imagem de disco GameCube</comment> - <comment xml:lang="ru">образ диска GameCube</comment> + <comment xml:lang="ru">Образ диска GameCube</comment> <comment xml:lang="sk">Obraz disku GameCube</comment> <comment xml:lang="sl">Odtis diska GameCube</comment> - <comment xml:lang="sr">слика диска Гејм Коцке</comment> + <comment xml:lang="sr">одраз диска Гејм Коцке</comment> <comment xml:lang="sv">GameCube-skivavbild</comment> <comment xml:lang="tr">GameCube disk görüntüsü</comment> <comment xml:lang="uk">образ диска GameCube</comment> - <comment xml:lang="zh_CN">GameCube光盘镜像</comment> + <comment xml:lang="zh_CN">GameCube 光盘映像</comment> <comment xml:lang="zh_TW">GameCube 光碟映像檔</comment> <generic-icon name="application-x-executable"/> <alias type="application/x-gamecube-iso-image"/> @@ -9513,16 +9771,85 @@ </mime-type> <mime-type type="application/x-thomson-cartridge-memo7"> <comment>Thomson Mémo7 cartridge</comment> + <comment xml:lang="ca">cartutx Thomson Mémo7</comment> + <comment xml:lang="cs">Kazeta Thomson Mémo7</comment> + <comment xml:lang="de">Thomson-Mémo7-Steckmodul</comment> + <comment xml:lang="en_GB">Thomson Mémo7 cartridge</comment> + <comment xml:lang="es">cartucho Mémo7 de Thomson</comment> + <comment xml:lang="fr">cartouche Thomson Mémo7</comment> + <comment xml:lang="ga">cartús Thomson Mémo7</comment> + <comment xml:lang="hr">Thomson Mémo7 uložak</comment> + <comment xml:lang="hu">Thomson Mémo7 kazetta</comment> + <comment xml:lang="id">cartridge Thomson Mémo7</comment> + <comment xml:lang="it">Cartuccia Thomson Mémo7</comment> + <comment xml:lang="kk">Thomson Mémo7 картриджі</comment> + <comment xml:lang="ko">톰슨 메모7 카트릿지</comment> + <comment xml:lang="pl">Kartridż Thomson Mémo7</comment> + <comment xml:lang="pt_BR">Cartucho Thomson Mémo7</comment> + <comment xml:lang="ru">Картридж Thomson Mémo7</comment> + <comment xml:lang="sk">Kazeta Thomson Mémo7</comment> + <comment xml:lang="sr">Томсон Мемо7 кертриџ</comment> + <comment xml:lang="sv">Thomson Mémo7-spelkassett</comment> + <comment xml:lang="tr">Thomson Mémo7 kartuşu</comment> + <comment xml:lang="uk">картридж Thomson Mémo7</comment> + <comment xml:lang="zh_CN">Thomson Mémo7 卡带</comment> + <comment xml:lang="zh_TW">Thomson Mémo7 卡匣</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.m7"/> </mime-type> <mime-type type="application/x-thomson-cassette"> <comment>Thomson cassette</comment> + <comment xml:lang="ca">cinta de casset Thomson</comment> + <comment xml:lang="cs">Kazeta Thomson</comment> + <comment xml:lang="de">Thomson-Kassette</comment> + <comment xml:lang="en_GB">Thomson cassette</comment> + <comment xml:lang="es">casete de Thomson</comment> + <comment xml:lang="fr">cassette Thomson</comment> + <comment xml:lang="ga">caiséad Thomson</comment> + <comment xml:lang="hr">Thomson kaseta</comment> + <comment xml:lang="hu">Thomson kazetta</comment> + <comment xml:lang="id">kaset Thomson</comment> + <comment xml:lang="it">Cassetta Thomson</comment> + <comment xml:lang="kk">Thomson кассетасы</comment> + <comment xml:lang="ko">톰슨 카셋트</comment> + <comment xml:lang="pl">Kaseta Thomson</comment> + <comment xml:lang="pt_BR">Cassete Thomson</comment> + <comment xml:lang="ru">Кассета Thomson</comment> + <comment xml:lang="sk">Kazeta Thomson</comment> + <comment xml:lang="sr">Томсон касете</comment> + <comment xml:lang="sv">Thomson-kassett</comment> + <comment xml:lang="tr">Thomson kaset</comment> + <comment xml:lang="uk">касета Thomson</comment> + <comment xml:lang="zh_CN">Thomson 磁带</comment> + <comment xml:lang="zh_TW">Thomson 卡匣</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.k7"/> </mime-type> <mime-type type="application/x-hfe-floppy-image"> <comment>HFE floppy disk image</comment> + <comment xml:lang="ca">imatge de disquet HFE</comment> + <comment xml:lang="cs">Obraz diskety HFE</comment> + <comment xml:lang="de">HFE-Diskettenabbild</comment> + <comment xml:lang="en_GB">HFE floppy disk image</comment> + <comment xml:lang="es">imagen de disquete HFE</comment> + <comment xml:lang="fr">image disquette HFE</comment> + <comment xml:lang="ga">íomhá diosca fhlapaigh HFE</comment> + <comment xml:lang="hr">HFE slika diskete</comment> + <comment xml:lang="hu">HFE flopi lemezkép</comment> + <comment xml:lang="id">image disk floppy HFE</comment> + <comment xml:lang="it">Immagine disco floppy HFE</comment> + <comment xml:lang="kk">HFE иілгіш диск бейнесі</comment> + <comment xml:lang="ko">HFE 플로피 디스크 이미지</comment> + <comment xml:lang="pl">Obraz dyskietki HFE</comment> + <comment xml:lang="pt_BR">Imagem de disco flexível HFE</comment> + <comment xml:lang="ru">Образ гибкого диска HFE</comment> + <comment xml:lang="sk">Obraz pružného disku HFE</comment> + <comment xml:lang="sr">ХФЕ слика флопи диска</comment> + <comment xml:lang="sv">HFE-diskavbild</comment> + <comment xml:lang="tr">HFE disket kalıbı</comment> + <comment xml:lang="uk">образ дискети HFE</comment> + <comment xml:lang="zh_CN">HFE 软盘映像</comment> + <comment xml:lang="zh_TW">HFE 軟碟映像檔</comment> <acronym>HFE</acronym> <expanded-acronym>HxC Floppy Emulator</expanded-acronym> <generic-icon name="application-x-executable"/> @@ -9530,9 +9857,33 @@ <magic> <match value="HXCPICFE" type="string" offset="0"/> </magic> + <alias type="application/x-hfe-file"/> </mime-type> <mime-type type="application/x-thomson-sap-image"> <comment>SAP Thomson floppy disk image</comment> + <comment xml:lang="ca">imatge de disquet SAP Thomson</comment> + <comment xml:lang="cs">Obraz diskety SAP Thomson</comment> + <comment xml:lang="de">SAP-Thomson-Diskettenabbild</comment> + <comment xml:lang="en_GB">SAP Thomson floppy disk image</comment> + <comment xml:lang="es">imagen de disquete SAP de Thomson</comment> + <comment xml:lang="fr">image disquette SAP Thomson</comment> + <comment xml:lang="ga">íomhá diosca fhlapaigh SAP Thomson</comment> + <comment xml:lang="hr">SAP Thomson slika diskete</comment> + <comment xml:lang="hu">SAP Thomson flopi lemezkép</comment> + <comment xml:lang="id">image disk floppy SAP Thomson</comment> + <comment xml:lang="it">Immagine disco floppy Thomson SAP</comment> + <comment xml:lang="kk">SAP Thomson иілгіш диск бейнесі</comment> + <comment xml:lang="ko">SAP 톰슨 플로피 디스크 이미지</comment> + <comment xml:lang="pl">Obraz dyskietki SAP Thomson</comment> + <comment xml:lang="pt_BR">Imagem de disco flexível SAP Thomson</comment> + <comment xml:lang="ru">Образ гибкого диска SAP Thomson</comment> + <comment xml:lang="sk">Obraz pružného disku SAP Thomson</comment> + <comment xml:lang="sr">САП Томсон слика флопи диска</comment> + <comment xml:lang="sv">SAP Thomson-diskavbild</comment> + <comment xml:lang="tr">SAP Thomson disket kalıbı</comment> + <comment xml:lang="uk">образ дискети Thomson SAP</comment> + <comment xml:lang="zh_CN">SAP Thomson 软盘映像</comment> + <comment xml:lang="zh_TW">SAP Thomson 軟碟映像檔</comment> <acronym>SAP</acronym> <expanded-acronym>Système d'Archivage Pukall</expanded-acronym> <generic-icon name="application-x-executable"/> @@ -9540,6 +9891,7 @@ <magic> <match value="SYSTEME D'ARCHIVAGE PUKALL S.A.P. (c) Alexandre PUKALL Avril 1998" type="string" offset="1"/> </magic> + <alias type="application/x-sap-file"/> </mime-type> <mime-type type="application/vnd.debian.binary-package"> <comment>Debian package</comment> @@ -9583,7 +9935,7 @@ <comment xml:lang="pt">pacote Debian</comment> <comment xml:lang="pt_BR">Pacote Debian</comment> <comment xml:lang="ro">Pachet Debian</comment> - <comment xml:lang="ru">пакет Debian</comment> + <comment xml:lang="ru">Пакет Debian</comment> <comment xml:lang="sk">Balíček Debianu</comment> <comment xml:lang="sl">Datoteka paketa Debian</comment> <comment xml:lang="sq">Paketë Debian</comment> @@ -9644,11 +9996,11 @@ <comment xml:lang="pt">ficheiro do Qt Designer</comment> <comment xml:lang="pt_BR">Arquivo do Qt Designer</comment> <comment xml:lang="ro">Fișier Qt Designer</comment> - <comment xml:lang="ru">файл Qt Designer</comment> + <comment xml:lang="ru">Файл Qt Designer</comment> <comment xml:lang="sk">Súbor Qt Designer</comment> <comment xml:lang="sl">Datoteka Qt Designer</comment> <comment xml:lang="sq">File Qt Designer</comment> - <comment xml:lang="sr">датотека Кут Дизајнера</comment> + <comment xml:lang="sr">датотека Кут дизајнера</comment> <comment xml:lang="sv">Qt Designer-fil</comment> <comment xml:lang="tr">Qt Tasarımcı dosyası</comment> <comment xml:lang="uk">файл програми Qt-дизайнер</comment> @@ -9676,6 +10028,7 @@ <comment xml:lang="eu">Qt Markup lengoai fitxategia</comment> <comment xml:lang="fi">QML-tiedosto</comment> <comment xml:lang="fr">fichier Qt Markup Language</comment> + <comment xml:lang="ga">comhad teanga mharcála Qt</comment> <comment xml:lang="gl">ficheiro de linguaxe de marcado Qt</comment> <comment xml:lang="he">קובץ שפת סימון של Qt</comment> <comment xml:lang="hr">Qt Markup Language datoteka</comment> @@ -9692,17 +10045,23 @@ <comment xml:lang="pl">Plik języka znaczników Qt</comment> <comment xml:lang="pt">ficheiro de linguagem Qt Markup</comment> <comment xml:lang="pt_BR">Arquivo de Qt Markup Language</comment> - <comment xml:lang="ru">файл Qt Markup Language</comment> + <comment xml:lang="ru">Файл Qt Markup Language</comment> <comment xml:lang="sk">Súbor značkovacieho jazyka Qt</comment> <comment xml:lang="sl">Datoteka označevalnega jezika Qt</comment> - <comment xml:lang="sr">датотека Кутовог језика означавања</comment> + <comment xml:lang="sr">датотека КуТ-овог језика означавања</comment> <comment xml:lang="sv">Qt-märkspråksfil</comment> <comment xml:lang="tr">Qt İşaretleme Dili dosyası</comment> <comment xml:lang="uk">файл мови розмітки Qt</comment> - <comment xml:lang="zh_CN">Qt </comment> + <comment xml:lang="zh_CN">Qt Markup Language 文件</comment> <comment xml:lang="zh_TW">Qt 標記語言檔</comment> <magic priority="80"> - <match value="import Qt " type="string" offset="0:256"/> + <match value="/bin/env qml" type="string" offset="2:16"/> + <match value="import Qt" type="string" offset="0:3000"> + <match value="{" type="string" offset="9:3009"/> + </match> + <match value="import Qml" type="string" offset="0:3000"> + <match value="{" type="string" offset="9:3009"/> + </match> </magic> <glob pattern="*.qml"/> <glob pattern="*.qmltypes"/> @@ -9725,10 +10084,10 @@ <comment xml:lang="fi">työpöydän asetustiedosto</comment> <comment xml:lang="fo">skriviborðssamansetingarfíla</comment> <comment xml:lang="fr">fichier de configuration desktop</comment> - <comment xml:lang="ga">comhad chumraíocht deisce</comment> + <comment xml:lang="ga">comhad cumraíochta deisce</comment> <comment xml:lang="gl">ficheiro de configuración de escritorio</comment> <comment xml:lang="he">קובץ הגדרות שולחן עבודה</comment> - <comment xml:lang="hr">datoteka postavki radne površine</comment> + <comment xml:lang="hr">Datoteka prečaca radne površine</comment> <comment xml:lang="hu">asztalbeállító fájl</comment> <comment xml:lang="ia">File de configuration de scriptorio</comment> <comment xml:lang="id">berkas konfigurasi destop</comment> @@ -9747,7 +10106,7 @@ <comment xml:lang="pt">ficheiro de configuração de área de trabalho</comment> <comment xml:lang="pt_BR">Arquivo de configuração desktop</comment> <comment xml:lang="ro">fișier de configurare al desktopului</comment> - <comment xml:lang="ru">файл настроек рабочего стола</comment> + <comment xml:lang="ru">Файл настроек рабочего стола</comment> <comment xml:lang="sk">Súbor nastavení pracovnej plochy</comment> <comment xml:lang="sl">nastavitvena datoteka namizja</comment> <comment xml:lang="sq">File konfigurimi desktop</comment> @@ -9774,6 +10133,7 @@ <mime-type type="application/x-fictionbook+xml"> <comment>FictionBook document</comment> <comment xml:lang="ar">مستند FictionBook</comment> + <comment xml:lang="ast">Documentu de FictionBook</comment> <comment xml:lang="bg">Документ — FictionBook</comment> <comment xml:lang="ca">document FictionBook</comment> <comment xml:lang="cs">dokument FictionBook</comment> @@ -9807,7 +10167,7 @@ <comment xml:lang="pt">documento FictionBook</comment> <comment xml:lang="pt_BR">Documento FictionBook</comment> <comment xml:lang="ro">Document FictionBook</comment> - <comment xml:lang="ru">документ FictionBook</comment> + <comment xml:lang="ru">Документ FictionBook</comment> <comment xml:lang="sk">Dokument FictionBook</comment> <comment xml:lang="sl">Dokument FictionBook</comment> <comment xml:lang="sr">документ Фикшон Књиге</comment> @@ -9827,6 +10187,7 @@ </mime-type> <mime-type type="application/x-zip-compressed-fb2"> <comment>Compressed FictionBook document</comment> + <comment xml:lang="ast">Documentu comprimíu de FictionBook</comment> <comment xml:lang="ca">document FictionBook amb compressió</comment> <comment xml:lang="cs">komprimovaný dokument FictionBook</comment> <comment xml:lang="da">Komprimeret FictionBook-dokument</comment> @@ -9837,6 +10198,7 @@ <comment xml:lang="eu">Konprimitutako FictionBook dokumentua</comment> <comment xml:lang="fi">Pakattu FictionBook-asiakirja</comment> <comment xml:lang="fr">document FictionBook compressé</comment> + <comment xml:lang="ga">cáipéis chomhbhrúite FictionBook</comment> <comment xml:lang="gl">Documento de FictionBook comprimida</comment> <comment xml:lang="he">מסמך FictionBook מכווץ</comment> <comment xml:lang="hr">Sažet FictionBook dokument</comment> @@ -9858,7 +10220,7 @@ <comment xml:lang="tr">Sıkıştırılmış KurguKitap belgesi</comment> <comment xml:lang="uk">стиснений документ FictionBook</comment> <comment xml:lang="zh_CN">压缩的 FictionBook 文档</comment> - <comment xml:lang="zh_TW">壓縮的 FictionBook 文件</comment> + <comment xml:lang="zh_TW">壓縮版 FictionBook 文件</comment> <sub-class-of type="application/zip"/> <glob pattern="*.fb2.zip"/> <magic priority="70"> @@ -9910,7 +10272,7 @@ <comment xml:lang="pt">diagrama Dia</comment> <comment xml:lang="pt_BR">Diagrama do Dia</comment> <comment xml:lang="ro">Diagramă Dia</comment> - <comment xml:lang="ru">диаграмма Dia</comment> + <comment xml:lang="ru">Диаграмма Dia</comment> <comment xml:lang="sk">Diagram Dia</comment> <comment xml:lang="sl">Datoteka diagrama Dia</comment> <comment xml:lang="sq">Diagramë Dia</comment> @@ -9963,7 +10325,7 @@ <comment xml:lang="pt">forma Dia</comment> <comment xml:lang="pt_BR">Formato Dia</comment> <comment xml:lang="ro">Figură Dia</comment> - <comment xml:lang="ru">фигура Dia</comment> + <comment xml:lang="ru">Фигура Dia</comment> <comment xml:lang="sk">Tvar Dia</comment> <comment xml:lang="sl">Datoteka oblik Dia</comment> <comment xml:lang="sr">облик Дие</comment> @@ -9983,6 +10345,7 @@ <mime-type type="application/x-dvi"> <comment>TeX DVI document</comment> <comment xml:lang="ar">مستند TeX DVI</comment> + <comment xml:lang="ast">Documentu Tex DVI</comment> <comment xml:lang="be@latin">Dakument TeX DVI</comment> <comment xml:lang="bg">Документ — TeX DVI</comment> <comment xml:lang="ca">document DVI de TeX</comment> @@ -10019,7 +10382,7 @@ <comment xml:lang="pt">documento TeX DVI</comment> <comment xml:lang="pt_BR">Documento DVI TeX</comment> <comment xml:lang="ro">Document Tex DVI</comment> - <comment xml:lang="ru">документ TeX DVI</comment> + <comment xml:lang="ru">Документ TeX DVI</comment> <comment xml:lang="sk">Dokument TeX DVI</comment> <comment xml:lang="sl">Dokument TeX DVI</comment> <comment xml:lang="sq">Dokument TeX DVI</comment> @@ -10080,11 +10443,11 @@ <comment xml:lang="pt">tema Enlightenment</comment> <comment xml:lang="pt_BR">Tema do Enlightenment</comment> <comment xml:lang="ro">Temă Enlightenment</comment> - <comment xml:lang="ru">тема Enlightenment</comment> + <comment xml:lang="ru">Тема Enlightenment</comment> <comment xml:lang="sk">Motív Enlightenment</comment> <comment xml:lang="sl">Datoteka teme Enlightenment</comment> <comment xml:lang="sq">Tema Enlightenment</comment> - <comment xml:lang="sr">тема Просвећености</comment> + <comment xml:lang="sr">тема за Енлајтмент</comment> <comment xml:lang="sv">Enlightenment-tema</comment> <comment xml:lang="tr">Enlightenment teması</comment> <comment xml:lang="uk">тема Enlightenment</comment> @@ -10133,7 +10496,7 @@ <comment xml:lang="pt">animação Egon Animator</comment> <comment xml:lang="pt_BR">Animação do Egon Animator</comment> <comment xml:lang="ro">Animație Egon Animator</comment> - <comment xml:lang="ru">анимация Egon Animator</comment> + <comment xml:lang="ru">Анимация Egon Animator</comment> <comment xml:lang="sk">Animácia Egon Animator</comment> <comment xml:lang="sl">Datoteka animacije Egon Animator</comment> <comment xml:lang="sq">Animim Egon Animator</comment> @@ -10167,7 +10530,7 @@ <comment xml:lang="ga">comhad inrite</comment> <comment xml:lang="gl">executábel</comment> <comment xml:lang="he">קובץ הרצה</comment> - <comment xml:lang="hr">izvršna datoteka</comment> + <comment xml:lang="hr">Izvršna datoteka</comment> <comment xml:lang="hu">futtatható</comment> <comment xml:lang="ia">Executabile</comment> <comment xml:lang="id">dapat dieksekusi</comment> @@ -10186,7 +10549,7 @@ <comment xml:lang="pt">executável</comment> <comment xml:lang="pt_BR">Executável</comment> <comment xml:lang="ro">executabil</comment> - <comment xml:lang="ru">исполняемый</comment> + <comment xml:lang="ru">Исполняемый</comment> <comment xml:lang="sk">Spustiteľný súbor</comment> <comment xml:lang="sl">izvedljiva datoteka</comment> <comment xml:lang="sq">I ekzekutueshëm</comment> @@ -10254,7 +10617,7 @@ <comment xml:lang="pt">ficheiro FLTK Fluid</comment> <comment xml:lang="pt_BR">Arquivo Fluid do FLTK</comment> <comment xml:lang="ro">Fișier FLTK Fluid</comment> - <comment xml:lang="ru">файл FLTK Fluid</comment> + <comment xml:lang="ru">Файл FLTK Fluid</comment> <comment xml:lang="sk">Súbor FLTK Fluid</comment> <comment xml:lang="sl">Datoteka FLTK Fluid</comment> <comment xml:lang="sq">File FLTK Fluid</comment> @@ -10274,10 +10637,11 @@ </magic> <glob pattern="*.fl"/> </mime-type> - <mime-type type="application/font-woff"> + <mime-type type="font/woff"> <comment>WOFF font</comment> - <comment xml:lang="ca">tipus de lletra WOFF</comment> - <comment xml:lang="cs">písmo WOFF</comment> + <comment xml:lang="ast">Fonte WOFF</comment> + <comment xml:lang="ca">lletra WOFF</comment> + <comment xml:lang="cs">font WOFF</comment> <comment xml:lang="da">WOFF-skrifttype</comment> <comment xml:lang="de">WOFF-Schrift</comment> <comment xml:lang="el">Γραμματοσειρά WOFF</comment> @@ -10286,13 +10650,14 @@ <comment xml:lang="eu">WOFF letra-tipoa</comment> <comment xml:lang="fi">WOFF-fontti</comment> <comment xml:lang="fr">police WOFF</comment> + <comment xml:lang="ga">cló WOFF</comment> <comment xml:lang="gl">Tipo de letra WOFF</comment> <comment xml:lang="he">גופן WOFF</comment> <comment xml:lang="hr">WOFF slovo</comment> <comment xml:lang="hu">WOFF-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras WOFF</comment> <comment xml:lang="id">Fonta WOFF</comment> - <comment xml:lang="it">Font WOFF</comment> + <comment xml:lang="it">Carattere WOFF</comment> <comment xml:lang="ja">WOFF フォント</comment> <comment xml:lang="kk">WOFF қарібі</comment> <comment xml:lang="ko">WOFF 글꼴</comment> @@ -10301,7 +10666,7 @@ <comment xml:lang="pl">Czcionka WOFF</comment> <comment xml:lang="pt">letra WOFF</comment> <comment xml:lang="pt_BR">Fonte WOFF</comment> - <comment xml:lang="ru">шрифт WOFF</comment> + <comment xml:lang="ru">Шрифт WOFF</comment> <comment xml:lang="sk">Písmo WOFF</comment> <comment xml:lang="sl">Pisava WOFF</comment> <comment xml:lang="sr">ВОФФ слова</comment> @@ -10317,55 +10682,65 @@ <match value="0x774f4646" type="big32" offset="0"/> </magic> <glob pattern="*.woff"/> + <alias type="application/font-woff"/> + </mime-type> + <mime-type type="font/woff"> + <comment>WOFF2 font</comment> + <comment xml:lang="ast">Fonte WOFF2</comment> + <comment xml:lang="ca">lletra WOFF2</comment> + <comment xml:lang="cs">font WOFF2</comment> + <comment xml:lang="de">WOFF2-Schrift</comment> + <comment xml:lang="en_GB">WOFF2 font</comment> + <comment xml:lang="es">tipo de letra WOFF2</comment> + <comment xml:lang="fi">WOFF2-fontti</comment> + <comment xml:lang="hr">WOFF2 slovo</comment> + <comment xml:lang="hu">WOFF2 betűkészlet</comment> + <comment xml:lang="id">Fonta WOFF2</comment> + <comment xml:lang="it">Carattere WOFF2</comment> + <comment xml:lang="kk">WOFF2 қарібі</comment> + <comment xml:lang="ko">WOFF2 글꼴</comment> + <comment xml:lang="pl">Czcionka WOFF2</comment> + <comment xml:lang="pt_BR">Fonte WOFF2</comment> + <comment xml:lang="ru">Шрифт WOFF2</comment> + <comment xml:lang="sk">Písmo WOFF2</comment> + <comment xml:lang="sv">WOFF2-typsnitt</comment> + <comment xml:lang="uk">шрифт WOFF2</comment> + <comment xml:lang="zh_CN">WOFF2 字体</comment> + <comment xml:lang="zh_TW">WOFF2 字型</comment> + <acronym>WOFF2</acronym> + <expanded-acronym>Web Open Font Format 2.0</expanded-acronym> + <generic-icon name="font-x-generic"/> + <magic priority="50"> + <match value="0x774f4632" type="big32" offset="0"/> + </magic> + <glob pattern="*.woff2"/> </mime-type> <mime-type type="application/x-font-type1"> - <comment>Postscript type-1 font</comment> - <comment xml:lang="ar">خط Postscript type-1</comment> - <comment xml:lang="be@latin">Šryft Postscript type-1</comment> - <comment xml:lang="bg">Шрифт — Postscript Type 1</comment> - <comment xml:lang="ca">tipus de lletra Postscript type-1</comment> - <comment xml:lang="cs">písmo Postscript type-1</comment> - <comment xml:lang="da">PostScript type-1-skrifttype</comment> - <comment xml:lang="de">Postscript-Typ-1-Schrift</comment> - <comment xml:lang="el">Γραμματοσειρά Postscript type-1</comment> - <comment xml:lang="en_GB">Postscript type-1 font</comment> + <comment>PostScript type-1 font</comment> + <comment xml:lang="ca">lletra type-1 de PostScript</comment> + <comment xml:lang="cs">font PostScript type-1</comment> + <comment xml:lang="de">PostScript-Typ-1-Schrift</comment> + <comment xml:lang="en_GB">PostScript type-1 font</comment> <comment xml:lang="es">tipo de letra PostScript Type-1</comment> <comment xml:lang="eu">PostScript type-1 letra-tipoa</comment> - <comment xml:lang="fi">PostScript tyyppi-1 -fontti</comment> - <comment xml:lang="fo">Postscript type-1 stavasnið</comment> - <comment xml:lang="fr">police Postscript Type 1</comment> - <comment xml:lang="ga">cló Postscript type-1</comment> - <comment xml:lang="gl">tipo de letra PostScript tipo-1</comment> - <comment xml:lang="he">גופן של Postscript type-1</comment> - <comment xml:lang="hr">Postscript crsta-1 slovo</comment> - <comment xml:lang="hu">Postscript type-1 betűkészlet</comment> - <comment xml:lang="ia">Typo de litteras PostScript typo 1</comment> - <comment xml:lang="id">Fonta tipe-1 Postscript</comment> - <comment xml:lang="it">Carattere Postscript type-1</comment> - <comment xml:lang="ja">PostScript type-1 フォント</comment> - <comment xml:lang="kk">Postscript type-1 қарібі</comment> + <comment xml:lang="fr">police PostScript Type 1</comment> + <comment xml:lang="ga">cló PostScript type-1</comment> + <comment xml:lang="hr">PostScript type-1 slovo</comment> + <comment xml:lang="hu">PostScript type-1 betűkészlet</comment> + <comment xml:lang="id">fonta PostScript type-1</comment> + <comment xml:lang="it">Carattere PostScript type-1</comment> + <comment xml:lang="kk">PostScript type-1 қарібі</comment> <comment xml:lang="ko">PostScript Type-1 글꼴</comment> - <comment xml:lang="lt">Postscript type-1 šriftas</comment> - <comment xml:lang="lv">Postscript 1-tipa fonts</comment> - <comment xml:lang="nb">Postscript type-1 skrift</comment> - <comment xml:lang="nl">PostScript type-1-lettertype</comment> - <comment xml:lang="nn">PostScript type 1-skrifttype</comment> - <comment xml:lang="oc">poliça Postescript Type 1</comment> <comment xml:lang="pl">Czcionka PostScript Type-1</comment> - <comment xml:lang="pt">letra PostScript tipo 1</comment> <comment xml:lang="pt_BR">Fonte PostScript tipo-1</comment> - <comment xml:lang="ro">Font Postscript type-1</comment> - <comment xml:lang="ru">шрифт PostScript Type-1</comment> - <comment xml:lang="sk">Písmo Postscript type-1</comment> - <comment xml:lang="sl">Datoteka pisave Postscript vrste-1</comment> - <comment xml:lang="sq">Lloj gërmash Postscript type-1</comment> + <comment xml:lang="ru">Шрифт PostScript Type-1</comment> + <comment xml:lang="sk">Písmo PostScript typu 1</comment> <comment xml:lang="sr">слова Постскрипта врсте-1</comment> - <comment xml:lang="sv">Postscript type-1-typsnitt</comment> - <comment xml:lang="tr">Postscript type-1 yazı tipi</comment> - <comment xml:lang="uk">шрифт Postscript type-1</comment> - <comment xml:lang="vi">Phông kiểu 1 PostScript</comment> - <comment xml:lang="zh_CN">Postscript type-1 字体</comment> - <comment xml:lang="zh_TW">Postscript type-1 字型</comment> + <comment xml:lang="sv">PostScript type-1-typsnitt</comment> + <comment xml:lang="tr">PostScript tip-1 yazı tipi</comment> + <comment xml:lang="uk">шрифт type-1 PostScript</comment> + <comment xml:lang="zh_CN">PostScript type-1 字体</comment> + <comment xml:lang="zh_TW">PostScript type-1 字型</comment> <sub-class-of type="application/postscript"/> <generic-icon name="font-x-generic"/> <magic priority="60"> @@ -10386,8 +10761,8 @@ <comment xml:lang="az">Adobe yazı növü metrikləri</comment> <comment xml:lang="be@latin">Metryka šryftu Adobe</comment> <comment xml:lang="bg">Шрифтова метрика — Adobe</comment> - <comment xml:lang="ca">mètrica de tipus de lletra Adobe</comment> - <comment xml:lang="cs">metrika písma Adobe</comment> + <comment xml:lang="ca">mètrica de lletra d'Adobe</comment> + <comment xml:lang="cs">metrika fontu Adobe</comment> <comment xml:lang="cy">Metrigau Ffont Adobe</comment> <comment xml:lang="da">Adobe skrifttypefil</comment> <comment xml:lang="de">Adobe-Schriftmetriken</comment> @@ -10401,7 +10776,7 @@ <comment xml:lang="ga">meadarachtaí cló Adobe</comment> <comment xml:lang="gl">métricas de fonte de Adobe</comment> <comment xml:lang="he">מדדי גופן של Adobe</comment> - <comment xml:lang="hr">Adobe mjere fonta</comment> + <comment xml:lang="hr">Adobe mjere slova</comment> <comment xml:lang="hu">Adobe-betűmetrika</comment> <comment xml:lang="ia">Metricas de typo de litteras Adobe</comment> <comment xml:lang="id">Metrik fonta Adobe</comment> @@ -10420,7 +10795,7 @@ <comment xml:lang="pt">métrica de letras Adobe</comment> <comment xml:lang="pt_BR">Métricas de fonte Adobe</comment> <comment xml:lang="ro">Dimensiuni font Adobe</comment> - <comment xml:lang="ru">метрика шрифта Adobe</comment> + <comment xml:lang="ru">Метрика шрифта Adobe</comment> <comment xml:lang="sk">Metrika písma Adobe</comment> <comment xml:lang="sl">Matrika pisave Adobe</comment> <comment xml:lang="sq">Metrik lloj gërmash Adobe</comment> @@ -10429,7 +10804,7 @@ <comment xml:lang="tr">Adobe yazıtipi ölçüleri</comment> <comment xml:lang="uk">метрики шрифту Adobe</comment> <comment xml:lang="vi">Cách đo phông chữ Adobe</comment> - <comment xml:lang="zh_CN">Adobe 字体参数</comment> + <comment xml:lang="zh_CN">Adobe 字体规格</comment> <comment xml:lang="zh_TW">Adobe 字型描述檔</comment> <generic-icon name="font-x-generic"/> <glob pattern="*.afm"/> @@ -10440,8 +10815,8 @@ <comment xml:lang="az">BDF yazı növü</comment> <comment xml:lang="be@latin">Šryft BDF</comment> <comment xml:lang="bg">Шрифт — BDF</comment> - <comment xml:lang="ca">tipus de lletra BDF</comment> - <comment xml:lang="cs">písmo BDF</comment> + <comment xml:lang="ca">lletra BDF</comment> + <comment xml:lang="cs">font BDF</comment> <comment xml:lang="cy">Ffont BDF</comment> <comment xml:lang="da">BDF-skrifttype</comment> <comment xml:lang="de">BDF-Schrift</comment> @@ -10456,7 +10831,7 @@ <comment xml:lang="ga">cló BDF</comment> <comment xml:lang="gl">tipo de fonte BDF</comment> <comment xml:lang="he">גופן BDF</comment> - <comment xml:lang="hr">BDF font</comment> + <comment xml:lang="hr">BDF slovo</comment> <comment xml:lang="hu">BDF-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras BDF</comment> <comment xml:lang="id">Fonta BDF</comment> @@ -10475,7 +10850,7 @@ <comment xml:lang="pt">letra BDF</comment> <comment xml:lang="pt_BR">Fonte BDF</comment> <comment xml:lang="ro">Font BDF</comment> - <comment xml:lang="ru">шрифт BDF</comment> + <comment xml:lang="ru">Шрифт BDF</comment> <comment xml:lang="sk">Písmo BDF</comment> <comment xml:lang="sl">Datoteka pisave BDF</comment> <comment xml:lang="sq">Lloj gërme BDF</comment> @@ -10498,8 +10873,8 @@ <comment xml:lang="az">DOS yazı növü</comment> <comment xml:lang="be@latin">Šryft DOS</comment> <comment xml:lang="bg">Шрифт — DOS</comment> - <comment xml:lang="ca">tipus de lletra DOS</comment> - <comment xml:lang="cs">písmo pro DOS</comment> + <comment xml:lang="ca">lletra DOS</comment> + <comment xml:lang="cs">font pro DOS</comment> <comment xml:lang="cy">Ffont DOS</comment> <comment xml:lang="da">DOS-skrifttype</comment> <comment xml:lang="de">DOS-Schrift</comment> @@ -10514,7 +10889,7 @@ <comment xml:lang="ga">cló DOS</comment> <comment xml:lang="gl">tipo de fonte de DOS</comment> <comment xml:lang="he">גופן DOS</comment> - <comment xml:lang="hr">DOS font</comment> + <comment xml:lang="hr">DOS slovo</comment> <comment xml:lang="hu">DOS-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras DOS</comment> <comment xml:lang="id">Fonta DOS</comment> @@ -10533,7 +10908,7 @@ <comment xml:lang="pt">letra DOS</comment> <comment xml:lang="pt_BR">Fonte do DOS</comment> <comment xml:lang="ro">Font DOS</comment> - <comment xml:lang="ru">шрифт DOS</comment> + <comment xml:lang="ru">Шрифт DOS</comment> <comment xml:lang="sk">Písmo pre DOS</comment> <comment xml:lang="sl">Datoteka pisave DOS</comment> <comment xml:lang="sq">Gërmë DOS</comment> @@ -10557,8 +10932,8 @@ <comment xml:lang="az">Adobe FrameMaker yazı növü</comment> <comment xml:lang="be@latin">Šryft Adobe FrameMaker</comment> <comment xml:lang="bg">Шрифт — Adobe FrameMaker</comment> - <comment xml:lang="ca">tipus de lletra d'Adobe FrameMaker</comment> - <comment xml:lang="cs">písmo Adobe FrameMaker</comment> + <comment xml:lang="ca">lletra d'Adobe FrameMaker</comment> + <comment xml:lang="cs">font Adobe FrameMaker</comment> <comment xml:lang="cy">Ffont Adobe FrameMaker</comment> <comment xml:lang="da">Adobe FrameMaker-skrifttype</comment> <comment xml:lang="de">Adobe-FrameMaker-Schrift</comment> @@ -10573,7 +10948,7 @@ <comment xml:lang="ga">cló Adobe FrameMaker</comment> <comment xml:lang="gl">tipo de fonte de Adobe FrameMaker</comment> <comment xml:lang="he">גופן של Adobe FrameMaker</comment> - <comment xml:lang="hr">Adobe FrameMaker font</comment> + <comment xml:lang="hr">Adobe FrameMaker slovo</comment> <comment xml:lang="hu">Adobe FrameMaker-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras pro Adobe FrameMaker</comment> <comment xml:lang="id">Fonta Adobe FrameMaker</comment> @@ -10592,7 +10967,7 @@ <comment xml:lang="pt">letra Adobe FrameMaker</comment> <comment xml:lang="pt_BR">Fonte do Adobe FrameMaker</comment> <comment xml:lang="ro">Font Adobe FrameMaker</comment> - <comment xml:lang="ru">шрифт Adobe FrameMaker</comment> + <comment xml:lang="ru">Шрифт Adobe FrameMaker</comment> <comment xml:lang="sk">Písmo Adobe FrameMaker</comment> <comment xml:lang="sl">Datoteka pisave Adobe FrameMaker</comment> <comment xml:lang="sq">Gërma Adobe FrameMaker</comment> @@ -10614,8 +10989,8 @@ <comment xml:lang="az">LIBGRX yazı növü</comment> <comment xml:lang="be@latin">Šryft LIBGRX</comment> <comment xml:lang="bg">Шрифт — LIBGRX</comment> - <comment xml:lang="ca">tipus de lletra LIBGRX</comment> - <comment xml:lang="cs">písmo LIBGRX</comment> + <comment xml:lang="ca">lletra LIBGRX</comment> + <comment xml:lang="cs">font LIBGRX</comment> <comment xml:lang="cy">Ffont LIBGRX</comment> <comment xml:lang="da">LIBGRX-skrifttype</comment> <comment xml:lang="de">LIBGRX-Schrift</comment> @@ -10630,7 +11005,7 @@ <comment xml:lang="ga">cló LIBGRX</comment> <comment xml:lang="gl">tipo de fonte en LIBGRX</comment> <comment xml:lang="he">גופן LIBGRX</comment> - <comment xml:lang="hr">LIBGRX font</comment> + <comment xml:lang="hr">LIBGRX slovo</comment> <comment xml:lang="hu">LIBGRX-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras LIBGRX</comment> <comment xml:lang="id">Fonta LIBGRX</comment> @@ -10649,7 +11024,7 @@ <comment xml:lang="pt">letra LIBGRX</comment> <comment xml:lang="pt_BR">Fonte LIBGRX</comment> <comment xml:lang="ro">Font LIBGRX</comment> - <comment xml:lang="ru">шрифт LIBGRX</comment> + <comment xml:lang="ru">Шрифт LIBGRX</comment> <comment xml:lang="sk">Písmo LIBGRX</comment> <comment xml:lang="sl">Datoteka pisave LIBGRX</comment> <comment xml:lang="sq">Lloj gërme LIBGRX</comment> @@ -10671,8 +11046,8 @@ <comment xml:lang="az">Linux PSF konsol yazı növü</comment> <comment xml:lang="be@latin">Kansolny šryft PSF dla Linuksa</comment> <comment xml:lang="bg">Шрифт — PSF, за конзолата на Линукс</comment> - <comment xml:lang="ca">tipus de lletra de consola Linux PSF</comment> - <comment xml:lang="cs">písmo PSF pro konzolu Linuxu</comment> + <comment xml:lang="ca">lletra de consola PSF de Linux</comment> + <comment xml:lang="cs">font PSF pro konzolu Linuxu</comment> <comment xml:lang="cy">Ffont Linux PSF</comment> <comment xml:lang="da">Linux PSF-konsolskrifttype</comment> <comment xml:lang="de">Linux-PSF-Konsolenschrift</comment> @@ -10684,10 +11059,10 @@ <comment xml:lang="fi">Linux PSF -konsolifontti</comment> <comment xml:lang="fo">Linux PSF stýristøðs stavasnið</comment> <comment xml:lang="fr">police console Linux PSF</comment> - <comment xml:lang="ga">cló chonsól Linux PSF</comment> + <comment xml:lang="ga">cló consóil Linux PSF</comment> <comment xml:lang="gl">tipo de fonte de consola Linux PSF</comment> <comment xml:lang="he">גופן לקונסול מסוג Linux PSF</comment> - <comment xml:lang="hr">Linux PSF konzolni font</comment> + <comment xml:lang="hr">Linux PSF konzolno slovo</comment> <comment xml:lang="hu">Linux PSF konzolos betűkészlet</comment> <comment xml:lang="ia">Typo de litteras console Linux PSF</comment> <comment xml:lang="id">Fonta konsol Linux PSF</comment> @@ -10706,7 +11081,7 @@ <comment xml:lang="pt">letra de consola Linux PSF</comment> <comment xml:lang="pt_BR">Fonte de console Linux PSF</comment> <comment xml:lang="ro">Font consolă Linux PSF</comment> - <comment xml:lang="ru">консольный шрифт Linux PSF</comment> + <comment xml:lang="ru">Консольный шрифт Linux PSF</comment> <comment xml:lang="sk">Písmo PSF pre konzolu Linuxu</comment> <comment xml:lang="sl">Datoteka pisave konzole Linux PSF</comment> <comment xml:lang="sq">Lloj gërme për konsolë Linux PSF</comment> @@ -10728,8 +11103,8 @@ <comment xml:lang="ar">خط كونسول PSF لينكس (مضغوط-gzip)</comment> <comment xml:lang="be@latin">Kansolny šryft PSF dla Linuksa (gzip-skampresavany)</comment> <comment xml:lang="bg">Шрифт — Linux PSF, компресиран с gzip</comment> - <comment xml:lang="ca">tipus de lletra de consola Linux PSF (amb compressió gzip)</comment> - <comment xml:lang="cs">písmo PSF pro konzolu Linuxu (komprimované pomocí gzip)</comment> + <comment xml:lang="ca">lletra de consola PSF de Linux (amb compressió gzip)</comment> + <comment xml:lang="cs">font PSF pro konzolu Linuxu (komprimace gzip)</comment> <comment xml:lang="da">Linux PSF-konsolskrifttype (gzip-komprimeret)</comment> <comment xml:lang="de">Linux-PSF-Konsolenschrift (gzip-komprimiert)</comment> <comment xml:lang="el">Γραμματοσειρά κονσόλας PSF Linux (συμπιεσμένη με gzip)</comment> @@ -10739,10 +11114,10 @@ <comment xml:lang="fi">Linux PSF -konsolifontti (gzip-pakattu)</comment> <comment xml:lang="fo">Linux PSF stýristøðs stavasnið (gzip-stappað)</comment> <comment xml:lang="fr">police console Linux PSF (compressée gzip)</comment> - <comment xml:lang="ga">cló chonsól Linux PSF (comhbhrúite le gzip)</comment> + <comment xml:lang="ga">cló consóil Linux PSF (comhbhrúite le gzip)</comment> <comment xml:lang="gl">tipo de fonte de consola Linux PSF (comprimida con gzip)</comment> <comment xml:lang="he">גופן למסוף מסוג Linux PSF (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">Linux PSF konzolni font (komprimiran gzip-om)</comment> + <comment xml:lang="hr">Linux PSF konzolno slovo (gzip sažeto)</comment> <comment xml:lang="hu">Linux PSF konzolos betűkészlet (gzip-tömörítésű)</comment> <comment xml:lang="ia">Typo de litteras console Linux PSF (comprimite con gzip)</comment> <comment xml:lang="id">Fonta konsol Linux PSF (terkompresi gzip)</comment> @@ -10760,7 +11135,7 @@ <comment xml:lang="pt">letra de consola Linux PSF (compressão gzip)</comment> <comment xml:lang="pt_BR">Fonte de console Linux PSF (compactada com gzip)</comment> <comment xml:lang="ro">Font consolă Linux PSF (compresie gzip)</comment> - <comment xml:lang="ru">консольный шрифт Linux PSF (сжатый gzip)</comment> + <comment xml:lang="ru">Консольный шрифт Linux PSF (сжатый gzip)</comment> <comment xml:lang="sk">Písmo PSF pre konzolu Linuxu (komprimované pomocou gzip)</comment> <comment xml:lang="sl">Datoteka pisave konzole Linux PSF (skrčena z gzip)</comment> <comment xml:lang="sq">Lloj gërme për konsolë Linux PSF (komresuar me gzip)</comment> @@ -10769,7 +11144,7 @@ <comment xml:lang="tr">Linux PSF konsol fontu (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">консольний шрифт Linux PSF (стиснений gzip)</comment> <comment xml:lang="vi">Phông chữ bàn giao tiếp PSF Linux (đã nén gzip)</comment> - <comment xml:lang="zh_CN">Linux PSF 控制台字体(gzip 压缩)</comment> + <comment xml:lang="zh_CN">Linux PSF 控制台字体（gzip 压缩）</comment> <comment xml:lang="zh_TW">Linux PSF console 字型 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="font-x-generic"/> @@ -10781,8 +11156,8 @@ <comment xml:lang="az">PCF yazı növü</comment> <comment xml:lang="be@latin">Šryft PCF</comment> <comment xml:lang="bg">Шрифт — PCF</comment> - <comment xml:lang="ca">tipus de lletra PCF</comment> - <comment xml:lang="cs">písmo PCF</comment> + <comment xml:lang="ca">lletra PCF</comment> + <comment xml:lang="cs">font PCF</comment> <comment xml:lang="cy">Ffont PCF</comment> <comment xml:lang="da">PCF-skrifttype</comment> <comment xml:lang="de">PCF-Schrift</comment> @@ -10816,7 +11191,7 @@ <comment xml:lang="pt">letra PCF</comment> <comment xml:lang="pt_BR">Fonte PCF</comment> <comment xml:lang="ro">Font PCF</comment> - <comment xml:lang="ru">шрифт PCF</comment> + <comment xml:lang="ru">Шрифт PCF</comment> <comment xml:lang="sk">Písmo PCF</comment> <comment xml:lang="sl">Datoteka pisave PCF</comment> <comment xml:lang="sq">Gërma PCF</comment> @@ -10835,14 +11210,14 @@ <glob pattern="*.pcf.Z"/> <glob pattern="*.pcf.gz"/> </mime-type> - <mime-type type="application/x-font-otf"> + <mime-type type="font/otf"> <comment>OpenType font</comment> <comment xml:lang="ar">خط OpenType</comment> <comment xml:lang="az">OpenType yazı növü</comment> <comment xml:lang="be@latin">Šryft OpenType</comment> <comment xml:lang="bg">Шрифт — OpenType</comment> - <comment xml:lang="ca">tipus de lletra OpenType</comment> - <comment xml:lang="cs">písmo OpenType</comment> + <comment xml:lang="ca">lletra OpenType</comment> + <comment xml:lang="cs">font OpenType</comment> <comment xml:lang="cy">Ffont OpenType</comment> <comment xml:lang="da">OpenType-skrifttype</comment> <comment xml:lang="de">OpenType-Schrift</comment> @@ -10876,7 +11251,7 @@ <comment xml:lang="pt">letra OpenType</comment> <comment xml:lang="pt_BR">Fonte OpenType</comment> <comment xml:lang="ro">Font OpenType</comment> - <comment xml:lang="ru">шрифт OpenType</comment> + <comment xml:lang="ru">Шрифт OpenType</comment> <comment xml:lang="sk">Písmo OpenType</comment> <comment xml:lang="sl">Datoteka pisave OpenType</comment> <comment xml:lang="sq">Gërma OpenType</comment> @@ -10887,12 +11262,13 @@ <comment xml:lang="vi">Phông chữ OpenType</comment> <comment xml:lang="zh_CN">OpenType 字体</comment> <comment xml:lang="zh_TW">OpenType 字型</comment> - <sub-class-of type="application/x-font-ttf"/> + <sub-class-of type="font/ttf"/> <generic-icon name="font-x-generic"/> <magic priority="50"> <match value="OTTO" type="string" offset="0"/> </magic> <glob pattern="*.otf"/> + <alias type="application/x-font-otf"/> </mime-type> <mime-type type="application/x-font-speedo"> <comment>Speedo font</comment> @@ -10900,8 +11276,8 @@ <comment xml:lang="az">Speedo yazı növü</comment> <comment xml:lang="be@latin">Šryft Speedo</comment> <comment xml:lang="bg">Шрифт — Speedo</comment> - <comment xml:lang="ca">tipus de lletra Speedo</comment> - <comment xml:lang="cs">písmo Speedo</comment> + <comment xml:lang="ca">lletra Speedo</comment> + <comment xml:lang="cs">font Speedo</comment> <comment xml:lang="cy">Ffont Speedo</comment> <comment xml:lang="da">Speedoskrifttype</comment> <comment xml:lang="de">Speedo-Schrift</comment> @@ -10916,7 +11292,7 @@ <comment xml:lang="ga">cló Speedo</comment> <comment xml:lang="gl">tipo de letra Speedo</comment> <comment xml:lang="he">גופן של Speedo</comment> - <comment xml:lang="hr">Speedo font</comment> + <comment xml:lang="hr">Speedo slovo</comment> <comment xml:lang="hu">Speedo-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras Speedo</comment> <comment xml:lang="id">Fonta Speedo</comment> @@ -10935,7 +11311,7 @@ <comment xml:lang="pt">letra Speedo</comment> <comment xml:lang="pt_BR">Fonte Speedo</comment> <comment xml:lang="ro">Font Speedo</comment> - <comment xml:lang="ru">шрифт Speedo</comment> + <comment xml:lang="ru">Шрифт Speedo</comment> <comment xml:lang="sk">Písmo Speedo</comment> <comment xml:lang="sl">Datoteka pisave Speedo</comment> <comment xml:lang="sq">Gërma Speedo</comment> @@ -10958,8 +11334,8 @@ <comment xml:lang="az">SunOS News yazı növü</comment> <comment xml:lang="be@latin">Šryft SunOS News</comment> <comment xml:lang="bg">Шрифт — SunOS News</comment> - <comment xml:lang="ca">tipus de lletra SunOS News</comment> - <comment xml:lang="cs">písmo SunOS News</comment> + <comment xml:lang="ca">lletra News de SunOS</comment> + <comment xml:lang="cs">font SunOS News</comment> <comment xml:lang="cy">Ffont SunOS News</comment> <comment xml:lang="da">SunOS News-skrifttype</comment> <comment xml:lang="de">SunOS-News-Schrift</comment> @@ -10974,7 +11350,7 @@ <comment xml:lang="ga">cló SunOS News</comment> <comment xml:lang="gl">tipo de letra SunOS News</comment> <comment xml:lang="he">גופן של SunOS News</comment> - <comment xml:lang="hr">SunOS News font</comment> + <comment xml:lang="hr">SunOS News slovo</comment> <comment xml:lang="hu">SunOS News-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras SunOS News</comment> <comment xml:lang="id">Fonta SunOS News</comment> @@ -10993,7 +11369,7 @@ <comment xml:lang="pt">letra SunOS News</comment> <comment xml:lang="pt_BR">Fonte SunOS News</comment> <comment xml:lang="ro">Font SunOS News</comment> - <comment xml:lang="ru">шрифт SunOS News</comment> + <comment xml:lang="ru">Шрифт SunOS News</comment> <comment xml:lang="sk">Písmo SunOS News</comment> <comment xml:lang="sl">Datoteka pisave SunOS News</comment> <comment xml:lang="sq">Gërma SunOS News</comment> @@ -11017,8 +11393,8 @@ <comment xml:lang="az">TeX yazı növü</comment> <comment xml:lang="be@latin">Šryft TeX</comment> <comment xml:lang="bg">Шрифт — TeX</comment> - <comment xml:lang="ca">tipus de lletra TeX</comment> - <comment xml:lang="cs">písmo TeX</comment> + <comment xml:lang="ca">lletra TeX</comment> + <comment xml:lang="cs">font TeX</comment> <comment xml:lang="cy">Ffont TeX</comment> <comment xml:lang="da">TeX-skrifttype</comment> <comment xml:lang="de">TeX-Schrift</comment> @@ -11033,7 +11409,7 @@ <comment xml:lang="ga">cló TeX</comment> <comment xml:lang="gl">tipo de letra de TeX</comment> <comment xml:lang="he">גופן TeX</comment> - <comment xml:lang="hr">TeX font</comment> + <comment xml:lang="hr">TeX slovo</comment> <comment xml:lang="hu">TeX-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras TeX</comment> <comment xml:lang="id">Fonta TeX</comment> @@ -11052,7 +11428,7 @@ <comment xml:lang="pt">letra TeX</comment> <comment xml:lang="pt_BR">Fonte TeX</comment> <comment xml:lang="ro">Font TeX</comment> - <comment xml:lang="ru">шрифт TeX</comment> + <comment xml:lang="ru">Шрифт TeX</comment> <comment xml:lang="sk">Písmo TeX</comment> <comment xml:lang="sl">Datoteka pisave TeX</comment> <comment xml:lang="sq">Gërma TeX</comment> @@ -11076,8 +11452,8 @@ <comment xml:lang="az">TeX yazı növü metrikləri</comment> <comment xml:lang="be@latin">Metryka šryftu TeX</comment> <comment xml:lang="bg">Шрифтова метрика — TeX</comment> - <comment xml:lang="ca">mètrica de tipus de lletra TeX</comment> - <comment xml:lang="cs">metrika písma TeX</comment> + <comment xml:lang="ca">mètrica de lletra de TeX</comment> + <comment xml:lang="cs">metrika fontu TeX</comment> <comment xml:lang="cy">Metrigau Ffont TeX</comment> <comment xml:lang="da">TeX-skrifttypeinformation</comment> <comment xml:lang="de">TeX-Schriftmetriken</comment> @@ -11091,7 +11467,7 @@ <comment xml:lang="ga">meadarachtaí cló TeX</comment> <comment xml:lang="gl">Métricas de tipo de letra de TeX</comment> <comment xml:lang="he">ממדי גופן של TeX</comment> - <comment xml:lang="hr">TeX mjere fonta</comment> + <comment xml:lang="hr">TeX mjere slova</comment> <comment xml:lang="hu">TeX-betűmetrika</comment> <comment xml:lang="ia">Metricas de typo de litteras TeX</comment> <comment xml:lang="id">Fonta metrik TeX</comment> @@ -11110,7 +11486,7 @@ <comment xml:lang="pt">métricas de letra TeX</comment> <comment xml:lang="pt_BR">Métrica de fonte TeX</comment> <comment xml:lang="ro">Dimensiuni font TeX</comment> - <comment xml:lang="ru">метрика шрифта TeX</comment> + <comment xml:lang="ru">Метрика шрифта TeX</comment> <comment xml:lang="sk">Metrika písma TeX</comment> <comment xml:lang="sl">Matrika pisave Tex</comment> <comment xml:lang="sq">Gërma TeX metrics</comment> @@ -11119,7 +11495,7 @@ <comment xml:lang="tr">TeX yazı tipi ölçüleri</comment> <comment xml:lang="uk">метрики шрифту TeX</comment> <comment xml:lang="vi">Cách đo phông chữ TeX</comment> - <comment xml:lang="zh_CN">TeX 字体参数</comment> + <comment xml:lang="zh_CN">TeX 字体规格</comment> <comment xml:lang="zh_TW">TeX 字型描述檔</comment> <generic-icon name="font-x-generic"/> <magic priority="50"> @@ -11127,13 +11503,13 @@ <match value="\000\022" type="string" offset="2"/> </magic> </mime-type> - <mime-type type="application/x-font-ttf"> + <mime-type type="font/ttf"> <comment>TrueType font</comment> <comment xml:lang="ar">خط TrueType</comment> <comment xml:lang="be@latin">Šryft TrueType</comment> <comment xml:lang="bg">Шрифт — TrueType</comment> - <comment xml:lang="ca">tipus de lletra TrueType</comment> - <comment xml:lang="cs">písmo TrueType</comment> + <comment xml:lang="ca">lletra TrueType</comment> + <comment xml:lang="cs">font TrueType</comment> <comment xml:lang="da">TrueType-skrifttype</comment> <comment xml:lang="de">TrueType-Schrift</comment> <comment xml:lang="el">Γραμματοσειρά TrueType</comment> @@ -11147,7 +11523,7 @@ <comment xml:lang="ga">cló TrueType</comment> <comment xml:lang="gl">tipo de letra TrueType</comment> <comment xml:lang="he">גופן מסוג TrueType</comment> - <comment xml:lang="hr">TrueType font</comment> + <comment xml:lang="hr">TrueType slovo</comment> <comment xml:lang="hu">TrueType-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras TrueType</comment> <comment xml:lang="id">Fonta TrueType</comment> @@ -11166,7 +11542,7 @@ <comment xml:lang="pt">letra TrueType</comment> <comment xml:lang="pt_BR">Fonte TrueType</comment> <comment xml:lang="ro">Font TrueType</comment> - <comment xml:lang="ru">шрифт TrueType</comment> + <comment xml:lang="ru">Шрифт TrueType</comment> <comment xml:lang="sk">Písmo TrueType</comment> <comment xml:lang="sl">Datoteka pisave TrueType</comment> <comment xml:lang="sq">Lloj gërme TrueType</comment> @@ -11184,6 +11560,31 @@ <match value="\000\001\000\000\000" type="string" offset="0"/> </magic> <glob pattern="*.ttf"/> + <alias type="application/x-font-ttf"/> + </mime-type> + <mime-type type="font/collection"> + <comment>Font collection</comment> + <comment xml:lang="ca">ccol·lecció de lletres</comment> + <comment xml:lang="cs">kolekce fontů</comment> + <comment xml:lang="de">Schriftsammlung</comment> + <comment xml:lang="en_GB">Font collection</comment> + <comment xml:lang="es">colección tipográfica</comment> + <comment xml:lang="fi">Fonttikokoelma</comment> + <comment xml:lang="hr">Kolekcija slova</comment> + <comment xml:lang="hu">Betűkészlet-gyűjtemény</comment> + <comment xml:lang="id">Koleksi fonta</comment> + <comment xml:lang="it">Raccolta di caratteri</comment> + <comment xml:lang="kk">Қаріптер жинағы</comment> + <comment xml:lang="ko">글꼴 모음</comment> + <comment xml:lang="pl">Kolekcja czcionek</comment> + <comment xml:lang="pt_BR">coleção de fontes</comment> + <comment xml:lang="ru">Коллекция шрифтов</comment> + <comment xml:lang="sk">Zbierka písiem</comment> + <comment xml:lang="sv">Typsnittssamling</comment> + <comment xml:lang="uk">збірка шрифтів</comment> + <comment xml:lang="zh_CN">字体集</comment> + <comment xml:lang="zh_TW">字型集</comment> + <generic-icon name="font-x-generic"/> <glob pattern="*.ttc"/> </mime-type> <mime-type type="application/x-font-ttx"> @@ -11191,8 +11592,8 @@ <comment xml:lang="ar">خط TrueType XML</comment> <comment xml:lang="be@latin">Šryft TrueType XML</comment> <comment xml:lang="bg">Шрифт — TrueType XML</comment> - <comment xml:lang="ca">tipus de lletra TrueType XML</comment> - <comment xml:lang="cs">písmo TrueType XML</comment> + <comment xml:lang="ca">lletra XML de TrueType</comment> + <comment xml:lang="cs">font TrueType XML</comment> <comment xml:lang="da">TrueType XML-skrifttype</comment> <comment xml:lang="de">TrueType-XML-Schrift</comment> <comment xml:lang="el">Γραμματοσειρά XML TrueType</comment> @@ -11205,7 +11606,7 @@ <comment xml:lang="ga">cló XML TrueType</comment> <comment xml:lang="gl">tipo de letra TrueType XML</comment> <comment xml:lang="he">גופן XML מסוג TrueType</comment> - <comment xml:lang="hr">TrueType XML font</comment> + <comment xml:lang="hr">TrueType XML slovo</comment> <comment xml:lang="hu">TrueType XML betűkészlet</comment> <comment xml:lang="ia">Typo de litteras TrueType XML</comment> <comment xml:lang="id">Fonta TrueType XML</comment> @@ -11223,7 +11624,7 @@ <comment xml:lang="pt">letra TrueType XML</comment> <comment xml:lang="pt_BR">Fonte TrueType XML</comment> <comment xml:lang="ro">Font XML TrueType</comment> - <comment xml:lang="ru">шрифт TrueType XML</comment> + <comment xml:lang="ru">Шрифт TrueType XML</comment> <comment xml:lang="sk">Písmo TrueType XML</comment> <comment xml:lang="sl">Datoteka pisave TrueType XML</comment> <comment xml:lang="sq">Lloj gërme TrueType XML</comment> @@ -11247,8 +11648,8 @@ <comment xml:lang="az">V yazı növü</comment> <comment xml:lang="be@latin">Šryft V</comment> <comment xml:lang="bg">Шрифт — V</comment> - <comment xml:lang="ca">tipus de lletra V</comment> - <comment xml:lang="cs">písmo V</comment> + <comment xml:lang="ca">lletra V</comment> + <comment xml:lang="cs">font V</comment> <comment xml:lang="cy">Ffont V</comment> <comment xml:lang="da">V-skrifttype</comment> <comment xml:lang="de">V-Schrift</comment> @@ -11263,7 +11664,7 @@ <comment xml:lang="ga">cló V</comment> <comment xml:lang="gl">tipo de letra V</comment> <comment xml:lang="he">גופן של V</comment> - <comment xml:lang="hr">V font</comment> + <comment xml:lang="hr">V slovo</comment> <comment xml:lang="hu">V-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras V</comment> <comment xml:lang="id">Fonta V</comment> @@ -11282,7 +11683,7 @@ <comment xml:lang="pt">letra V</comment> <comment xml:lang="pt_BR">Fonte V</comment> <comment xml:lang="ro">Font V</comment> - <comment xml:lang="ru">шрифт V font</comment> + <comment xml:lang="ru">Шрифт V font</comment> <comment xml:lang="sk">Písmo V</comment> <comment xml:lang="sl">Datoteka pisave V</comment> <comment xml:lang="sq">Gërmë V</comment> @@ -11301,6 +11702,7 @@ <mime-type type="application/vnd.framemaker"> <comment>Adobe FrameMaker document</comment> <comment xml:lang="ar">مستند أدوبي الصانع للإطارات</comment> + <comment xml:lang="ast">Documentu d'Adobe FrameMaker</comment> <comment xml:lang="be@latin">Dakument Adobe FrameMaker</comment> <comment xml:lang="bg">Документ — Adobe FrameMaker</comment> <comment xml:lang="ca">document d'Adobe FrameMaker</comment> @@ -11337,7 +11739,7 @@ <comment xml:lang="pt">documento Adobe FrameMaker</comment> <comment xml:lang="pt_BR">Documento do Adobe FrameMaker</comment> <comment xml:lang="ro">Document Adobe FrameMaker</comment> - <comment xml:lang="ru">документ Adobe FrameMaker</comment> + <comment xml:lang="ru">Документ Adobe FrameMaker</comment> <comment xml:lang="sk">Dokument Adobe FrameMaker</comment> <comment xml:lang="sl">Dokument Adobe FrameMaker</comment> <comment xml:lang="sq">Dokument Adobe FrameMaker</comment> @@ -11399,7 +11801,7 @@ <comment xml:lang="oc">ROM Game Boy</comment> <comment xml:lang="pl">Plik ROM konsoli Game Boy</comment> <comment xml:lang="pt">ROM Game Boy</comment> - <comment xml:lang="pt_BR">ROM do Game Boy</comment> + <comment xml:lang="pt_BR">ROM de Game Boy</comment> <comment xml:lang="ro">ROM Game Boy</comment> <comment xml:lang="ru">Game Boy ROM</comment> <comment xml:lang="sk">ROM pre Game Boy</comment> @@ -11424,18 +11826,29 @@ <mime-type type="application/x-gameboy-color-rom"> <comment>Game Boy Color ROM</comment> <comment xml:lang="ca">ROM de Game Boy Color</comment> + <comment xml:lang="cs">ROM pro Game Boy Color</comment> <comment xml:lang="da">Game Boy Color ROM</comment> <comment xml:lang="de">Game Boy Color ROM</comment> + <comment xml:lang="en_GB">Game Boy Colour ROM</comment> <comment xml:lang="es">ROM de Game Boy Color</comment> + <comment xml:lang="eu">Game Boy Color ROM</comment> <comment xml:lang="fi">Game Boy Color -ROM</comment> <comment xml:lang="fr">ROM Game Boy Color</comment> + <comment xml:lang="ga">ROM Game Boy Color</comment> + <comment xml:lang="he">ROM של Game Boy Color</comment> + <comment xml:lang="hr">Game Boy Color ROM</comment> <comment xml:lang="hu">Game Boy Color ROM</comment> + <comment xml:lang="id">ROM Game Boy Color</comment> + <comment xml:lang="it">ROM Game Boy Color</comment> <comment xml:lang="kk">Game Boy Color ROM</comment> <comment xml:lang="ko">게임보이 컬러 롬</comment> <comment xml:lang="pl">Plik ROM konsoli Game Boy Color</comment> <comment xml:lang="pt_BR">ROM de Game Boy Color</comment> <comment xml:lang="ru">Game Boy Color ROM</comment> <comment xml:lang="sk">ROM pre Game Boy Color</comment> + <comment xml:lang="sr">Гејм Бој РОМ боје</comment> + <comment xml:lang="sv">Game Boy Color-rom</comment> + <comment xml:lang="tr">Game Boy Color ROM</comment> <comment xml:lang="uk">ППП Game Boy Color</comment> <comment xml:lang="zh_CN">Game Boy Color ROM</comment> <comment xml:lang="zh_TW">Game Boy Color ROM</comment> @@ -11484,7 +11897,7 @@ <comment xml:lang="oc">ROM Game Boy Advance</comment> <comment xml:lang="pl">Plik ROM konsoli Game Boy Advance</comment> <comment xml:lang="pt">ROM Game Boy Advance</comment> - <comment xml:lang="pt_BR">ROM do Game Boy Advance</comment> + <comment xml:lang="pt_BR">ROM de Game Boy Advance</comment> <comment xml:lang="ro">ROM Game Boy Advance</comment> <comment xml:lang="ru">Game Boy Advance ROM</comment> <comment xml:lang="sk">ROM pre Game Boy Advance</comment> @@ -11501,6 +11914,30 @@ <glob pattern="*.gba"/> <glob pattern="*.agb"/> </mime-type> + <mime-type type="application/x-virtual-boy-rom"> + <comment>Virtual Boy ROM</comment> + <comment xml:lang="ca">ROM de Virtual Boy</comment> + <comment xml:lang="cs">ROM pro Virtual Boy</comment> + <comment xml:lang="de">Virtual Boy ROM</comment> + <comment xml:lang="en_GB">Virtual Boy ROM</comment> + <comment xml:lang="es">ROM de Virtual Boy</comment> + <comment xml:lang="hr">Virtual Boy ROM</comment> + <comment xml:lang="hu">Virtual Boy ROM</comment> + <comment xml:lang="id">ROM Virtual Boy</comment> + <comment xml:lang="it">ROM Virtual Boy</comment> + <comment xml:lang="kk">Virtual Boy ROM</comment> + <comment xml:lang="ko">버추얼보이 롬</comment> + <comment xml:lang="pl">Plik ROM konsoli Virtual Boy</comment> + <comment xml:lang="pt_BR">ROM de Virtual Boy</comment> + <comment xml:lang="ru">Virtual Boy ROM</comment> + <comment xml:lang="sk">ROM pre Virtual Boy</comment> + <comment xml:lang="sv">Virtual Boy-rom</comment> + <comment xml:lang="uk">ROM Virtual Boy</comment> + <comment xml:lang="zh_CN">Virtual Boy ROM</comment> + <comment xml:lang="zh_TW">Virtual Boy ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.vb"/> + </mime-type> <mime-type type="application/x-gdbm"> <comment>GDBM database</comment> <comment xml:lang="ar">قاعدة بيانات GDBM</comment> @@ -11540,7 +11977,7 @@ <comment xml:lang="pt">base de dados GDMB</comment> <comment xml:lang="pt_BR">Banco de dados GDBM</comment> <comment xml:lang="ro">Bază de date GDBM</comment> - <comment xml:lang="ru">база данных GDBM</comment> + <comment xml:lang="ru">База данных GDBM</comment> <comment xml:lang="sk">Databáza GDBM</comment> <comment xml:lang="sl">Podatkovna zbirka GDBM</comment> <comment xml:lang="sq">Bazë me të dhëna GDBM</comment> @@ -11597,7 +12034,7 @@ <comment xml:lang="oc">ROM Mega Drive/Genesis</comment> <comment xml:lang="pl">Plik ROM konsoli Mega Drive</comment> <comment xml:lang="pt">ROM Mega Drive</comment> - <comment xml:lang="pt_BR">ROM do Gênesis (Mega Drive)</comment> + <comment xml:lang="pt_BR">ROM de Genesis (Mega Drive)</comment> <comment xml:lang="ro">ROM Genesis</comment> <comment xml:lang="ru">Genesis ROM</comment> <comment xml:lang="sk">ROM pre Megadrive</comment> @@ -11624,19 +12061,29 @@ <comment>Genesis 32X ROM</comment> <comment xml:lang="ca">ROM de Genesis 32X</comment> + <comment xml:lang="cs">ROM pro Genesis 32X</comment> <comment xml:lang="da">Genesis 32X ROM</comment> <comment xml:lang="de">Genesis 32X ROM</comment> + <comment xml:lang="en_GB">Genesis 32X ROM</comment> <comment xml:lang="es">ROM de Genesis 32X</comment> + <comment xml:lang="eu">Genesis 32X ROM</comment> <comment xml:lang="fi">Genesis 32X -ROM</comment> <comment xml:lang="fr">ROM Genesis 32X</comment> + <comment xml:lang="ga">ROM Genesis 32X</comment> <comment xml:lang="he">ROM מסוג Genesis 32X</comment> + <comment xml:lang="hr">Genesis 32X ROM</comment> <comment xml:lang="hu">Genesis 32X ROM</comment> + <comment xml:lang="id">ROM Genesis 32X</comment> + <comment xml:lang="it">ROM Sega Mega Drive 32X</comment> <comment xml:lang="kk">Genesis 32X ROM</comment> <comment xml:lang="ko">제네시스 32X 롬</comment> <comment xml:lang="pl">Plik ROM konsoli Mega Drive 32X</comment> <comment xml:lang="pt_BR">ROM de Genesis 32X</comment> <comment xml:lang="ru">Genesis 32X ROM</comment> <comment xml:lang="sk">ROM pre Genesis 32X</comment> + <comment xml:lang="sr">Џенезис 32X РОМ</comment> + <comment xml:lang="sv">Mega Drive 32X-rom</comment> + <comment xml:lang="tr">Genesis 32X ROM</comment> <comment xml:lang="uk">ППП Genesis 32X</comment> <comment xml:lang="zh_CN">Genesis 32X ROM</comment> <comment xml:lang="zh_TW">Genesis 32X ROM</comment> @@ -11667,7 +12114,7 @@ <comment xml:lang="ga">teachtaireachtaí aistrithe (inléite ag meaisín)</comment> <comment xml:lang="gl">mensaxes traducidos (lexíbeis por máquinas)</comment> <comment xml:lang="he">הודעות מתורגמות (מובן ע״י מכונה)</comment> - <comment xml:lang="hr">prevedene poruke (strojno čitljive)</comment> + <comment xml:lang="hr">Prevedene poruke (strojno čitljive)</comment> <comment xml:lang="hu">lefordított üzenetek (gépi kód)</comment> <comment xml:lang="ia">messages traducite (legibile pro machinas)</comment> <comment xml:lang="id">pesan diterjemahkan (dapat dibaca mesin)</comment> @@ -11687,7 +12134,7 @@ <comment xml:lang="pt">mensagens traduzidas (leitura pelo computador)</comment> <comment xml:lang="pt_BR">Mensagens traduzidas (legível pelo computador)</comment> <comment xml:lang="ro">mesaje traduse (citite de calculator)</comment> - <comment xml:lang="ru">переводы сообщений (откомпилированые)</comment> + <comment xml:lang="ru">Переводы сообщений (откомпилированые)</comment> <comment xml:lang="sk">Preložené správy (strojovo čitateľné)</comment> <comment xml:lang="sl">prevedena sporočila (strojni zapis)</comment> <comment xml:lang="sq">Mesazhe të përkthyer (të lexueshëm nga makina)</comment> @@ -11696,7 +12143,7 @@ <comment xml:lang="tr">çevrilmiş iletiler (makine tarafından okunabilir)</comment> <comment xml:lang="uk">перекладені повідомлення (у машинній формі)</comment> <comment xml:lang="vi">thông điệp đã dịch (máy đọc được)</comment> - <comment xml:lang="zh_CN">消息翻译(机读)</comment> + <comment xml:lang="zh_CN">已翻译消息（机读）</comment> <comment xml:lang="zh_TW">翻譯訊息 (程式讀取格式)</comment> <magic priority="50"> <match value="\336\22\4\225" type="string" offset="0"/> @@ -11717,6 +12164,7 @@ <comment xml:lang="eu">GTK+ Builder</comment> <comment xml:lang="fi">GTK+ Builder</comment> <comment xml:lang="fr">GTK+ Builder</comment> + <comment xml:lang="ga">Tógálaí GTK+</comment> <comment xml:lang="gl">Construtor de GTK+</comment> <comment xml:lang="he">בנייה של GTK+</comment> <comment xml:lang="hr">GTK+ Builder</comment> @@ -11739,7 +12187,7 @@ <comment xml:lang="sv">GTK+ Builder</comment> <comment xml:lang="tr">GTK+ İnşa Edici</comment> <comment xml:lang="uk">GTK+ Builder</comment> - <comment xml:lang="zh_CN">GTK+ 构建程序</comment> + <comment xml:lang="zh_CN">GTK+ Builder</comment> <comment xml:lang="zh_TW">GTK+ Builder</comment> <sub-class-of type="application/xml"/> <generic-icon name="x-office-document"/> @@ -11789,7 +12237,7 @@ <comment xml:lang="pt">projecto Glade</comment> <comment xml:lang="pt_BR">Projeto do Glade</comment> <comment xml:lang="ro">Proiect Glade</comment> - <comment xml:lang="ru">проект Glade</comment> + <comment xml:lang="ru">Проект Glade</comment> <comment xml:lang="sk">Projekt Glade</comment> <comment xml:lang="sl">Datoteka projekta Glade</comment> <comment xml:lang="sq">Projekt Glade</comment> @@ -11841,7 +12289,7 @@ <comment xml:lang="pt">dados financeiros GnuCash</comment> <comment xml:lang="pt_BR">Dados financeiros do GnuCash</comment> <comment xml:lang="ro">Date financiare GnuCash</comment> - <comment xml:lang="ru">финансовые данные GnuCash</comment> + <comment xml:lang="ru">Финансовые данные GnuCash</comment> <comment xml:lang="sk">Finančné údaje GnuCash</comment> <comment xml:lang="sl">Datoteka finančnih podatkov GnuCash</comment> <comment xml:lang="sr">финансијски подаци Гнуовог новца</comment> @@ -11895,7 +12343,7 @@ <comment xml:lang="pt">folha de cálculo Gnumeric</comment> <comment xml:lang="pt_BR">Planilha do Gnumeric</comment> <comment xml:lang="ro">Foaie de calcul Gnumeric</comment> - <comment xml:lang="ru">электронная таблица Gnumeric</comment> + <comment xml:lang="ru">Электронная таблица Gnumeric</comment> <comment xml:lang="sk">Zošit Gnumeric</comment> <comment xml:lang="sl">Razpredelnica Gnumeric</comment> <comment xml:lang="sq">Fletë llogaritjesh Gnumeric</comment> @@ -11904,7 +12352,7 @@ <comment xml:lang="tr">Gnumeric çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Gnumeric</comment> <comment xml:lang="vi">Bảng tính Gnumeric.</comment> - <comment xml:lang="zh_CN">Gnumeric 工作簿</comment> + <comment xml:lang="zh_CN">Gnumeric 电子表格</comment> <comment xml:lang="zh_TW">Gnumeric 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -11916,6 +12364,7 @@ <mime-type type="application/x-gnuplot"> <comment>Gnuplot document</comment> <comment xml:lang="ar">مستند Gnuplot</comment> + <comment xml:lang="ast">Documentu de Gnuplot</comment> <comment xml:lang="be@latin">Dakument Gnuplot</comment> <comment xml:lang="bg">Документ — Gnuplot</comment> <comment xml:lang="ca">document gnuplot</comment> @@ -11951,7 +12400,7 @@ <comment xml:lang="pt">documento Gnuplot</comment> <comment xml:lang="pt_BR">Documento do Gnuplot</comment> <comment xml:lang="ro">Document Gnuplot</comment> - <comment xml:lang="ru">документ Gnuplot</comment> + <comment xml:lang="ru">Документ Gnuplot</comment> <comment xml:lang="sk">Dokument Gnuplot</comment> <comment xml:lang="sl">Dokument Gnuplot</comment> <comment xml:lang="sq">Dokument Gnuplot</comment> @@ -11985,7 +12434,7 @@ <comment xml:lang="fi">Graphite- tieteellinen graafi</comment> <comment xml:lang="fo">Grapite vísindarlig ritmynd</comment> <comment xml:lang="fr">graphe Graphite scientific</comment> - <comment xml:lang="ga">graf eolaíoch Graphite</comment> + <comment xml:lang="ga">graf eolaíochta Graphite</comment> <comment xml:lang="gl">gráfica científica de Graphite</comment> <comment xml:lang="he">תרשים מדעי של Graphite</comment> <comment xml:lang="hr">Graphite znanstveni grafikon</comment> @@ -12007,7 +12456,7 @@ <comment xml:lang="pt">gráfico científico Graphite</comment> <comment xml:lang="pt_BR">Gráfico científico do Graphite</comment> <comment xml:lang="ro">Grafic științific Graphite</comment> - <comment xml:lang="ru">научная диаграмма Graphite</comment> + <comment xml:lang="ru">Научная диаграмма Graphite</comment> <comment xml:lang="sk">Vedecký graf Graphite</comment> <comment xml:lang="sl">Datoteka znanstvenega grafa Graphite</comment> <comment xml:lang="sq">Grafik shkencor Graphite </comment> @@ -12061,7 +12510,7 @@ <comment xml:lang="pt">catálogo GTKtalog</comment> <comment xml:lang="pt_BR">Catálogo GTKtalog</comment> <comment xml:lang="ro">Catalog GTKalog</comment> - <comment xml:lang="ru">каталог GTKtalog</comment> + <comment xml:lang="ru">Каталог GTKtalog</comment> <comment xml:lang="sk">Katalóg GTKtalog</comment> <comment xml:lang="sl">Datoteka kataloga GTKtalog</comment> <comment xml:lang="sq">Katallog GTKtalog</comment> @@ -12080,6 +12529,7 @@ <mime-type type="application/x-gzdvi"> <comment>TeX DVI document (gzip-compressed)</comment> <comment xml:lang="ar">مستند TeX DVI (مضغوط-gzip)</comment> + <comment xml:lang="ast">Documentu Tex DVI (comprimíu en gzip)</comment> <comment xml:lang="be@latin">Dakument TeX DVI (gzip-skampresavany)</comment> <comment xml:lang="bg">Документ — TeX DVI, компресиран с gzip</comment> <comment xml:lang="ca">document DVI de TeX (amb compressió gzip)</comment> @@ -12096,7 +12546,7 @@ <comment xml:lang="ga">cáipéis DVI TeX (comhbhrúite le gzip)</comment> <comment xml:lang="gl">documento DVI de TeX (comprimido con gzip)</comment> <comment xml:lang="he">מסמך מסוג TeX DVI (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">TeX DVI dokument (komprimiran gzip-om)</comment> + <comment xml:lang="hr">TeX DVI dokument (gzip sažet)</comment> <comment xml:lang="hu">TeX DVI dokumentum (gzip-pel tömörítve)</comment> <comment xml:lang="ia">Documento TeX DVI (comprimite con gzip)</comment> <comment xml:lang="id">Dokumen TeX DVI (terkompresi gzip)</comment> @@ -12114,7 +12564,7 @@ <comment xml:lang="pt">documento TeX DVI (compressão gzip)</comment> <comment xml:lang="pt_BR">Documento DVI TeX (compactado com gzip)</comment> <comment xml:lang="ro">Document TeX DVI (comprimat gzip)</comment> - <comment xml:lang="ru">документ TeX DVI (сжатый gzip)</comment> + <comment xml:lang="ru">Документ TeX DVI (сжатый gzip)</comment> <comment xml:lang="sk">Dokument TeX DVI (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Dokument TeX DVI (stisnjen z gzip)</comment> <comment xml:lang="sq">Dokument TeX DVI (i kompresuar me gzip)</comment> @@ -12123,7 +12573,7 @@ <comment xml:lang="tr">TeX DVI belgesi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ TeX DVI (стиснений gzip)</comment> <comment xml:lang="vi">Tài liệu DVI TeX (đã nén gzip)</comment> - <comment xml:lang="zh_CN">TeX DVI 文档(gzip 压缩)</comment> + <comment xml:lang="zh_CN">TeX DVI 文档（gzip 压缩）</comment> <comment xml:lang="zh_TW">TeX DVI 文件 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="x-office-document"/> @@ -12167,7 +12617,7 @@ <comment xml:lang="pt">arquivo Gzip</comment> <comment xml:lang="pt_BR">Pacote Gzip</comment> <comment xml:lang="ro">Arhivă Gzip</comment> - <comment xml:lang="ru">архив GZIP</comment> + <comment xml:lang="ru">Архив GZIP</comment> <comment xml:lang="sk">Archív gzip</comment> <comment xml:lang="sl">Datoteka arhiva Gzip</comment> <comment xml:lang="sq">Arkiv gzip</comment> @@ -12188,6 +12638,7 @@ <mime-type type="application/x-gzpdf"> <comment>PDF document (gzip-compressed)</comment> <comment xml:lang="ar">مستند PDF (مضغوط-gzip)</comment> + <comment xml:lang="ast">Documentu PDF (comprimíu en gzip)</comment> <comment xml:lang="be@latin">Dakument PDF (gzip-skampresavany)</comment> <comment xml:lang="bg">Документ — PDF, компресиран с gzip</comment> <comment xml:lang="ca">document PDF (amb compressió gzip)</comment> @@ -12222,7 +12673,7 @@ <comment xml:lang="pt">documento PDF (compressão gzip)</comment> <comment xml:lang="pt_BR">Documento PDF (compactado com gzip)</comment> <comment xml:lang="ro">Document PDF (comprimat gzip)</comment> - <comment xml:lang="ru">документ PDF (сжатый gzip)</comment> + <comment xml:lang="ru">Документ PDF (сжатый gzip)</comment> <comment xml:lang="sk">Dokument PDF (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Dokument PDF (stisnjen z gzip)</comment> <comment xml:lang="sq">Dokument PDF (i kompresuar me gzip)</comment> @@ -12231,7 +12682,7 @@ <comment xml:lang="tr">PDF belgesi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PDF (стиснений gzip)</comment> <comment xml:lang="vi">Tài liệu PDF (đã nén gzip)</comment> - <comment xml:lang="zh_CN">PDF 文档(gzip 压缩)</comment> + <comment xml:lang="zh_CN">PDF 文档（gzip 压缩）</comment> <comment xml:lang="zh_TW">PDF 文件 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="x-office-document"/> @@ -12240,6 +12691,7 @@ <mime-type type="application/x-gzpostscript"> <comment>PostScript document (gzip-compressed)</comment> <comment xml:lang="ar">مستند PostScript (مضغوط-gzip)</comment> + <comment xml:lang="ast">Documentu PostScript (comprimíu en gzip)</comment> <comment xml:lang="be@latin">Dakument PostScript (gzip-skampresavany)</comment> <comment xml:lang="bg">Документ — PostScript, компресиран с gzip</comment> <comment xml:lang="ca">document PostScript (amb compressió gzip)</comment> @@ -12276,7 +12728,7 @@ <comment xml:lang="pt">documento PostScript (compressão gzip)</comment> <comment xml:lang="pt_BR">Documento PostScript (compactado com gzip)</comment> <comment xml:lang="ro">Document PostScript (comprimat gzip)</comment> - <comment xml:lang="ru">документ PostScript (сжатый gzip)</comment> + <comment xml:lang="ru">Документ PostScript (сжатый gzip)</comment> <comment xml:lang="sk">Dokument PostScript (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Dokument PostScript (stisnjen z gzip)</comment> <comment xml:lang="sq">Dokument PostScript (i kompresuar me gzip)</comment> @@ -12285,7 +12737,7 @@ <comment xml:lang="tr">PostScript belgesi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PostScript (стиснене gzip)</comment> <comment xml:lang="vi">Tài liệu PostScript (đã nén gzip)</comment> - <comment xml:lang="zh_CN">PostScript 文档(gzip 压缩)</comment> + <comment xml:lang="zh_CN">PostScript 文档（gzip 压缩）</comment> <comment xml:lang="zh_TW">PostScript 文件 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="x-office-document"/> @@ -12294,6 +12746,7 @@ <mime-type type="application/x-hdf"> <comment>HDF document</comment> <comment xml:lang="ar">مستند HDF</comment> + <comment xml:lang="ast">Documentu HDF</comment> <comment xml:lang="az">HDF sənədi</comment> <comment xml:lang="be@latin">Dakument HDF</comment> <comment xml:lang="bg">Документ — HDF</comment> @@ -12332,7 +12785,7 @@ <comment xml:lang="pt">documento HDF</comment> <comment xml:lang="pt_BR">Documento HDF</comment> <comment xml:lang="ro">Document HDF</comment> - <comment xml:lang="ru">документ HDF</comment> + <comment xml:lang="ru">Документ HDF</comment> <comment xml:lang="sk">Dokument HDF</comment> <comment xml:lang="sl">Dokument HDF</comment> <comment xml:lang="sq">Dokument HDF</comment> @@ -12368,6 +12821,7 @@ <comment xml:lang="eu">IFF fitxtegia</comment> <comment xml:lang="fi">IFF-tiedosto</comment> <comment xml:lang="fr">fichier IFF</comment> + <comment xml:lang="ga">comhad IFF</comment> <comment xml:lang="gl">Ficheiro IFF</comment> <comment xml:lang="he">קובץ IFF</comment> <comment xml:lang="hr">IFF datoteka</comment> @@ -12383,7 +12837,7 @@ <comment xml:lang="pl">Plik IFF</comment> <comment xml:lang="pt">ficheiro IFF</comment> <comment xml:lang="pt_BR">Arquivo IFF</comment> - <comment xml:lang="ru">файл IFF</comment> + <comment xml:lang="ru">Файл IFF</comment> <comment xml:lang="sk">Súbor IFF</comment> <comment xml:lang="sl">Datoteka IFF</comment> <comment xml:lang="sr">ИФФ датотека</comment> @@ -12437,7 +12891,7 @@ <comment xml:lang="pt">firmware iPod</comment> <comment xml:lang="pt_BR">Firmware do iPod</comment> <comment xml:lang="ro">Firmware iPod</comment> - <comment xml:lang="ru">микропрограмма iPod</comment> + <comment xml:lang="ru">Микропрограмма iPod</comment> <comment xml:lang="sk">Firmware iPod</comment> <comment xml:lang="sl">Programska strojna oprema iPod</comment> <comment xml:lang="sq">Firmware iPod</comment> @@ -12491,7 +12945,7 @@ <comment xml:lang="pt">arquivo Java</comment> <comment xml:lang="pt_BR">Pacote Java</comment> <comment xml:lang="ro">Arhivă Java</comment> - <comment xml:lang="ru">архив Java</comment> + <comment xml:lang="ru">Архив Java</comment> <comment xml:lang="sk">Archív Java</comment> <comment xml:lang="sl">Datoteka arhiva Java</comment> <comment xml:lang="sq">Arkiv Java</comment> @@ -12547,7 +13001,7 @@ <comment xml:lang="pt">classe Java</comment> <comment xml:lang="pt_BR">Classe Java</comment> <comment xml:lang="ro">Clasă Java</comment> - <comment xml:lang="ru">класс Java</comment> + <comment xml:lang="ru">Класс Java</comment> <comment xml:lang="sk">Trieda Java</comment> <comment xml:lang="sl">Datoteka razreda Java</comment> <comment xml:lang="sq">Klasë Java</comment> @@ -12606,7 +13060,7 @@ <comment xml:lang="pt">ficheiro JNLP</comment> <comment xml:lang="pt_BR">Arquivo JNLP</comment> <comment xml:lang="ro">Fișier JNLP</comment> - <comment xml:lang="ru">файл JNLP</comment> + <comment xml:lang="ru">Файл JNLP</comment> <comment xml:lang="sk">Súbor JNLP</comment> <comment xml:lang="sl">Datoteka JNLP</comment> <comment xml:lang="sq">File JNLP</comment> @@ -12660,7 +13114,7 @@ <comment xml:lang="pt">armazém de chaves Java</comment> <comment xml:lang="pt_BR">Keystore de Java</comment> <comment xml:lang="ro">Stocare chei Java</comment> - <comment xml:lang="ru">хранилище ключей Java</comment> + <comment xml:lang="ru">Хранилище ключей Java</comment> <comment xml:lang="sk">Úložisko kľúčov Java</comment> <comment xml:lang="sl">Datoteka tipkovne razporeditve Java</comment> <comment xml:lang="sr">смештај кључа Јаве</comment> @@ -12710,7 +13164,7 @@ <comment xml:lang="pt">armazém de chaves JavaJCE</comment> <comment xml:lang="pt_BR">Keystore JCE do Java</comment> <comment xml:lang="ro">Stocare chei Java JCE</comment> - <comment xml:lang="ru">хранилище ключей Java JCE</comment> + <comment xml:lang="ru">Хранилище ключей Java JCE</comment> <comment xml:lang="sk">Úložisko kľúčov Java JCE</comment> <comment xml:lang="sl">Datoteka tipkovne razporeditve Java JCE</comment> <comment xml:lang="sr">смештај ЈЦЕ кључа Јаве</comment> @@ -12763,7 +13217,7 @@ <comment xml:lang="pt">arquivo Java Pack200</comment> <comment xml:lang="pt_BR">Pacote Java Pack200</comment> <comment xml:lang="ro">Arhivă Java Pack2000</comment> - <comment xml:lang="ru">архив Java Pack200</comment> + <comment xml:lang="ru">Архив Java Pack200</comment> <comment xml:lang="sk">Archív Java Pack200</comment> <comment xml:lang="sl">Datoteka arhiva Pack200 Java</comment> <comment xml:lang="sq">Arkiv Java Pack200</comment> @@ -12819,7 +13273,7 @@ <comment xml:lang="pt">programa JavaScript</comment> <comment xml:lang="pt_BR">Programa JavaScript</comment> <comment xml:lang="ro">Program JavaScript</comment> - <comment xml:lang="ru">сценарий JavaScript</comment> + <comment xml:lang="ru">Программа JavaScript</comment> <comment xml:lang="sk">Program jazyka JavaScript</comment> <comment xml:lang="sl">Programska datoteka JavaScript</comment> <comment xml:lang="sq">Program JavaScript</comment> @@ -12828,17 +13282,31 @@ <comment xml:lang="tr">JavaScript programı</comment> <comment xml:lang="uk">програма мовою JavaScript</comment> <comment xml:lang="vi">Chương trình JavaScript</comment> - <comment xml:lang="zh_CN">Javascript 程序</comment> + <comment xml:lang="zh_CN">JavaScript 程序</comment> <comment xml:lang="zh_TW">JavaScript 程式</comment> <alias type="application/x-javascript"/> <alias type="text/javascript"/> <sub-class-of type="application/ecmascript"/> <generic-icon name="text-x-script"/> + <magic priority="50"> + <match value="#!/bin/gjs" type="string" offset="0"/> + <match value="#! /bin/gjs" type="string" offset="0"/> + <match value='eval \"exec /bin/gjs' type="string" offset="0"/> + <match value="#!/usr/bin/gjs" type="string" offset="0"/> + <match value="#! /usr/bin/gjs" type="string" offset="0"/> + <match value='eval \"exec /usr/bin/gjs' type="string" offset="0"/> + <match value="#!/usr/local/bin/gjs" type="string" offset="0"/> + <match value="#! /usr/local/bin/gjs" type="string" offset="0"/> + <match value='eval \"exec /usr/local/bin/gjs' type="string" offset="0"/> + <match value='/bin/env gjs' type="string" offset="2:16"/> + </magic> <glob pattern="*.js"/> <glob pattern="*.jsm"/> + <glob pattern="*.mjs"/> </mime-type> <mime-type type="application/json"> <comment>JSON document</comment> + <comment xml:lang="ast">Documentu JSON</comment> <comment xml:lang="ca">document JSON</comment> <comment xml:lang="cs">dokument JSON</comment> <comment xml:lang="da">JSON-dokument</comment> @@ -12849,6 +13317,7 @@ <comment xml:lang="eu">JSON dokumentua</comment> <comment xml:lang="fi">JSON-asiakirja</comment> <comment xml:lang="fr">document JSON</comment> + <comment xml:lang="ga">cáipéis JSON</comment> <comment xml:lang="gl">Documento JSON</comment> <comment xml:lang="he">מסמך JSON</comment> <comment xml:lang="hr">JSON dokument</comment> @@ -12879,6 +13348,7 @@ </mime-type> <mime-type type="application/jrd+json"> <comment>JRD document</comment> + <comment xml:lang="ast">Documentu JRD</comment> <comment xml:lang="ca">document JRD</comment> <comment xml:lang="cs">dokument JRD</comment> <comment xml:lang="da">JRD-dokument</comment> @@ -12889,6 +13359,7 @@ <comment xml:lang="eu">JRD dokumentua</comment> <comment xml:lang="fi">JRD-asiakirja</comment> <comment xml:lang="fr">document JRD</comment> + <comment xml:lang="ga">cáipéis JRD</comment> <comment xml:lang="he">מסמך JRD</comment> <comment xml:lang="hr">JRD dokument</comment> <comment xml:lang="hu">JRD dokumentum</comment> @@ -12901,7 +13372,7 @@ <comment xml:lang="pl">Dokument JRD</comment> <comment xml:lang="pt">doxumento JRD</comment> <comment xml:lang="pt_BR">Documento JRD</comment> - <comment xml:lang="ru">документ JRD</comment> + <comment xml:lang="ru">Документ JRD</comment> <comment xml:lang="sk">Dokument JRD</comment> <comment xml:lang="sr">ЈРД документ</comment> <comment xml:lang="sv">JRD-dokument</comment> @@ -12923,7 +13394,9 @@ <comment xml:lang="de">JSON-Patch</comment> <comment xml:lang="en_GB">JSON patch</comment> <comment xml:lang="es">parche en JSON</comment> + <comment xml:lang="eu">JSON adabakia</comment> <comment xml:lang="fr">correctif JSON</comment> + <comment xml:lang="ga">paiste JSON</comment> <comment xml:lang="he">טלאי JSON</comment> <comment xml:lang="hr">JSON zakrpa</comment> <comment xml:lang="hu">JSON javítócsomag</comment> @@ -12936,13 +13409,13 @@ <comment xml:lang="pl">Łata JSON</comment> <comment xml:lang="pt">patch JSON</comment> <comment xml:lang="pt_BR">Patch JSON</comment> - <comment xml:lang="ru">изменение JSON</comment> + <comment xml:lang="ru">Патч JSON</comment> <comment xml:lang="sk">Záplata JSON</comment> <comment xml:lang="sr">ЈСОН закрпа</comment> <comment xml:lang="sv">JSON patch</comment> <comment xml:lang="tr">JSON yaması</comment> <comment xml:lang="uk">латка JSON</comment> - <comment xml:lang="zh_CN">JSON 补丁文件</comment> + <comment xml:lang="zh_CN">JSON 补丁</comment> <comment xml:lang="zh_TW">JSON 修補檔</comment> <acronym>JSON</acronym> <expanded-acronym>JavaScript Object Notation</expanded-acronym> @@ -12952,6 +13425,7 @@ </mime-type> <mime-type type="application/ld+json"> <comment>JSON-LD document</comment> + <comment xml:lang="ast">Documentu JSON-LD</comment> <comment xml:lang="ca">document JSON-LD</comment> <comment xml:lang="cs">dokument JSON-LD</comment> <comment xml:lang="da">JSON-LD-dokument</comment> @@ -12962,6 +13436,7 @@ <comment xml:lang="eu">JSON-LD dokumentua</comment> <comment xml:lang="fi">JSON-LD-asiakirja</comment> <comment xml:lang="fr">document JSON-LD</comment> + <comment xml:lang="ga">cáipéis JSON-LD</comment> <comment xml:lang="he">מסמך JSON-LD</comment> <comment xml:lang="hr">JSON-LD dokument</comment> <comment xml:lang="hu">JSON-LD dokumentum</comment> @@ -12974,7 +13449,7 @@ <comment xml:lang="pl">Dokument JSON-LD</comment> <comment xml:lang="pt">documento JSON-LD</comment> <comment xml:lang="pt_BR">Documento JSON-LD</comment> - <comment xml:lang="ru">документ JSON-LD</comment> + <comment xml:lang="ru">Документ JSON-LD</comment> <comment xml:lang="sk">Dokument JSON-LD</comment> <comment xml:lang="sr">ЈСОН-ЛД документ</comment> <comment xml:lang="sv">JSON-LD-dokument</comment> @@ -12991,18 +13466,28 @@ <mime-type type="application/x-ipynb+json"> <comment>Jupyter Notebook</comment> <comment xml:lang="ca">llibreta de notes de Jupyter</comment> + <comment xml:lang="cs">sešit Jupyter</comment> <comment xml:lang="da">Jupyter Notebook</comment> <comment xml:lang="de">Jupyter-Dokument</comment> + <comment xml:lang="en_GB">Jupyter Notebook</comment> <comment xml:lang="es">libreta de Jupyter</comment> + <comment xml:lang="eu">Jupyter Notebook</comment> <comment xml:lang="fr">carnet de notes Jupyter</comment> + <comment xml:lang="ga">Leabhar nótaí Jupyter</comment> <comment xml:lang="he">מחברת Jupyter</comment> + <comment xml:lang="hr">Jupyter bilježnica</comment> <comment xml:lang="hu">Jupyter notesz</comment> + <comment xml:lang="id">Notebook Jupyter</comment> + <comment xml:lang="it">Notebook Jupyter</comment> <comment xml:lang="kk">Jupyter Notebook</comment> <comment xml:lang="ko">Jupyter 노트북</comment> <comment xml:lang="pl">Notatnik Jupyter</comment> <comment xml:lang="pt_BR">Bloco de Notas Jupyter</comment> <comment xml:lang="ru">Jupyter Notebook</comment> <comment xml:lang="sk">Zošit programu Jupyter</comment> + <comment xml:lang="sr">Џупитер бележница</comment> + <comment xml:lang="sv">Jupyter Notebook-dokument</comment> + <comment xml:lang="tr">Jupyter Notebook</comment> <comment xml:lang="uk">записник Jupyter</comment> <comment xml:lang="zh_CN">Jupyter 笔记本</comment> <comment xml:lang="zh_TW">Jupyter 記事本</comment> @@ -13017,6 +13502,7 @@ </mime-type> <mime-type type="application/vnd.coffeescript"> <comment>CoffeeScript document</comment> + <comment xml:lang="ast">Documentu de CoffeScript</comment> <comment xml:lang="ca">document CoffeeScript</comment> <comment xml:lang="cs">dokument CoffeeScript</comment> <comment xml:lang="da">CoffeeScript-dokument</comment> @@ -13027,6 +13513,7 @@ <comment xml:lang="eu">CoffeeScript dokumentua</comment> <comment xml:lang="fi">CoffeeScript-asiakirja</comment> <comment xml:lang="fr">document CoffeeScript</comment> + <comment xml:lang="ga">cáipéis CoffeeScript</comment> <comment xml:lang="he">מסמך CoffeeScript</comment> <comment xml:lang="hr">CoffeeScript dokument</comment> <comment xml:lang="hu">CoffeeScript dokumentum</comment> @@ -13039,7 +13526,7 @@ <comment xml:lang="pl">Dokument CoffeeScript</comment> <comment xml:lang="pt">documento CoffeeScript</comment> <comment xml:lang="pt_BR">Documento CoffeeScript</comment> - <comment xml:lang="ru">документ CoffeeScript</comment> + <comment xml:lang="ru">Документ CoffeeScript</comment> <comment xml:lang="sk">Dokument CoffeeScript</comment> <comment xml:lang="sr">Кофи скрипт документ</comment> <comment xml:lang="sv">CoffeeScript-dokument</comment> @@ -13090,7 +13577,7 @@ <comment xml:lang="pt">projecto JBuilder</comment> <comment xml:lang="pt_BR">Projeto do JBuilder</comment> <comment xml:lang="ro">Proiect JBuilder</comment> - <comment xml:lang="ru">проект JBuilder</comment> + <comment xml:lang="ru">Проект JBuilder</comment> <comment xml:lang="sk">Projekt JBuilder</comment> <comment xml:lang="sl">Datoteka projekta JBuilder</comment> <comment xml:lang="sq">Projekt JBuilder</comment> @@ -13144,7 +13631,7 @@ <comment xml:lang="pt">desenho Karbon14</comment> <comment xml:lang="pt_BR">Desenho do Karbon14</comment> <comment xml:lang="ro">Desen Karbon14</comment> - <comment xml:lang="ru">изображение Karbon14</comment> + <comment xml:lang="ru">Рисунок Karbon14</comment> <comment xml:lang="sk">Kresba Karbon14</comment> <comment xml:lang="sl">Datoteka risbe Karbon14</comment> <comment xml:lang="sq">Vizatim Karbon14</comment> @@ -13209,7 +13696,7 @@ <comment xml:lang="pt">gráfico KChart</comment> <comment xml:lang="pt_BR">Gráfico do KChart</comment> <comment xml:lang="ro">Diagramă KChart</comment> - <comment xml:lang="ru">диаграмма KChart</comment> + <comment xml:lang="ru">Диаграмма KChart</comment> <comment xml:lang="sk">Graf KChart</comment> <comment xml:lang="sl">Datoteka grafikona KChart</comment> <comment xml:lang="sq">Grafik KChart</comment> @@ -13269,7 +13756,7 @@ <comment xml:lang="pt">definições Kexi para ligação de servidor de base de dados</comment> <comment xml:lang="pt_BR">Configurações do Kexi para conexão a servidor de banco de dados</comment> <comment xml:lang="ro">Configurări Kexi pentru conexiunea la serverul de baze de date</comment> - <comment xml:lang="ru">параметры Kexi для подключения к серверу БД</comment> + <comment xml:lang="ru">Параметры Kexi для подключения к серверу БД</comment> <comment xml:lang="sk">Nastavenia Kexi pre pripojenie k databázovému serveru</comment> <comment xml:lang="sl">Strežniška povezava do nastavitvene datoteke Kexi.</comment> <comment xml:lang="sr">подешавања Кексија за везу са сервером базе података</comment> @@ -13298,7 +13785,7 @@ <comment xml:lang="ga">aicearra go tionscadal Kexi ar fhreastalaí bunachair sonraí</comment> <comment xml:lang="gl">acceso directo a proxecto Kexi no servidor de bases de datos</comment> <comment xml:lang="he">קיצור דרך לפרוירט Kexi בשרת נתונים</comment> - <comment xml:lang="hr">prečac za Kexi projekt na poslužitelju baze podataka</comment> + <comment xml:lang="hr">Prečac do Kexi projekta na poslužitelju baze podataka</comment> <comment xml:lang="hu">indítóikon adatbázis-kiszolgálón lévő Kexi projektre</comment> <comment xml:lang="ia">Ligamine a projecto Kexi in servitor de base de datos</comment> <comment xml:lang="id">pintasan ke projek Kexi pada server basis data</comment> @@ -13314,7 +13801,7 @@ <comment xml:lang="pt">atalho para projeto Kexi em servidor de base de dados</comment> <comment xml:lang="pt_BR">Atalho para projeto Kexi no servidor de banco de dados</comment> <comment xml:lang="ro">scurtătură către un proiect Kexi pe un server de baze de date</comment> - <comment xml:lang="ru">ссылка на проект Kexi на сервере БД</comment> + <comment xml:lang="ru">Ссылка на проект Kexi на сервере БД</comment> <comment xml:lang="sk">Zástupca projektu Kexi na databázovom serveri</comment> <comment xml:lang="sl">bližnjica do Kexi projekta na podatkovnem strežniku</comment> <comment xml:lang="sr">пречица до пројекта Кексија на серверу базе података</comment> @@ -13355,11 +13842,11 @@ <comment xml:lang="lv">Kexi datubāzes datnes balstīts projekts</comment> <comment xml:lang="nl">Kexi database bestandgebaseerd project</comment> <comment xml:lang="oc">projècte de banca de donadas Kexi en mòde fichièr</comment> - <comment xml:lang="pl">Projekt bazy danych Kexi oparty na pliku</comment> + <comment xml:lang="pl">Projekt bazy danych Kexi na podstawie plików</comment> <comment xml:lang="pt">projeto Kexi em base de dados baseada em ficheiros</comment> <comment xml:lang="pt_BR">Projeto de banco de dados baseado em arquivo do Kexi</comment> <comment xml:lang="ro">Proiect bazat pe fișiere al bazei de date Kexi</comment> - <comment xml:lang="ru">файловый проект базы данных Kexi</comment> + <comment xml:lang="ru">Файловый проект базы данных Kexi</comment> <comment xml:lang="sk">Projekt databázy Kexi s úložiskom typu súbor</comment> <comment xml:lang="sl">Datoteka projekta podatkovne zbirke Kexi</comment> <comment xml:lang="sr">пројекат Кексијеве базе података на основу датотеке</comment> @@ -13401,11 +13888,11 @@ <comment xml:lang="lv">Kexi datubāzes datnes balstīts projekts</comment> <comment xml:lang="nl">Kexi database bestandgebaseerd project</comment> <comment xml:lang="oc">projècte de banca de donadas Kexi en mòde fichièr</comment> - <comment xml:lang="pl">Projekt bazy danych Kexi oparty na pliku</comment> + <comment xml:lang="pl">Projekt bazy danych Kexi na podstawie plików</comment> <comment xml:lang="pt">projeto Kexi em base de dados baseada em ficheiros</comment> <comment xml:lang="pt_BR">Projeto de banco de dados baseado em arquivo do Kexi</comment> <comment xml:lang="ro">Proiect bazat pe fișiere al bazei de date Kexi</comment> - <comment xml:lang="ru">файловый проект базы данных Kexi</comment> + <comment xml:lang="ru">Файловый проект базы данных Kexi</comment> <comment xml:lang="sk">Projekt databázy Kexi s úložiskom typu súbor</comment> <comment xml:lang="sl">Datoteka projekta podatkovne zbirke Kexi</comment> <comment xml:lang="sr">пројекат Кексијеве базе података на основу датотеке</comment> @@ -13458,7 +13945,7 @@ <comment xml:lang="pt">fórmula KFormula</comment> <comment xml:lang="pt_BR">Fórmula do KFormula</comment> <comment xml:lang="ro">Formulă KFormula</comment> - <comment xml:lang="ru">формула KFormula</comment> + <comment xml:lang="ru">Формула KFormula</comment> <comment xml:lang="sk">Vzorec KFormula</comment> <comment xml:lang="sl">Datoteka formule KFormula</comment> <comment xml:lang="sq">Formulë KFormula</comment> @@ -13523,7 +14010,7 @@ <comment xml:lang="pt">desenho KIllustrator</comment> <comment xml:lang="pt_BR">Desenho do KIllustrator</comment> <comment xml:lang="ro">Desen KIllustrator</comment> - <comment xml:lang="ru">изображение KIllustrator</comment> + <comment xml:lang="ru">Рисунок KIllustrator</comment> <comment xml:lang="sk">Kresba KIllustrator</comment> <comment xml:lang="sl">Datoteka risbe KIllustrator</comment> <comment xml:lang="sq">Vizatim KIllustrator</comment> @@ -13583,11 +14070,11 @@ <comment xml:lang="pt">gráfico de fluxo Kivio</comment> <comment xml:lang="pt_BR">Fluxograma do Kivio</comment> <comment xml:lang="ro">Diagramă Kivio</comment> - <comment xml:lang="ru">диаграмма Kivio</comment> + <comment xml:lang="ru">Диаграмма Kivio</comment> <comment xml:lang="sk">Vývojový diagram Kivio</comment> <comment xml:lang="sl">Datoteka grafikona Kivio</comment> <comment xml:lang="sq">Diagramë fluksi Kivio</comment> - <comment xml:lang="sr">Кливиов дијаграм протока</comment> + <comment xml:lang="sr">Кивиов дијаграм тока</comment> <comment xml:lang="sv">Kivio-flödesschema</comment> <comment xml:lang="tr">Kivio akış şeması</comment> <comment xml:lang="uk">блок-схема Kivio</comment> @@ -13648,7 +14135,7 @@ <comment xml:lang="pt">desenho Kontour</comment> <comment xml:lang="pt_BR">Desenho do Kontour</comment> <comment xml:lang="ro">Desen Kontour</comment> - <comment xml:lang="ru">изображение Kontour</comment> + <comment xml:lang="ru">Рисунок Kontour</comment> <comment xml:lang="sk">Kresba Kontour</comment> <comment xml:lang="sl">Datoteka risbe Kontour</comment> <comment xml:lang="sq">Vizatim Kontour</comment> @@ -13713,7 +14200,7 @@ <comment xml:lang="pt">cenário KPovModeler</comment> <comment xml:lang="pt_BR">Cena do KPovModeler</comment> <comment xml:lang="ro">Scenă KPovModeler</comment> - <comment xml:lang="ru">сцена KPovModeler</comment> + <comment xml:lang="ru">Сцена KPovModeler</comment> <comment xml:lang="sk">Scéna KPovModeler</comment> <comment xml:lang="sl">Datoteka scene KPovModeler</comment> <comment xml:lang="sq">Skenë KPovModeler</comment> @@ -13766,7 +14253,7 @@ <comment xml:lang="pt">apresentação KPresenter</comment> <comment xml:lang="pt_BR">Apresentação do KPresenter</comment> <comment xml:lang="ro">Prezentare KPresenter</comment> - <comment xml:lang="ru">презентация KPresenter</comment> + <comment xml:lang="ru">Презентация KPresenter</comment> <comment xml:lang="sk">Prezentácia KPresenter</comment> <comment xml:lang="sl">Predstavitev KPresenter</comment> <comment xml:lang="sq">Prezantim i KPresenter</comment> @@ -13796,6 +14283,7 @@ <mime-type type="application/x-krita"> <comment>Krita document</comment> <comment xml:lang="ar">مستند Krita</comment> + <comment xml:lang="ast">Documentu de Krita</comment> <comment xml:lang="be@latin">Dakument Krita</comment> <comment xml:lang="bg">Документ — Krita</comment> <comment xml:lang="ca">document Krita</comment> @@ -13832,7 +14320,7 @@ <comment xml:lang="pt">documento Krita</comment> <comment xml:lang="pt_BR">Documento do Krita</comment> <comment xml:lang="ro">Document Krita</comment> - <comment xml:lang="ru">документ Krita</comment> + <comment xml:lang="ru">Документ Krita</comment> <comment xml:lang="sk">Dokument Krita</comment> <comment xml:lang="sl">Dokument Krita</comment> <comment xml:lang="sq">Dokument Krita</comment> @@ -13897,7 +14385,7 @@ <comment xml:lang="pt">folha de cálculo KSpread</comment> <comment xml:lang="pt_BR">Planilha do KSpread</comment> <comment xml:lang="ro">Foaie de calcul KSpread</comment> - <comment xml:lang="ru">электронная таблица KSpread</comment> + <comment xml:lang="ru">Электронная таблица KSpread</comment> <comment xml:lang="sk">Zošit KSpread</comment> <comment xml:lang="sl">Preglednica KSpread</comment> <comment xml:lang="sq">Fletë llogaritjesh KSpread</comment> @@ -13906,7 +14394,7 @@ <comment xml:lang="tr">KSpread çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця KSpread</comment> <comment xml:lang="vi">Bảng tính KSpread</comment> - <comment xml:lang="zh_CN">KSpread 工作簿</comment> + <comment xml:lang="zh_CN">KSpread 电子表格</comment> <comment xml:lang="zh_TW">KSpread 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="60"> @@ -13962,7 +14450,7 @@ <comment xml:lang="pt">folha de cálculo KSpread (encriptada)</comment> <comment xml:lang="pt_BR">Planilha do KSpread (criptografada)</comment> <comment xml:lang="ro">Foaie de calcul KSpread (criptat)</comment> - <comment xml:lang="ru">электронная таблица KSpread (зашифрованная)</comment> + <comment xml:lang="ru">Электронная таблица KSpread (зашифрованная)</comment> <comment xml:lang="sk">Zošit KSpread (šifrovaný)</comment> <comment xml:lang="sl">Preglednica KSpread (šifrirana)</comment> <comment xml:lang="sq">Fletë llogaritjesh KSpread (e kriptuar)</comment> @@ -13971,7 +14459,7 @@ <comment xml:lang="tr">KSpread çalışma sayfası (şifreli)</comment> <comment xml:lang="uk">ел. таблиця KSpread (зашифрована)</comment> <comment xml:lang="vi">Bảng tính KSpread (đã mật mã)</comment> - <comment xml:lang="zh_CN">KSpread 加密工作簿</comment> + <comment xml:lang="zh_CN">KSpread 电子表格（加密）</comment> <comment xml:lang="zh_TW">KSpread 試算表 (已加密)</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -13994,7 +14482,7 @@ <comment xml:lang="fi">KSysV init -paketti</comment> <comment xml:lang="fo">KSysV init pakki</comment> <comment xml:lang="fr">paquet d'initialisation KSysV</comment> - <comment xml:lang="ga">pacáiste thosú KSysV</comment> + <comment xml:lang="ga">pacáiste túsaithe KSysV</comment> <comment xml:lang="gl">paquete de KsysV init</comment> <comment xml:lang="he">חבילת KSysV init</comment> <comment xml:lang="hr">KSysV init paket</comment> @@ -14015,7 +14503,7 @@ <comment xml:lang="pt">pacote inicial KSysV</comment> <comment xml:lang="pt_BR">Pacote init do KSysV</comment> <comment xml:lang="ro">Pachet KSysV init</comment> - <comment xml:lang="ru">пакет инициализации KSysV</comment> + <comment xml:lang="ru">Пакет инициализации KSysV</comment> <comment xml:lang="sk">Balíček KSysV init</comment> <comment xml:lang="sl">Datoteka paketa KSysV init</comment> <comment xml:lang="sq">Paketë init KSysV</comment> @@ -14036,6 +14524,7 @@ <mime-type type="application/x-kugar"> <comment>Kugar document</comment> <comment xml:lang="ar">مستند Kugar</comment> + <comment xml:lang="ast">Documentu de Kugar</comment> <comment xml:lang="be@latin">Dakument Kugar</comment> <comment xml:lang="bg">Документ — Kugar</comment> <comment xml:lang="ca">document Kugar</comment> @@ -14072,7 +14561,7 @@ <comment xml:lang="pt">documento Kugar</comment> <comment xml:lang="pt_BR">Documento do Kugar</comment> <comment xml:lang="ro">Document Kugar</comment> - <comment xml:lang="ru">документ Kugar</comment> + <comment xml:lang="ru">Документ Kugar</comment> <comment xml:lang="sk">Dokument Kugar</comment> <comment xml:lang="sl">Dokument Kugar</comment> <comment xml:lang="sq">Dokument Kugar</comment> @@ -14089,6 +14578,7 @@ <mime-type type="application/x-kword"> <comment>KWord document</comment> <comment xml:lang="ar">مستند KWord</comment> + <comment xml:lang="ast">Documentu de Kword</comment> <comment xml:lang="be@latin">Dakument KWord</comment> <comment xml:lang="bg">Документ — KWord</comment> <comment xml:lang="ca">document KWord</comment> @@ -14126,7 +14616,7 @@ <comment xml:lang="pt">documento KWord</comment> <comment xml:lang="pt_BR">Documento do KWord</comment> <comment xml:lang="ro">Document KWord</comment> - <comment xml:lang="ru">документ KWord</comment> + <comment xml:lang="ru">Документ KWord</comment> <comment xml:lang="sk">Dokument KWord</comment> <comment xml:lang="sl">Dokument KWord</comment> <comment xml:lang="sq">Dokument KWord</comment> @@ -14156,6 +14646,7 @@ <mime-type type="application/x-kword-crypt"> <comment>KWord document (encrypted)</comment> <comment xml:lang="ar">مستند KWord (مشفر)</comment> + <comment xml:lang="ast">Documentu de Kword (cifráu)</comment> <comment xml:lang="be@latin">Dakument KWord (zašyfravany)</comment> <comment xml:lang="bg">Документ — KWord, шифриран</comment> <comment xml:lang="ca">document KWord (xifrat)</comment> @@ -14192,7 +14683,7 @@ <comment xml:lang="pt">documento KWord (encriptado)</comment> <comment xml:lang="pt_BR">Documento do KWord (criptografado)</comment> <comment xml:lang="ro">Document KWord (criptat)</comment> - <comment xml:lang="ru">документ KWord (зашифрованный)</comment> + <comment xml:lang="ru">Документ KWord (зашифрованный)</comment> <comment xml:lang="sk">Dokument KWord (šifrovaný)</comment> <comment xml:lang="sl">Dokument KWord (šifriran)</comment> <comment xml:lang="sq">Dokument KWord (i kriptuar)</comment> @@ -14201,7 +14692,7 @@ <comment xml:lang="tr">KWord belgesi (şifreli)</comment> <comment xml:lang="uk">документ KWord (зашифрований)</comment> <comment xml:lang="vi">Tài liệu KWord (đã mật mã)</comment> - <comment xml:lang="zh_CN">KWord 加密文档</comment> + <comment xml:lang="zh_CN">KWord 文档（加密）</comment> <comment xml:lang="zh_TW">KWord 文件 (已加密)</comment> <generic-icon name="x-office-document"/> <magic priority="50"> @@ -14249,7 +14740,7 @@ <comment xml:lang="pt">arquivo LHA</comment> <comment xml:lang="pt_BR">Pacote LHA</comment> <comment xml:lang="ro">Arhivă LHA</comment> - <comment xml:lang="ru">архив LHA</comment> + <comment xml:lang="ru">Архив LHA</comment> <comment xml:lang="sk">Archív LHA</comment> <comment xml:lang="sl">Datoteka arhiva LHA</comment> <comment xml:lang="sq">Arkiv LHA</comment> @@ -14318,7 +14809,7 @@ <comment xml:lang="pt">arquivo LHZ</comment> <comment xml:lang="pt_BR">Pacote LHZ</comment> <comment xml:lang="ro">Arhivă LHZ</comment> - <comment xml:lang="ru">архив LHZ</comment> + <comment xml:lang="ru">Архив LHZ</comment> <comment xml:lang="sk">Archív LHZ</comment> <comment xml:lang="sl">Datoteka arhiva LHZ</comment> <comment xml:lang="sq">Arkiv LHZ</comment> @@ -14332,7 +14823,7 @@ <generic-icon name="package-x-generic"/> <glob pattern="*.lhz"/> </mime-type> - <mime-type type="text/vnd.trolltech.linguist"> + <mime-type type="text/vnd.qt.linguist"> <comment>message catalog</comment> <comment xml:lang="ar">كتالوج الرسالة</comment> <comment xml:lang="be@latin">kataloh paviedamleńniaŭ</comment> @@ -14352,7 +14843,7 @@ <comment xml:lang="ga">catalóg theachtaireachtaí</comment> <comment xml:lang="gl">catálogo de mensaxes</comment> <comment xml:lang="he">קטלוג הודעות</comment> - <comment xml:lang="hr">katalog poruka</comment> + <comment xml:lang="hr">Katalog poruka</comment> <comment xml:lang="hu">üzenetkatalógus</comment> <comment xml:lang="ia">Catalogo de messages</comment> <comment xml:lang="id">katalog pesan</comment> @@ -14371,7 +14862,7 @@ <comment xml:lang="pt">catálogo de mensagens</comment> <comment xml:lang="pt_BR">Catálogo de mensagens</comment> <comment xml:lang="ro">catalog de mesaje</comment> - <comment xml:lang="ru">каталог сообщений</comment> + <comment xml:lang="ru">Каталог сообщений</comment> <comment xml:lang="sk">Katalóg správ</comment> <comment xml:lang="sl">katalogov sporočil</comment> <comment xml:lang="sq">Katallog mesazhesh</comment> @@ -14388,10 +14879,12 @@ </magic> <glob pattern="*.ts"/> <alias type="application/x-linguist"/> + <alias type="text/vnd.trolltech.linguist"/> </mime-type> <mime-type type="application/x-lyx"> <comment>LyX document</comment> <comment xml:lang="ar">مستند LyX</comment> + <comment xml:lang="ast">Documentu de Lyx</comment> <comment xml:lang="be@latin">Dakument LyX</comment> <comment xml:lang="bg">Документ — LyX</comment> <comment xml:lang="ca">document LyX</comment> @@ -14428,7 +14921,7 @@ <comment xml:lang="pt">documento LyX</comment> <comment xml:lang="pt_BR">Documento LyX</comment> <comment xml:lang="ro">Document LyX</comment> - <comment xml:lang="ru">документ LyX</comment> + <comment xml:lang="ru">Документ LyX</comment> <comment xml:lang="sk">Dokument LyX</comment> <comment xml:lang="sl">Dokument LyX</comment> <comment xml:lang="sq">Dokument LyX</comment> @@ -14459,6 +14952,7 @@ <comment xml:lang="eu">LZ4 artxiboa</comment> <comment xml:lang="fi">LZ4-arkisto</comment> <comment xml:lang="fr">archive LZ4</comment> + <comment xml:lang="ga">Cartlann LZ4</comment> <comment xml:lang="gl">Arquivo LZ4</comment> <comment xml:lang="he">ארכיון LZ4</comment> <comment xml:lang="hr">LZ4 arhiva</comment> @@ -14472,7 +14966,7 @@ <comment xml:lang="pl">Archiwum LZ4</comment> <comment xml:lang="pt">arquivo LZ4</comment> <comment xml:lang="pt_BR">Pacote LZ4</comment> - <comment xml:lang="ru">архив LZ4</comment> + <comment xml:lang="ru">Архив LZ4</comment> <comment xml:lang="sk">Archív LZ4</comment> <comment xml:lang="sl">Datoteka arhiva LZ4</comment> <comment xml:lang="sr">ЛЗ4 архива</comment> @@ -14491,21 +14985,31 @@ <mime-type type="application/x-lz4-compressed-tar"> <comment>Tar archive (LZ4-compressed)</comment> <comment xml:lang="ca">arxiu tar (amb compressió LZ4)</comment> + <comment xml:lang="cs">archiv Tar (komprimace LZ4)</comment> <comment xml:lang="da">Tar-arkiv (LZ4-komprimeret)</comment> <comment xml:lang="de">Tar-Archiv (LZ4-komprimiert)</comment> + <comment xml:lang="en_GB">Tar archive (LZ4-compressed)</comment> <comment xml:lang="es">archivador Tar (comprimido con LZ4)</comment> + <comment xml:lang="eu">Tar artxiboa (LZ4-rekin konprimatua)</comment> <comment xml:lang="fi">Tar-arkisto (LZ4-pakattu)</comment> <comment xml:lang="fr">archive tar (compression LZ4)</comment> + <comment xml:lang="ga">cartlann Tar (comhbhrúite le LZ4)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZ4)</comment> + <comment xml:lang="hr">Tar arhiva (LZ4 sažeto)</comment> <comment xml:lang="hu">Tar archívum (LZ4-el tömörítve)</comment> + <comment xml:lang="id">arsip tar (terkompresi LZ4)</comment> + <comment xml:lang="it">Archivio tar (compresso con LZ4)</comment> <comment xml:lang="kk">Tar архиві (LZ4-пен сығылған)</comment> <comment xml:lang="ko">Tar 묶음 파일(LZ4 압축)</comment> <comment xml:lang="pl">Archiwum tar (kompresja LZ4)</comment> <comment xml:lang="pt_BR">Arquvio Tar (compactado com LZ4)</comment> - <comment xml:lang="ru">архив TAR (сжатый LZ4)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lz4)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZ4)</comment> + <comment xml:lang="sr">Тар архива (запакована ЛЗ4-ом)</comment> + <comment xml:lang="sv">Tar-arkiv (LZ4-komprimerat)</comment> + <comment xml:lang="tr">Tar arşivi (LZ4 ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений LZ4)</comment> - <comment xml:lang="zh_CN">Tar 归档文件 (LZ4 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（LZ4 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (LZ4 格式壓縮)</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="application/x-lz4"/> @@ -14546,7 +15050,7 @@ <comment xml:lang="pt">arquivo LZip</comment> <comment xml:lang="pt_BR">Pacote Lzip</comment> <comment xml:lang="ro">Arhivă Lzip</comment> - <comment xml:lang="ru">архив LZIP</comment> + <comment xml:lang="ru">Архив LZIP</comment> <comment xml:lang="sk">Archív Lzip</comment> <comment xml:lang="sl">Datoteka arhiva Lzip</comment> <comment xml:lang="sr">Лзип архива</comment> @@ -14564,21 +15068,31 @@ <mime-type type="application/x-lzip-compressed-tar"> <comment>Tar archive (lzip-compressed)</comment> <comment xml:lang="ca">arxiu tar (amb compressió lzip)</comment> + <comment xml:lang="cs">archiv Tar (komprimace lzip)</comment> <comment xml:lang="da">Tar-arkiv (lzip-komprimeret)</comment> <comment xml:lang="de">Tar-Archiv (lzip-komprimiert)</comment> + <comment xml:lang="en_GB">Tar archive (lzip-compressed)</comment> <comment xml:lang="es">archivador Tar (comprimido con lzip)</comment> + <comment xml:lang="eu">Tar artxiboa (lzip-rekin konprimatua)</comment> <comment xml:lang="fi">Tar-arkisto (lzip-pakattu)</comment> <comment xml:lang="fr">archive tar (compressée lzip)</comment> + <comment xml:lang="ga">cartlann Tar (comhbhrúite le lzip)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י lzip)</comment> + <comment xml:lang="hr">Tar arhiva (lzip sažeto)</comment> <comment xml:lang="hu">Tar archívum (lzippel tömörítve)</comment> + <comment xml:lang="id">arsip tar (terkompresi lzip)</comment> + <comment xml:lang="it">Archivio tar (compresso con lzip)</comment> <comment xml:lang="kk">Tar архиві (lzip-пен сығылған)</comment> <comment xml:lang="ko">TAR 묶음 파일(LZIP 압축)</comment> <comment xml:lang="pl">Archiwum tar (kompresja lzip)</comment> <comment xml:lang="pt_BR">Arquivo Tar (compactado com lzip)</comment> - <comment xml:lang="ru">архив TAR (сжатый lzip)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lzip)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou lzip)</comment> + <comment xml:lang="sr">Тар архива (запакована лзипом)</comment> + <comment xml:lang="sv">Tar-arkiv (lzip-komprimerat)</comment> + <comment xml:lang="tr">Tar arşivi (lzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений lzip)</comment> - <comment xml:lang="zh_CN">Tar 归档文件 (lzip 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（lzip 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (lzip 格式壓縮)</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="application/x-lzip"/> @@ -14586,6 +15100,32 @@ </mime-type> <mime-type type="application/x-lzpdf"> <comment>PDF document (lzip-compressed)</comment> + <comment xml:lang="ast">Documentu PDF (comprimíu en lzip)</comment> + <comment xml:lang="ca">document PDF (amb compressió lzip)</comment> + <comment xml:lang="cs">dokument PDF (komprimace lzip)</comment> + <comment xml:lang="de">PDF-Dokument (lzip-komprimiert)</comment> + <comment xml:lang="en_GB">PDF document (lzip-compressed)</comment> + <comment xml:lang="es">documento PDF (comprimido con lzip)</comment> + <comment xml:lang="eu">PDF dokumentua (lzip-rekin konprimitua)</comment> + <comment xml:lang="fi">PDF-asiakirja (lzip-pakattu)</comment> + <comment xml:lang="fr">document PDF (compressé lzip)</comment> + <comment xml:lang="ga">cáipéis PDF (comhbhrúite le lzip)</comment> + <comment xml:lang="hr">PDF dokument (lzip sažeto)</comment> + <comment xml:lang="hu">PDF dokumentum (lzip-tömörítésű)</comment> + <comment xml:lang="id">dokumen PDF (termkompresi lzip)</comment> + <comment xml:lang="it">Documento PDF (compresso con lzip)</comment> + <comment xml:lang="kk">PDF құжаты (lzip-пен сығылған)</comment> + <comment xml:lang="ko">PDF 문서(LZIP 압축)</comment> + <comment xml:lang="pl">Dokument PDF (kompresja lzip)</comment> + <comment xml:lang="pt_BR">Documento PDF (compactado com lzip)</comment> + <comment xml:lang="ru">Документ PDF (сжатый lzip)</comment> + <comment xml:lang="sk">Dokument PDF (komprimovaný pomocou lzip)</comment> + <comment xml:lang="sr">ПДФ документ (запакован лзип-ом)</comment> + <comment xml:lang="sv">PDF-dokument (lzip-komprimerat)</comment> + <comment xml:lang="tr">PDF belgesi (lzip ile sıkıştırılmış)</comment> + <comment xml:lang="uk">документ PDF (стиснений lzip)</comment> + <comment xml:lang="zh_CN">PDF 文档（lzip 压缩）</comment> + <comment xml:lang="zh_TW">PDF 文件 (lzip 格式壓縮)</comment> <sub-class-of type="application/x-lzip"/> <generic-icon name="x-office-document"/> <glob pattern="*.pdf.lz"/> @@ -14628,7 +15168,7 @@ <comment xml:lang="pt">arquivo LZMA</comment> <comment xml:lang="pt_BR">Pacote LZMA</comment> <comment xml:lang="ro">Arhivă LZMA</comment> - <comment xml:lang="ru">архив LZMA</comment> + <comment xml:lang="ru">Архив LZMA</comment> <comment xml:lang="sk">Archív LZMA</comment> <comment xml:lang="sl">Datoteka arhiva LZMA</comment> <comment xml:lang="sq">Arkiv LZMA</comment> @@ -14650,7 +15190,7 @@ <comment xml:lang="be@latin">Archiŭ tar (LZMA-skampresavany)</comment> <comment xml:lang="bg">Архив — tar, компресиран с LZMA</comment> <comment xml:lang="ca">arxiu tar (amb compressió LZMA)</comment> - <comment xml:lang="cs">archiv tar (komprimovaný pomocí LZMA)</comment> + <comment xml:lang="cs">archiv Tar (komprimace LZMA)</comment> <comment xml:lang="da">Tar-arkiv (LZMA-komprimeret)</comment> <comment xml:lang="de">Tar-Archiv (LZMA-komprimiert)</comment> <comment xml:lang="el">Αρχείο Tar (συμπιεσμένο με LZMA)</comment> @@ -14663,7 +15203,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le LZMA)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con LZMA)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZMA)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana LZMA-om)</comment> + <comment xml:lang="hr">Tar arhiva (LZMA sažeta)</comment> <comment xml:lang="hu">Tar archívum (LZMA-val tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con LZMA)</comment> <comment xml:lang="id">Arsip Tar (terkompresi LZMA)</comment> @@ -14681,7 +15221,7 @@ <comment xml:lang="pt">arquivo Tar (compressão LZMA)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com LZMA)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată LZMA)</comment> - <comment xml:lang="ru">архив TAR (сжатый LZMA)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lzma)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZMA)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z LZMA)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar me LZMA)</comment> @@ -14690,7 +15230,7 @@ <comment xml:lang="tr">Tar arşivi (LZMA ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений LZMA)</comment> <comment xml:lang="vi">Kho nén tar (đã nén LZMA)</comment> - <comment xml:lang="zh_CN">Tar 归档文件 (LZMA 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（LZMA 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (LZMA 格式壓縮)</comment> <sub-class-of type="application/x-lzma"/> <generic-icon name="package-x-generic"/> @@ -14736,7 +15276,7 @@ <comment xml:lang="pt">arquivo LZO</comment> <comment xml:lang="pt_BR">Pacote LZO</comment> <comment xml:lang="ro">Arhivă LZO</comment> - <comment xml:lang="ru">архив LZO</comment> + <comment xml:lang="ru">Архив LZO</comment> <comment xml:lang="sk">Archív LZO</comment> <comment xml:lang="sl">Datoteka arhiva LZO</comment> <comment xml:lang="sq">Arkiv LZO</comment> @@ -14764,9 +15304,9 @@ <comment xml:lang="el">Συμπιεσμένο αρχείο Qpress</comment> <comment xml:lang="en_GB">Qpress archive</comment> <comment xml:lang="es">archivador de Qpress</comment> - <comment xml:lang="eu">Qpress artxiboa</comment> <comment xml:lang="fi">Qpress-arkisto</comment> <comment xml:lang="fr">Archive Qpress</comment> + <comment xml:lang="ga">cartlann Qpress</comment> <comment xml:lang="gl">Arquivo Qpress</comment> <comment xml:lang="he">ארכיון Qpress</comment> <comment xml:lang="hr">Qpress arhiva</comment> @@ -14780,7 +15320,7 @@ <comment xml:lang="pl">Archiwum Qpress</comment> <comment xml:lang="pt">arquivo Qpress</comment> <comment xml:lang="pt_BR">Pacote Qpress</comment> - <comment xml:lang="ru">архив Qpress</comment> + <comment xml:lang="ru">Архив Qpress</comment> <comment xml:lang="sk">Archív Qpress</comment> <comment xml:lang="sl">Datoteka arhiva Qpress</comment> <comment xml:lang="sr">Купрес архива</comment> @@ -14806,6 +15346,7 @@ <comment xml:lang="eu">XAR artxiboa</comment> <comment xml:lang="fi">XAR-arkisto</comment> <comment xml:lang="fr">archive XAR</comment> + <comment xml:lang="ga">cartlann XAR</comment> <comment xml:lang="he">ארכיון XAR</comment> <comment xml:lang="hr">XAR arhiva</comment> <comment xml:lang="hu">XAR archívum</comment> @@ -14816,7 +15357,7 @@ <comment xml:lang="oc">Archiu XAR</comment> <comment xml:lang="pl">Archiwum XAR</comment> <comment xml:lang="pt_BR">Arquivo XAR</comment> - <comment xml:lang="ru">архив XAR</comment> + <comment xml:lang="ru">Архив XAR</comment> <comment xml:lang="sk">Archív XAR</comment> <comment xml:lang="sr">ИксАР архива</comment> <comment xml:lang="sv">XAR-arkiv</comment> @@ -14843,9 +15384,9 @@ <comment xml:lang="el">Συμπιεσμένο αρχείο Zlib</comment> <comment xml:lang="en_GB">Zlib archive</comment> <comment xml:lang="es">archivador Zlib</comment> - <comment xml:lang="eu">Zlib artxiboa</comment> <comment xml:lang="fi">Zlib-arkisto</comment> <comment xml:lang="fr">Archive Zlib</comment> + <comment xml:lang="ga">cartlann Zlib</comment> <comment xml:lang="gl">Arquivo Zlib</comment> <comment xml:lang="he">ארכיון Zlib</comment> <comment xml:lang="hr">Zlib arhiva</comment> @@ -14859,7 +15400,7 @@ <comment xml:lang="pl">Archiwum Zlib</comment> <comment xml:lang="pt">arquivo Zlib</comment> <comment xml:lang="pt_BR">Pacote Zlib</comment> - <comment xml:lang="ru">архив Zlib</comment> + <comment xml:lang="ru">Архив Zlib</comment> <comment xml:lang="sk">Archív Zlib</comment> <comment xml:lang="sl">Datoteka arhiva Zlib</comment> <comment xml:lang="sr">Злиб архива</comment> @@ -14912,7 +15453,7 @@ <comment xml:lang="pt">apresentação MagicPoint</comment> <comment xml:lang="pt_BR">Apresentação do MagicPoint</comment> <comment xml:lang="ro">Prezentare MagicPoint</comment> - <comment xml:lang="ru">презентация MagicPoint</comment> + <comment xml:lang="ru">Презентация MagicPoint</comment> <comment xml:lang="sk">Prezentácia MagicPoint</comment> <comment xml:lang="sl">Predstavitev MagicPoint</comment> <comment xml:lang="sq">Prezantim MagicPoint</comment> @@ -14966,7 +15507,7 @@ <comment xml:lang="pt">ficheiro MacBinary de Macintosh</comment> <comment xml:lang="pt_BR">Arquivo do Macintosh MacBinary</comment> <comment xml:lang="ro">Fișier Macintosh MacBinary</comment> - <comment xml:lang="ru">файл Macintosh MacBinary</comment> + <comment xml:lang="ru">Файл Macintosh MacBinary</comment> <comment xml:lang="sk">Súbor pre Macintosh MacBinary</comment> <comment xml:lang="sl">Izvedljiva dvojiška datoteka Macintosh MacBinary</comment> <comment xml:lang="sq">File MacBinary Macintosh</comment> @@ -15019,7 +15560,7 @@ <comment xml:lang="pt">fluxo Matroska</comment> <comment xml:lang="pt_BR">Transmissão do Matroska</comment> <comment xml:lang="ro">Flux Matroska</comment> - <comment xml:lang="ru">поток Matroska</comment> + <comment xml:lang="ru">Поток Matroska</comment> <comment xml:lang="sk">Stream Matroska</comment> <comment xml:lang="sl">Pretočni vir Matroska</comment> <comment xml:lang="sq">Stream Matroska</comment> @@ -15045,6 +15586,7 @@ <mime-type type="video/x-matroska"> <comment>Matroska video</comment> <comment xml:lang="ar">Matroska مرئي</comment> + <comment xml:lang="ast">Videu en Matroska</comment> <comment xml:lang="be@latin">Videa Matroska</comment> <comment xml:lang="bg">Видео — Matroska</comment> <comment xml:lang="ca">vídeo Matroska</comment> @@ -15062,7 +15604,7 @@ <comment xml:lang="ga">físeán Matroska</comment> <comment xml:lang="gl">vídeo de Matroska</comment> <comment xml:lang="he">וידאו Matroska</comment> - <comment xml:lang="hr">Matroska video</comment> + <comment xml:lang="hr">Matroška video snimka</comment> <comment xml:lang="hu">Matroska-videó</comment> <comment xml:lang="ia">Video Matroska</comment> <comment xml:lang="id">Video Matroska</comment> @@ -15082,7 +15624,7 @@ <comment xml:lang="pt">vídeo Matroska</comment> <comment xml:lang="pt_BR">Vídeo Matroska</comment> <comment xml:lang="ro">Video Matroska</comment> - <comment xml:lang="ru">видео Matroska</comment> + <comment xml:lang="ru">Видео Matroska</comment> <comment xml:lang="sk">Video Matroska</comment> <comment xml:lang="sl">Video datoteka Matroska</comment> <comment xml:lang="sq">Video Matroska</comment> @@ -15098,6 +15640,7 @@ </mime-type> <mime-type type="video/x-matroska-3d"> <comment>Matroska 3D video</comment> + <comment xml:lang="ast">Videu en Matroska 3D</comment> <comment xml:lang="ca">vídeo Matroska 3D</comment> <comment xml:lang="cs">3D video Matroska</comment> <comment xml:lang="da">Matroska 3D-video</comment> @@ -15108,6 +15651,7 @@ <comment xml:lang="eu">Matroska 3D bideoa</comment> <comment xml:lang="fi">Matroska 3D-video</comment> <comment xml:lang="fr">vidéo Matroska 3D</comment> + <comment xml:lang="ga">físeán Matroska 3D</comment> <comment xml:lang="gl">Video Matroska 3D</comment> <comment xml:lang="he">סרטון תלת ממדי מסוג Matroska</comment> <comment xml:lang="hr">Matroška 3D video snimka</comment> @@ -15153,7 +15697,7 @@ <comment xml:lang="ga">fuaim Matroska</comment> <comment xml:lang="gl">son de Matroska</comment> <comment xml:lang="he">שמע Matroska</comment> - <comment xml:lang="hr">Matroska audio</comment> + <comment xml:lang="hr">Matroška zvučni zapis</comment> <comment xml:lang="hu">Matroska hang</comment> <comment xml:lang="ia">Audio Matroska</comment> <comment xml:lang="id">Audio Matroska</comment> @@ -15172,7 +15716,7 @@ <comment xml:lang="pt">áudio Matroska</comment> <comment xml:lang="pt_BR">Áudio Matroska</comment> <comment xml:lang="ro">Audio Matroska</comment> - <comment xml:lang="ru">аудио Matroska</comment> + <comment xml:lang="ru">Аудио Matroska</comment> <comment xml:lang="sk">Zvuk Matroska</comment> <comment xml:lang="sl">Zvočna datoteka Matroska</comment> <comment xml:lang="sq">Audio Matroska</comment> @@ -15189,6 +15733,7 @@ <mime-type type="video/webm"> <comment>WebM video</comment> <comment xml:lang="ar">WebM مرئي</comment> + <comment xml:lang="ast">Videu en WebM</comment> <comment xml:lang="bg">Видео — WebM</comment> <comment xml:lang="ca">vídeo WebM</comment> <comment xml:lang="cs">video WebM</comment> @@ -15205,7 +15750,7 @@ <comment xml:lang="ga">físeán WebM</comment> <comment xml:lang="gl">vídeo WebM</comment> <comment xml:lang="he">וידאו WebM</comment> - <comment xml:lang="hr">WebM video</comment> + <comment xml:lang="hr">WebM video snimka</comment> <comment xml:lang="hu">WebM videó</comment> <comment xml:lang="ia">Video WebM</comment> <comment xml:lang="id">Video WebM</comment> @@ -15221,7 +15766,7 @@ <comment xml:lang="pt">vídeo WebM</comment> <comment xml:lang="pt_BR">Vídeo WebM</comment> <comment xml:lang="ro">Video WebM</comment> - <comment xml:lang="ru">видео WebM</comment> + <comment xml:lang="ru">Видео WebM</comment> <comment xml:lang="sk">Video WebM</comment> <comment xml:lang="sl">Video datoteka WebM</comment> <comment xml:lang="sr">ВебМ видео</comment> @@ -15261,7 +15806,7 @@ <comment xml:lang="ga">fuaim WebM</comment> <comment xml:lang="gl">son WebM</comment> <comment xml:lang="he">שמע WebM</comment> - <comment xml:lang="hr">WebM audio</comment> + <comment xml:lang="hr">WebM zvučni zapis</comment> <comment xml:lang="hu">WebM hang</comment> <comment xml:lang="ia">Audio WebM</comment> <comment xml:lang="id">Audio WebM</comment> @@ -15277,7 +15822,7 @@ <comment xml:lang="pt">áudio WebM</comment> <comment xml:lang="pt_BR">Áudio WebM</comment> <comment xml:lang="ro">Audio WebM</comment> - <comment xml:lang="ru">аудио WebM</comment> + <comment xml:lang="ru">Аудио WebM</comment> <comment xml:lang="sk">Zvuk WebM</comment> <comment xml:lang="sl">Zvočna datoteka WebM</comment> <comment xml:lang="sr">ВебМ звук</comment> @@ -15300,6 +15845,7 @@ <comment xml:lang="eu">MHTML web artxiboa</comment> <comment xml:lang="fi">MHTML-kooste</comment> <comment xml:lang="fr">archive web MHTML</comment> + <comment xml:lang="ga">cartlann ghréasáin MHTML</comment> <comment xml:lang="gl">Arquivo web MHTML</comment> <comment xml:lang="he">ארכיון רשת MHTML</comment> <comment xml:lang="hr">MHTML web arhiva</comment> @@ -15315,7 +15861,7 @@ <comment xml:lang="pl">Archiwum witryny MHTML</comment> <comment xml:lang="pt">arquivo web MHTML</comment> <comment xml:lang="pt_BR">Pacote web MHTML</comment> - <comment xml:lang="ru">веб-архив MHTML</comment> + <comment xml:lang="ru">Веб-архив MHTML</comment> <comment xml:lang="sk">Webový archív MHTML</comment> <comment xml:lang="sl">Spletni arhiv MHTML</comment> <comment xml:lang="sr">МХТМЛ веб архива</comment> @@ -15333,6 +15879,7 @@ <mime-type type="application/mxf"> <comment>MXF video</comment> <comment xml:lang="ar">MXF مرئي</comment> + <comment xml:lang="ast">Videu en MXF</comment> <comment xml:lang="bg">Видео — MXF</comment> <comment xml:lang="ca">vídeo MXF</comment> <comment xml:lang="cs">video MXF</comment> @@ -15349,7 +15896,7 @@ <comment xml:lang="ga">físeán MXF</comment> <comment xml:lang="gl">vídeo MXF</comment> <comment xml:lang="he">וידאו MXF</comment> - <comment xml:lang="hr">MXF video</comment> + <comment xml:lang="hr">MXF video snimka</comment> <comment xml:lang="hu">MXF videó</comment> <comment xml:lang="ia">Video MXF</comment> <comment xml:lang="id">Video MXF</comment> @@ -15366,7 +15913,7 @@ <comment xml:lang="pt">vídeo MXF</comment> <comment xml:lang="pt_BR">Vídeo MXF</comment> <comment xml:lang="ro">Video MXF</comment> - <comment xml:lang="ru">видео MXF</comment> + <comment xml:lang="ru">Видео MXF</comment> <comment xml:lang="sk">Video MXF</comment> <comment xml:lang="sl">Video datoteka MXF</comment> <comment xml:lang="sr">МИксФ видео</comment> @@ -15421,7 +15968,7 @@ <comment xml:lang="pt">ficheiro OCL</comment> <comment xml:lang="pt_BR">Arquivo OCL</comment> <comment xml:lang="ro">Fișier OCL</comment> - <comment xml:lang="ru">файл OCL</comment> + <comment xml:lang="ru">Файл OCL</comment> <comment xml:lang="sk">Súbor OCL</comment> <comment xml:lang="sl">Datoteka OCL</comment> <comment xml:lang="sq">File OCL</comment> @@ -15451,6 +15998,7 @@ <comment xml:lang="eu">COBOL iturburu-kodea</comment> <comment xml:lang="fi">COBOL-lähdekoodi</comment> <comment xml:lang="fr">fichier source COBOL</comment> + <comment xml:lang="ga">cód foinseach COBOL</comment> <comment xml:lang="gl">ficheiro fonte de COBOL</comment> <comment xml:lang="he">קובץ מקור של COBOL</comment> <comment xml:lang="hr">COBOL izvorna datoteka</comment> @@ -15468,14 +16016,14 @@ <comment xml:lang="pl">Plik źródłowy COBOL</comment> <comment xml:lang="pt">ficheiro origem COBOL</comment> <comment xml:lang="pt_BR">Arquivo de código-fonte em COBOL</comment> - <comment xml:lang="ru">файл исходного кода на COBOL</comment> + <comment xml:lang="ru">Файл исходного кода на COBOL</comment> <comment xml:lang="sk">Zdrojový súbor COBOLu</comment> <comment xml:lang="sl">Izvorna koda COBOL</comment> <comment xml:lang="sr">изворна датотека КОБОЛ-а</comment> <comment xml:lang="sv">COBOL-källkodsfil</comment> <comment xml:lang="tr">COBOL kaynak dosyası</comment> <comment xml:lang="uk">вихідний код мовою COBOL</comment> - <comment xml:lang="zh_CN">COBOL 源</comment> + <comment xml:lang="zh_CN">COBOL 源文件</comment> <comment xml:lang="zh_TW">COBOL 源檔</comment> <acronym>COBOL</acronym> <expanded-acronym>COmmon Business Oriented Language</expanded-acronym> @@ -15496,6 +16044,7 @@ <comment xml:lang="eu">Mobipocket liburua</comment> <comment xml:lang="fi">Mobipocket e-kirja</comment> <comment xml:lang="fr">livre numérique Mobipocket</comment> + <comment xml:lang="ga">r-leabhar Mobipocket</comment> <comment xml:lang="gl">E-book Mobipocket</comment> <comment xml:lang="he">ספר אלקטרוני של Mobipocket</comment> <comment xml:lang="hr">Mobipocket e-knjiga</comment> @@ -15513,7 +16062,7 @@ <comment xml:lang="pl">E-book Mobipocket</comment> <comment xml:lang="pt">ebook Mobipocket</comment> <comment xml:lang="pt_BR">E-book Mobipocket</comment> - <comment xml:lang="ru">электронная книга Mobipocket</comment> + <comment xml:lang="ru">Электронная книга Mobipocket</comment> <comment xml:lang="sk">E-kniha Mobipocket</comment> <comment xml:lang="sl">e-knjiga Mobipocket</comment> <comment xml:lang="sr">Мобипокет ел. књига</comment> @@ -15537,6 +16086,7 @@ <mime-type type="application/x-mif"> <comment>Adobe FrameMaker MIF document</comment> <comment xml:lang="ar">مستند أدوبي الصانع للإطارات MIF</comment> + <comment xml:lang="ast">Documentu MIF d'Adobe FrameMaker</comment> <comment xml:lang="be@latin">Dakument Adobe FrameMaker MIF</comment> <comment xml:lang="bg">Документ — Adobe FrameMaker MIF</comment> <comment xml:lang="ca">document MIF d'Adobe FrameMaker</comment> @@ -15573,7 +16123,7 @@ <comment xml:lang="pt">documento Adobe FrameMaker MIF</comment> <comment xml:lang="pt_BR">Documento MIF do Adobe FrameMaker</comment> <comment xml:lang="ro">Document Adobe FrameMaker MIF</comment> - <comment xml:lang="ru">документ Adobe FrameMaker MIF</comment> + <comment xml:lang="ru">Документ Adobe FrameMaker MIF</comment> <comment xml:lang="sk">Dokument Adobe FrameMaker MIF</comment> <comment xml:lang="sl">Dokument Adobe FrameMaker MIF</comment> <comment xml:lang="sq">Dokument MIF Adobe FrameMaker</comment> @@ -15606,7 +16156,7 @@ <comment xml:lang="ga">leabharmharcanna Mozilla</comment> <comment xml:lang="gl">Marcadores de Mozilla</comment> <comment xml:lang="he">סימניה של Mozilla</comment> - <comment xml:lang="hr">Mozilla knjižne oznake</comment> + <comment xml:lang="hr">Mozilla zabilješke</comment> <comment xml:lang="hu">Mozilla-könyvjelzők</comment> <comment xml:lang="ia">Marcapaginas Mozilla</comment> <comment xml:lang="id">Bookmark Mozilla</comment> @@ -15625,7 +16175,7 @@ <comment xml:lang="pt">marcadores do Mozilla</comment> <comment xml:lang="pt_BR">Favoritos do Mozilla</comment> <comment xml:lang="ro">Semne de carte Mozilla</comment> - <comment xml:lang="ru">закладки Mozilla</comment> + <comment xml:lang="ru">Закладки Mozilla</comment> <comment xml:lang="sk">Záložky Mozilla</comment> <comment xml:lang="sl">Datoteka zaznamkov Mozilla</comment> <comment xml:lang="sq">Libërshënues Mozilla</comment> @@ -15683,7 +16233,7 @@ <comment xml:lang="pt">executável DOS/Windows</comment> <comment xml:lang="pt_BR">Executável do DOS/Windows</comment> <comment xml:lang="ro">Executabil DOS/Windows</comment> - <comment xml:lang="ru">исполняемый файл DOS/Windows</comment> + <comment xml:lang="ru">Исполняемый файл DOS/Windows</comment> <comment xml:lang="sk">Spustiteľný súbor pre DOS/Windows</comment> <comment xml:lang="sl">Izvedljiva datoteka DOS/Windows</comment> <comment xml:lang="sq">I ekzekutueshëm DOS/Windows</comment> @@ -15741,7 +16291,7 @@ <comment xml:lang="sk">Internetový odkaz</comment> <comment xml:lang="sl">Internetna bližnjica</comment> <comment xml:lang="sq">Shkurtim internet</comment> - <comment xml:lang="sr">Интернет пречица</comment> + <comment xml:lang="sr">интернет пречица</comment> <comment xml:lang="sv">Internetgenväg</comment> <comment xml:lang="tr">İnternet kısayolu</comment> <comment xml:lang="uk">інтернет-посилання</comment> @@ -15759,6 +16309,7 @@ <mime-type type="application/x-mswrite"> <comment>WRI document</comment> <comment xml:lang="ar">مستند WRI</comment> + <comment xml:lang="ast">Documentu WRI</comment> <comment xml:lang="be@latin">Dakument WRI</comment> <comment xml:lang="bg">Документ — WRI</comment> <comment xml:lang="ca">document WRI</comment> @@ -15794,7 +16345,7 @@ <comment xml:lang="pt">documento WRI</comment> <comment xml:lang="pt_BR">Documento WRI</comment> <comment xml:lang="ro">Document WRI</comment> - <comment xml:lang="ru">документ WRI</comment> + <comment xml:lang="ru">Документ WRI</comment> <comment xml:lang="sk">Dokument WRI</comment> <comment xml:lang="sl">Dokument WRI</comment> <comment xml:lang="sq">Dokument WRI</comment> @@ -15847,7 +16398,7 @@ <comment xml:lang="oc">ROM MSX</comment> <comment xml:lang="pl">Plik ROM konsoli MSX</comment> <comment xml:lang="pt">ROM MSX</comment> - <comment xml:lang="pt_BR">ROM do MSX</comment> + <comment xml:lang="pt_BR">ROM de MSX</comment> <comment xml:lang="ro">ROM MSX</comment> <comment xml:lang="ru">MSX ROM</comment> <comment xml:lang="sk">ROM pre MSX</comment> @@ -15900,7 +16451,7 @@ <comment xml:lang="pt">macro M4</comment> <comment xml:lang="pt_BR">Macro M4</comment> <comment xml:lang="ro">Macro M4</comment> - <comment xml:lang="ru">макрос M4</comment> + <comment xml:lang="ru">Макрос M4</comment> <comment xml:lang="sk">Makro M4</comment> <comment xml:lang="sl">Makro datoteka M4</comment> <comment xml:lang="sq">Macro M4</comment> @@ -15952,7 +16503,7 @@ <comment xml:lang="oc">ROM Nintendo64</comment> <comment xml:lang="pl">Plik ROM konsoli Nintendo64</comment> <comment xml:lang="pt">ROM Nintendo64</comment> - <comment xml:lang="pt_BR">ROM do Nintendo64</comment> + <comment xml:lang="pt_BR">ROM de Nintendo64</comment> <comment xml:lang="ro">ROM Nintendo64</comment> <comment xml:lang="ru">Nintendo64 ROM</comment> <comment xml:lang="sk">ROM pre Nintendo64</comment> @@ -15963,7 +16514,7 @@ <comment xml:lang="tr">Nintendo64 ROM</comment> <comment xml:lang="uk">ППП Nintendo64</comment> <comment xml:lang="vi">ROM Nintendo64</comment> - <comment xml:lang="zh_CN">Nintendo64 ROM</comment> + <comment xml:lang="zh_CN">任天堂 64 ROM</comment> <comment xml:lang="zh_TW">Nintendo64 ROM</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.n64"/> @@ -16000,7 +16551,7 @@ <comment xml:lang="ga">nasc Nautilus</comment> <comment xml:lang="gl">ligazón de nautilus</comment> <comment xml:lang="he">קישור של Nautilus</comment> - <comment xml:lang="hr">Nautilus veza</comment> + <comment xml:lang="hr">Nautilusova poveznica</comment> <comment xml:lang="hu">Nautilus-link</comment> <comment xml:lang="ia">Ligamine Nautilus</comment> <comment xml:lang="id">Taut Nautilus</comment> @@ -16019,7 +16570,7 @@ <comment xml:lang="pt">atalho Nautilus</comment> <comment xml:lang="pt_BR">Link do Nautilus</comment> <comment xml:lang="ro">Legătură Nautilus</comment> - <comment xml:lang="ru">ссылка Nautilus</comment> + <comment xml:lang="ru">Ссылка Nautilus</comment> <comment xml:lang="sk">Odkaz Nautilus</comment> <comment xml:lang="sl">Datoteka povezave Nautilus</comment> <comment xml:lang="sq">Lidhje Nautilus</comment> @@ -16039,25 +16590,49 @@ <mime-type type="application/x-neo-geo-pocket-rom"> <comment>Neo-Geo Pocket ROM</comment> <comment xml:lang="ca">ROM de Neo-Geo Pocket</comment> + <comment xml:lang="cs">ROM pro Neo-Geo Pocket</comment> <comment xml:lang="da">Neo-Geo Pocket ROM</comment> <comment xml:lang="de">Neo-Geo Pocket ROM</comment> + <comment xml:lang="en_GB">Neo-Geo Pocket ROM</comment> <comment xml:lang="es">ROM de Neo-Geo Pocket</comment> + <comment xml:lang="eu">Neo-Geo Pocket ROM</comment> <comment xml:lang="fi">Neo-Geo Pocket -ROM</comment> <comment xml:lang="fr">ROM Neo-Geo Pocket</comment> + <comment xml:lang="ga">ROM Neo-Geo Pocket</comment> + <comment xml:lang="hr">Neo-Geo Pocket ROM</comment> <comment xml:lang="hu">Neo-Geo Pocket ROM</comment> + <comment xml:lang="id">ROM Neo-Geo Pocket</comment> + <comment xml:lang="it">ROM Neo-Geo Pocket</comment> <comment xml:lang="kk">Neo-Geo Pocket ROM</comment> <comment xml:lang="ko">네오지오 포켓 롬</comment> <comment xml:lang="pl">Plik ROM konsoli Neo-Geo Pocket</comment> <comment xml:lang="pt_BR">ROM de Neo-Geo Pocket</comment> <comment xml:lang="ru">Neo-Geo Pocket ROM</comment> <comment xml:lang="sk">ROM pre Neo-Geo Pocket</comment> + <comment xml:lang="sr">Нео-Гео Покет РОМ</comment> + <comment xml:lang="sv">Neo-Geo Pocket-rom</comment> + <comment xml:lang="tr">Neo-Geo Pocket ROM</comment> <comment xml:lang="uk">ППП Neo-Geo Pocket</comment> <comment xml:lang="zh_CN">Neo-Geo Pocket ROM</comment> <comment xml:lang="zh_TW">Neo-Geo Pocket ROM</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.ngp"/> <magic> - <match value="COPYRIGHT BY SNK CORPORATION" type="string" offset="0"/> + <match value="0x0" type="byte" offset="35"> + <match value="COPYRIGHT BY SNK CORPORATION" type="string" offset="0"/> + <match value=" LICENSED BY SNK CORPORATION" type="string" offset="0"/> + </match> + </magic> + </mime-type> + <mime-type type="application/x-neo-geo-pocket-color-rom"> + <comment>Neo-Geo Pocket Color ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.ngc"/> + <magic> + <match value="0x10" type="byte" offset="35"> + <match value="COPYRIGHT BY SNK CORPORATION" type="string" offset="0"/> + <match value=" LICENSED BY SNK CORPORATION" type="string" offset="0"/> + </match> </magic> </mime-type> <mime-type type="application/x-nes-rom"> @@ -16099,7 +16674,7 @@ <comment xml:lang="oc">ROM NES</comment> <comment xml:lang="pl">Plik ROM konsoli NES</comment> <comment xml:lang="pt">ROM NES</comment> - <comment xml:lang="pt_BR">ROM do NES</comment> + <comment xml:lang="pt_BR">ROM de NES</comment> <comment xml:lang="ro">ROM NES</comment> <comment xml:lang="ru">NES ROM</comment> <comment xml:lang="sk">ROM pre NES</comment> @@ -16121,6 +16696,7 @@ <mime-type type="application/x-netcdf"> <comment>Unidata NetCDF document</comment> <comment xml:lang="ar">مستند Unidata NetCDF</comment> + <comment xml:lang="ast">Documentu NetCDF d'Unidata</comment> <comment xml:lang="be@latin">Dakument Unidata NetCDF</comment> <comment xml:lang="bg">Документ — Unidata NetCDF</comment> <comment xml:lang="ca">document d'Unidata NetCDF</comment> @@ -16157,7 +16733,7 @@ <comment xml:lang="pt">documento Unidata NetCDF</comment> <comment xml:lang="pt_BR">Documento do Unidata NetCDF</comment> <comment xml:lang="ro">Document Unidata NetCDF</comment> - <comment xml:lang="ru">документ Unidata NetCDF</comment> + <comment xml:lang="ru">Документ Unidata NetCDF</comment> <comment xml:lang="sk">Dokument Unidata NetCDF</comment> <comment xml:lang="sl">Dokument Unidata NetCDF</comment> <comment xml:lang="sq">Dokument Unidata NetCDF</comment> @@ -16186,6 +16762,7 @@ <comment xml:lang="es">índice NewzBin de usenet</comment> <comment xml:lang="eu">NewzBin usenet indizea</comment> <comment xml:lang="fr">index usenet </comment> + <comment xml:lang="ga">innéacs usenet NewzBin</comment> <comment xml:lang="gl">Índice de usenet NEwzBin</comment> <comment xml:lang="he">אינדקס שרתי חדשות NewzBin</comment> <comment xml:lang="hr">NewzBin usenet indeks</comment> @@ -16202,14 +16779,14 @@ <comment xml:lang="pl">Indeks grup dyskusyjnych NewzBin</comment> <comment xml:lang="pt">índice usenet NewzBin</comment> <comment xml:lang="pt_BR">Índice de usenet NewzBin</comment> - <comment xml:lang="ru">индекс usenet NewzBin</comment> + <comment xml:lang="ru">Индекс usenet NewzBin</comment> <comment xml:lang="sk">Index Usenetu NewzBin</comment> <comment xml:lang="sl">Kazalo usenet NewzBin</comment> <comment xml:lang="sr">Њузбин попис јузнета</comment> <comment xml:lang="sv">NewzBin-usenetindex</comment> <comment xml:lang="tr">NewzBin usenet dizini</comment> <comment xml:lang="uk">покажчик usenet NewzBin</comment> - <comment xml:lang="zh_CN">NewzBin usenet 索引</comment> + <comment xml:lang="zh_CN">NewzBin Usenet 索引</comment> <comment xml:lang="zh_TW">NewzBin usenet 索引</comment> <sub-class-of type="application/xml"/> <magic priority="80"> @@ -16236,10 +16813,10 @@ <comment xml:lang="ga">cód réada</comment> <comment xml:lang="gl">código obxecto</comment> <comment xml:lang="he">קוד אובייקט</comment> - <comment xml:lang="hr">kod objekta</comment> + <comment xml:lang="hr">Object kôd</comment> <comment xml:lang="hu">tárgykód</comment> <comment xml:lang="ia">Codice objecto</comment> - <comment xml:lang="id">kode object</comment> + <comment xml:lang="id">kode objek</comment> <comment xml:lang="it">Codice oggetto</comment> <comment xml:lang="ja">オブジェクトコード</comment> <comment xml:lang="kk">объектті коды</comment> @@ -16255,7 +16832,7 @@ <comment xml:lang="pt">código de objeto</comment> <comment xml:lang="pt_BR">Código-objeto</comment> <comment xml:lang="ro">cod sursă obiect</comment> - <comment xml:lang="ru">объектный код</comment> + <comment xml:lang="ru">Объектный код</comment> <comment xml:lang="sk">Objektový kód</comment> <comment xml:lang="sl">predmetna koda</comment> <comment xml:lang="sq">Kod objekti</comment> @@ -16299,7 +16876,7 @@ <comment xml:lang="ga">formáid mhalairte Annodex</comment> <comment xml:lang="gl">formato intercambiábel de Annodex</comment> <comment xml:lang="he">תבנית החלפת Annodex</comment> - <comment xml:lang="hr">Annodex oblik za razmjenu</comment> + <comment xml:lang="hr">Annodex format razmjene</comment> <comment xml:lang="hu">Annodex csereformátum</comment> <comment xml:lang="ia">Formato de excambio Annodex</comment> <comment xml:lang="id">Format pertukaran Annodex</comment> @@ -16316,7 +16893,7 @@ <comment xml:lang="pt">formato de troca Annodex</comment> <comment xml:lang="pt_BR">Formato de troca Annodex</comment> <comment xml:lang="ro">Format schimb Annodex</comment> - <comment xml:lang="ru">формат обмена Annodex</comment> + <comment xml:lang="ru">Формат обмена Annodex</comment> <comment xml:lang="sk">Formát pre výmenu Annodex</comment> <comment xml:lang="sl">Izmenjalna datoteka Annodex</comment> <comment xml:lang="sr">Анодексов запис размене</comment> @@ -16340,6 +16917,7 @@ <mime-type type="video/annodex"> <comment>Annodex Video</comment> <comment xml:lang="ar">Annodex مرئي</comment> + <comment xml:lang="ast">Videu n'Annodex</comment> <comment xml:lang="bg">Видео — Annodex</comment> <comment xml:lang="ca">Annodex Video</comment> <comment xml:lang="cs">video Annodex</comment> @@ -16353,10 +16931,10 @@ <comment xml:lang="fi">Annodex-video</comment> <comment xml:lang="fo">Annodex video</comment> <comment xml:lang="fr">vidéo Annodex</comment> - <comment xml:lang="ga">físeán Annodex</comment> + <comment xml:lang="ga">Físeán Annodex</comment> <comment xml:lang="gl">vídeo de Annodex</comment> <comment xml:lang="he">וידאו Annodex</comment> - <comment xml:lang="hr">Annodex Video</comment> + <comment xml:lang="hr">Annodex video snimka</comment> <comment xml:lang="hu">Annodex videó</comment> <comment xml:lang="ia">Video Annodex</comment> <comment xml:lang="id">Video Annodex</comment> @@ -16373,7 +16951,7 @@ <comment xml:lang="pt">vídeo Annodex</comment> <comment xml:lang="pt_BR">Vídeo Annodex</comment> <comment xml:lang="ro">Video Annodex</comment> - <comment xml:lang="ru">видео Annodex</comment> + <comment xml:lang="ru">Видео Annodex</comment> <comment xml:lang="sk">Video Annodex</comment> <comment xml:lang="sl">Video datoteka Annodex</comment> <comment xml:lang="sr">Анодекс видео</comment> @@ -16410,10 +16988,10 @@ <comment xml:lang="fi">Annodex-ääni</comment> <comment xml:lang="fo">Annodex ljóður</comment> <comment xml:lang="fr">audio Annodex</comment> - <comment xml:lang="ga">fuaim Annodex</comment> + <comment xml:lang="ga">Fuaim Annodex</comment> <comment xml:lang="gl">son de Annodex</comment> <comment xml:lang="he">שמע Annodex</comment> - <comment xml:lang="hr">Annodex Audio</comment> + <comment xml:lang="hr">Annodex zvučni zapis</comment> <comment xml:lang="hu">Annodex hang</comment> <comment xml:lang="ia">Audio Annodex</comment> <comment xml:lang="id">Audio Annodex</comment> @@ -16430,7 +17008,7 @@ <comment xml:lang="pt">áudio Annodex</comment> <comment xml:lang="pt_BR">Áudio Annodex</comment> <comment xml:lang="ro">Audio Annodex</comment> - <comment xml:lang="ru">аудио Annodex</comment> + <comment xml:lang="ru">Аудио Annodex</comment> <comment xml:lang="sk">Zvuk Annodex</comment> <comment xml:lang="sl">Zvočna datoteka Annodex</comment> <comment xml:lang="sr">Анодекс аудио</comment> @@ -16489,7 +17067,7 @@ <comment xml:lang="pt">ficheiro multimédia Ogg</comment> <comment xml:lang="pt_BR">Arquivo multimídia Ogg</comment> <comment xml:lang="ro">Fișier multimedia Ogg</comment> - <comment xml:lang="ru">мультимедийный файл Ogg</comment> + <comment xml:lang="ru">Мультимедийный файл Ogg</comment> <comment xml:lang="sk">Súbor multimédií Ogg</comment> <comment xml:lang="sl">Večpredstavnostna datoteka Ogg</comment> <comment xml:lang="sq">File multimedial Ogg</comment> @@ -16523,7 +17101,7 @@ <comment xml:lang="fi">Ogg-ääni</comment> <comment xml:lang="fo">Ogg ljóður</comment> <comment xml:lang="fr">audio Ogg</comment> - <comment xml:lang="ga">fuaim Ogg</comment> + <comment xml:lang="ga">Fuaim Ogg</comment> <comment xml:lang="gl">son Ogg</comment> <comment xml:lang="he">שמע Ogg</comment> <comment xml:lang="hr">Ogg zvučni zapis</comment> @@ -16545,7 +17123,7 @@ <comment xml:lang="pt">áudio Ogg</comment> <comment xml:lang="pt_BR">Áudio Ogg</comment> <comment xml:lang="ro">Audio Ogg</comment> - <comment xml:lang="ru">аудио Ogg</comment> + <comment xml:lang="ru">Аудио Ogg</comment> <comment xml:lang="sk">Zvuk Ogg</comment> <comment xml:lang="sl">Zvočna datoteka Ogg</comment> <comment xml:lang="sq">Audio Ogg</comment> @@ -16568,6 +17146,7 @@ <mime-type type="video/ogg"> <comment>Ogg Video</comment> <comment xml:lang="ar">Ogg مرئي</comment> + <comment xml:lang="ast">Videu n'Ogg</comment> <comment xml:lang="be@latin">Videa Ogg</comment> <comment xml:lang="bg">Видео — Ogg</comment> <comment xml:lang="ca">vídeo Ogg</comment> @@ -16581,7 +17160,7 @@ <comment xml:lang="fi">Ogg-video</comment> <comment xml:lang="fo">Ogg Video</comment> <comment xml:lang="fr">vidéo Ogg</comment> - <comment xml:lang="ga">físeán Ogg</comment> + <comment xml:lang="ga">Físeán Ogg</comment> <comment xml:lang="gl">vídeo Ogg</comment> <comment xml:lang="he">וידאו Ogg</comment> <comment xml:lang="hr">Ogg video snimka</comment> @@ -16603,7 +17182,7 @@ <comment xml:lang="pt">vídeo Ogg</comment> <comment xml:lang="pt_BR">Vídeo Ogg</comment> <comment xml:lang="ro">Video Ogg</comment> - <comment xml:lang="ru">видео Ogg</comment> + <comment xml:lang="ru">Видео Ogg</comment> <comment xml:lang="sk">Video Ogg</comment> <comment xml:lang="sl">Video datoteka Ogg</comment> <comment xml:lang="sq">Video Ogg</comment> @@ -16664,7 +17243,7 @@ <comment xml:lang="pt">áudio Ogg Vorbis</comment> <comment xml:lang="pt_BR">Áudio Ogg Vorbis</comment> <comment xml:lang="ro">Audio Ogg Vorbis</comment> - <comment xml:lang="ru">аудио Ogg Vorbis</comment> + <comment xml:lang="ru">Аудио Ogg Vorbis</comment> <comment xml:lang="sk">Zvuk Ogg Vorbis</comment> <comment xml:lang="sl">Zvočna datoteka Ogg Vorbis</comment> <comment xml:lang="sq">Audio Ogg Vorbis</comment> @@ -16724,7 +17303,7 @@ <comment xml:lang="pt">áudio Ogg FLAC</comment> <comment xml:lang="pt_BR">Áudio Ogg FLAC</comment> <comment xml:lang="ro">Audio Ogg FLAC</comment> - <comment xml:lang="ru">аудио Ogg FLAC</comment> + <comment xml:lang="ru">Аудио Ogg FLAC</comment> <comment xml:lang="sk">Zvuk Ogg FLAC</comment> <comment xml:lang="sl">Zvočna datoteka Ogg FLAC</comment> <comment xml:lang="sq">Audio Ogg FLAC</comment> @@ -16760,6 +17339,7 @@ <comment xml:lang="eu">Opus audioa</comment> <comment xml:lang="fi">Opus-ääni</comment> <comment xml:lang="fr">audio Opus</comment> + <comment xml:lang="ga">fuaim Opus</comment> <comment xml:lang="gl">Son Opus</comment> <comment xml:lang="he">שמע Opus</comment> <comment xml:lang="hr">Opus zvučni zapis</comment> @@ -16828,7 +17408,7 @@ <comment xml:lang="pt">áudio Ogg Speex</comment> <comment xml:lang="pt_BR">Áudio Ogg Speex</comment> <comment xml:lang="ro">Audio Ogg Speex</comment> - <comment xml:lang="ru">аудио Ogg Speex</comment> + <comment xml:lang="ru">Аудио Ogg Speex</comment> <comment xml:lang="sk">Zvuk Ogg Speex</comment> <comment xml:lang="sl">Zvočna datoteka Ogg Speex</comment> <comment xml:lang="sq">Audio Ogg Speex</comment> @@ -16867,7 +17447,7 @@ <comment xml:lang="ga">fuaim Speex</comment> <comment xml:lang="gl">son Speex</comment> <comment xml:lang="he">שמע של Speex</comment> - <comment xml:lang="hr">Speex audio</comment> + <comment xml:lang="hr">Speex zvučni zapis</comment> <comment xml:lang="hu">Speex hang</comment> <comment xml:lang="ia">Audio Speex</comment> <comment xml:lang="id">Audio Speex</comment> @@ -16885,7 +17465,7 @@ <comment xml:lang="pt">áudio Speex</comment> <comment xml:lang="pt_BR">Áudio Speex</comment> <comment xml:lang="ro">Audio Speex</comment> - <comment xml:lang="ru">аудио Speex</comment> + <comment xml:lang="ru">Аудио Speex</comment> <comment xml:lang="sk">Zvuk Speex</comment> <comment xml:lang="sl">Zvočna datoteka Speex</comment> <comment xml:lang="sq">Audio Speex</comment> @@ -16904,6 +17484,7 @@ <mime-type type="video/x-theora+ogg"> <comment>Ogg Theora video</comment> <comment xml:lang="ar">Ogg Theora مرئي</comment> + <comment xml:lang="ast">Videu n'Ogg Theora</comment> <comment xml:lang="be@latin">Videa Ogg Theora</comment> <comment xml:lang="bg">Видео — Ogg Theora</comment> <comment xml:lang="ca">vídeo Ogg Theora</comment> @@ -16939,7 +17520,7 @@ <comment xml:lang="pt">vídeo Ogg Theora</comment> <comment xml:lang="pt_BR">Vídeo Ogg Theora</comment> <comment xml:lang="ro">Video Ogg Theora</comment> - <comment xml:lang="ru">видео Ogg Theora</comment> + <comment xml:lang="ru">Видео Ogg Theora</comment> <comment xml:lang="sk">Video Ogg Theora</comment> <comment xml:lang="sl">Video datoteka Ogg Theora</comment> <comment xml:lang="sq">Video Ogg Theora</comment> @@ -16962,6 +17543,7 @@ <mime-type type="video/x-ogm+ogg"> <comment>OGM video</comment> <comment xml:lang="ar">OGM مرئي</comment> + <comment xml:lang="ast">Videu n'OGM</comment> <comment xml:lang="be@latin">Videa OGM</comment> <comment xml:lang="bg">Видео — OGM</comment> <comment xml:lang="ca">vídeo OGM</comment> @@ -16979,7 +17561,7 @@ <comment xml:lang="ga">físeán OGM</comment> <comment xml:lang="gl">vídeo OGM</comment> <comment xml:lang="he">וידאו OGM</comment> - <comment xml:lang="hr">OGM video</comment> + <comment xml:lang="hr">OGM video snimka</comment> <comment xml:lang="hu">OGM-videó</comment> <comment xml:lang="ia">Video OGM</comment> <comment xml:lang="id">Video OGM</comment> @@ -16998,7 +17580,7 @@ <comment xml:lang="pt">vídeo OGM</comment> <comment xml:lang="pt_BR">Vídeo OGM</comment> <comment xml:lang="ro">Video OGM</comment> - <comment xml:lang="ru">видео OGM</comment> + <comment xml:lang="ru">Видео OGM</comment> <comment xml:lang="sk">Video OGM</comment> <comment xml:lang="sl">Video datoteka OGM</comment> <comment xml:lang="sq">Video OGM</comment> @@ -17022,6 +17604,7 @@ <mime-type type="application/x-ole-storage"> <comment>OLE2 compound document storage</comment> <comment xml:lang="ar">تخزين مجمع مستند OLE2</comment> + <comment xml:lang="ast">Almacenamientu de documentos compuestu por OLE2</comment> <comment xml:lang="be@latin">Schovišča dla kampanentaŭ dakumentu OLE2</comment> <comment xml:lang="bg">Съставен документ-хранилище — OLE2</comment> <comment xml:lang="ca">emmagatzematge de documents compostos OLE2</comment> @@ -17036,7 +17619,7 @@ <comment xml:lang="fi">OLE2-yhdisteasiakirjatallenne</comment> <comment xml:lang="fo">OLE2 samansett skjalagoymsla</comment> <comment xml:lang="fr">document de stockage composé OLE2</comment> - <comment xml:lang="ga">stóras cháipéisí comhshuite OLE2</comment> + <comment xml:lang="ga">stóras cáipéisí comhshuite OLE2</comment> <comment xml:lang="gl">almacenamento de documento composto OLE2</comment> <comment xml:lang="he">אחסון מסמך משותף OLE2</comment> <comment xml:lang="hr">OLE2 pohrana složenog dokumenta</comment> @@ -17058,7 +17641,7 @@ <comment xml:lang="pt">armazenamento de documento composto OLE2</comment> <comment xml:lang="pt_BR">Armazenamento de documento composto OLE2</comment> <comment xml:lang="ro">Document de stocare compus OLE2</comment> - <comment xml:lang="ru">хранилище составных документов OLE2</comment> + <comment xml:lang="ru">Хранилище составных документов OLE2</comment> <comment xml:lang="sk">Úložisko zloženého dokumentu OLE2</comment> <comment xml:lang="sl">Združeni dokument OLE2</comment> <comment xml:lang="sq">Arkiv dokumenti i përbërë OLE2</comment> @@ -17077,6 +17660,7 @@ </mime-type> <mime-type type="application/vnd.ms-publisher"> <comment>Microsoft Publisher document</comment> + <comment xml:lang="ast">Documentu de Microsoft Publisher</comment> <comment xml:lang="ca">document de Microsoft Publisher</comment> <comment xml:lang="cs">dokument Microsoft Publisher</comment> <comment xml:lang="da">Microsoft Publisher-dokument</comment> @@ -17087,6 +17671,7 @@ <comment xml:lang="eu">Microsoft Publisher dokumentua</comment> <comment xml:lang="fi">Microsoft Publisher -asiakirja</comment> <comment xml:lang="fr">document Microsoft Publisher</comment> + <comment xml:lang="ga">cáipéis Microsoft Publisher</comment> <comment xml:lang="gl">Documento de Microsoft Publisher</comment> <comment xml:lang="he">מסמך Microsoft Publisher</comment> <comment xml:lang="hr">Microsoft Publisher dokument</comment> @@ -17131,7 +17716,7 @@ <comment xml:lang="ga">pacáiste Windows Installer</comment> <comment xml:lang="gl">paquete de instalación de Windows</comment> <comment xml:lang="he">חבילה של Windows Installer</comment> - <comment xml:lang="hr">Windows Installer paket</comment> + <comment xml:lang="hr">Windows Instalacijski paket</comment> <comment xml:lang="hu">Windows Installer csomag</comment> <comment xml:lang="ia">Pacchetto Windows Installer</comment> <comment xml:lang="id">Paket Windows Installer</comment> @@ -17148,7 +17733,7 @@ <comment xml:lang="pt">pacote de instalação Windows</comment> <comment xml:lang="pt_BR">Pacote do Windows Installer</comment> <comment xml:lang="ro">Pachet instalator Windows</comment> - <comment xml:lang="ru">пакет Windows Installer</comment> + <comment xml:lang="ru">Пакет Windows Installer</comment> <comment xml:lang="sk">Balík Windows Installer</comment> <comment xml:lang="sl">Datoteka paketa Windows namestilnika</comment> <comment xml:lang="sq">Paketë Windows Installer</comment> @@ -17202,7 +17787,7 @@ <comment xml:lang="pt">folha de cálculo GNU Oleo</comment> <comment xml:lang="pt_BR">Planilha do GNU Oleo</comment> <comment xml:lang="ro">Foaie de calcul GNU Oleo</comment> - <comment xml:lang="ru">электронная таблица GNU Oleo</comment> + <comment xml:lang="ru">Электронная таблица GNU Oleo</comment> <comment xml:lang="sk">Zošit GNU Oleo</comment> <comment xml:lang="sl">Preglednica GNU Oleo</comment> <comment xml:lang="sq">Fletë llogaritje GNU Oleo</comment> @@ -17211,7 +17796,7 @@ <comment xml:lang="tr">GNU Oleo çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця GNU Oleo</comment> <comment xml:lang="vi">Bảng tính Oleo của GNU</comment> - <comment xml:lang="zh_CN">GNU Oleo 工作簿</comment> + <comment xml:lang="zh_CN">GNU Oleo 电子表格</comment> <comment xml:lang="zh_TW">GNU Oleo 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -17258,7 +17843,7 @@ <comment xml:lang="pt">arquivo PAK</comment> <comment xml:lang="pt_BR">Pacote PAK</comment> <comment xml:lang="ro">Arhivă PAK</comment> - <comment xml:lang="ru">архив PAK</comment> + <comment xml:lang="ru">Архив PAK</comment> <comment xml:lang="sk">Archív PAK</comment> <comment xml:lang="sl">Datoteka arhiva PAK</comment> <comment xml:lang="sq">Arkiv PAK</comment> @@ -17267,7 +17852,7 @@ <comment xml:lang="tr">PAK arşivi</comment> <comment xml:lang="uk">архів PAK</comment> <comment xml:lang="vi">Kho nén PAK</comment> - <comment xml:lang="zh_CN">AR 归档文件</comment> + <comment xml:lang="zh_CN">PAK 归档文件</comment> <comment xml:lang="zh_TW">PAK 封存檔</comment> <generic-icon name="package-x-generic"/> <magic priority="80"> @@ -17316,7 +17901,7 @@ <comment xml:lang="pt">base de dados Palm OS</comment> <comment xml:lang="pt_BR">Banco de dados do Palm OS</comment> <comment xml:lang="ro">Bază de date Palm OS</comment> - <comment xml:lang="ru">база данных Palm OS</comment> + <comment xml:lang="ru">База данных Palm OS</comment> <comment xml:lang="sk">Databáza Palm OS</comment> <comment xml:lang="sl">Podatkovna zbirka Palm OS</comment> <comment xml:lang="sq">Bankë me të dhëna Palm OS</comment> @@ -17370,7 +17955,7 @@ <comment xml:lang="pt">arquivo Parchive</comment> <comment xml:lang="pt_BR">Pacote Parchive</comment> <comment xml:lang="ro">Arhivă Parchive</comment> - <comment xml:lang="ru">архив Parchive</comment> + <comment xml:lang="ru">Архив Parchive</comment> <comment xml:lang="sk">Archív Parchive</comment> <comment xml:lang="sl">Datoteka arhiva Parchive</comment> <comment xml:lang="sq">Arkiv Parchive</comment> @@ -17429,7 +18014,7 @@ <comment xml:lang="pt">executável PEF</comment> <comment xml:lang="pt_BR">Executável PEF</comment> <comment xml:lang="ro">Executabil PEF</comment> - <comment xml:lang="ru">исполняемый файл PEF</comment> + <comment xml:lang="ru">Исполняемый файл PEF</comment> <comment xml:lang="sk">Spustiteľný súbor PEF</comment> <comment xml:lang="sl">Izvedljiva datoteka PEF</comment> <comment xml:lang="sq">E ekzekutueshme PEF</comment> @@ -17485,7 +18070,7 @@ <comment xml:lang="pt">script Perl</comment> <comment xml:lang="pt_BR">Script Perl</comment> <comment xml:lang="ro">Script Perl</comment> - <comment xml:lang="ru">сценарий Perl</comment> + <comment xml:lang="ru">Сценарий Perl</comment> <comment xml:lang="sk">Skript jazyka Perl</comment> <comment xml:lang="sl">Skriptna datoteka Perl</comment> <comment xml:lang="sq">Script Perl</comment> @@ -17499,6 +18084,7 @@ <sub-class-of type="application/x-executable"/> <sub-class-of type="text/plain"/> <generic-icon name="text-x-script"/> + <alias type="text/x-perl"/> <magic priority="50"> <match value='eval \"exec /usr/local/bin/perl' type="string" offset="0"/> <match value="/bin/perl" type="string" offset="2:16"/> @@ -17563,7 +18149,7 @@ <comment xml:lang="pt">script PHP</comment> <comment xml:lang="pt_BR">Script PHP</comment> <comment xml:lang="ro">Script PHP</comment> - <comment xml:lang="ru">сценарий PHP</comment> + <comment xml:lang="ru">Сценарий PHP</comment> <comment xml:lang="sk">Skript PHP</comment> <comment xml:lang="sl">Skriptna datoteka PHP</comment> <comment xml:lang="sq">Script PHP</comment> @@ -17600,7 +18186,7 @@ <comment xml:lang="fi">PKCS#7-varmennenippu</comment> <comment xml:lang="fo">PKCS#7 váttanar bundi</comment> <comment xml:lang="fr">lot de certificats PKCS#7</comment> - <comment xml:lang="ga">cuach theastas PKCS#7</comment> + <comment xml:lang="ga">burla teastas PKCS#7</comment> <comment xml:lang="gl">paquete de certificado PKCS#7</comment> <comment xml:lang="he">בקשה מוסמכת PKCS#7</comment> <comment xml:lang="hr">PKCS#7 paket vjerodajnica</comment> @@ -17619,7 +18205,7 @@ <comment xml:lang="pt">pacote de certificação PKCS#7</comment> <comment xml:lang="pt_BR">Pacote de certificados PKCS#7</comment> <comment xml:lang="ro">Pachet certificat PKCS#7</comment> - <comment xml:lang="ru">пакет сертификатов PKCS#7</comment> + <comment xml:lang="ru">Пакет сертификата PKCS#7</comment> <comment xml:lang="sk">Zväzok certifikátov PKCS#7</comment> <comment xml:lang="sl">Datoteka potrdila PKCS#7</comment> <comment xml:lang="sr">ПКЦС#7 пакет уверења</comment> @@ -17651,7 +18237,7 @@ <comment xml:lang="fi">PKCS#12-varmennenippu</comment> <comment xml:lang="fo">PKCS#12 váttanar bundi</comment> <comment xml:lang="fr">lot de certificats PKCS#12</comment> - <comment xml:lang="ga">cuach theastas PKCS#12</comment> + <comment xml:lang="ga">burla teastas PKCS#12</comment> <comment xml:lang="gl">paquete de certificado PKCS#12</comment> <comment xml:lang="he">בקשה מוסמכת PKCS#12</comment> <comment xml:lang="hr">PKCS#12 paket vjerodajnica</comment> @@ -17673,7 +18259,7 @@ <comment xml:lang="pt">pacote de certificação PKCS#12</comment> <comment xml:lang="pt_BR">Pacote de certificados PKCS#12</comment> <comment xml:lang="ro">Certificat împachetat PKCS#12</comment> - <comment xml:lang="ru">пакет сертификатов PKCS#12</comment> + <comment xml:lang="ru">Пакет сертификата PKCS#12</comment> <comment xml:lang="sk">Zväzok certifikátov PKCS#12</comment> <comment xml:lang="sl">Datoteka potrdila PKCS#12</comment> <comment xml:lang="sq">Bundle çertifikate PKCS#12</comment> @@ -17727,7 +18313,7 @@ <comment xml:lang="pt">folha de cálculo PlanPerfect</comment> <comment xml:lang="pt_BR">Planilha do PlanPerfect</comment> <comment xml:lang="ro">Foaie de calcul PlanPerfect</comment> - <comment xml:lang="ru">электронная таблица PlanPerfect</comment> + <comment xml:lang="ru">Электронная таблица PlanPerfect</comment> <comment xml:lang="sk">Zošit PlanPerfect</comment> <comment xml:lang="sl">Preglednica PlanPerfect</comment> <comment xml:lang="sq">Fletë llogaritjesh PlanPerfect</comment> @@ -17736,7 +18322,7 @@ <comment xml:lang="tr">PlanPerfect çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця PlanPerfect</comment> <comment xml:lang="vi">Bảng tính PlanPerfect</comment> - <comment xml:lang="zh_CN">PlanPerfect 工作簿</comment> + <comment xml:lang="zh_CN">PlanPerfect 电子表格</comment> <comment xml:lang="zh_TW">PlanPerfect 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.pln"/> @@ -17744,6 +18330,7 @@ <mime-type type="application/x-pocket-word"> <comment>Pocket Word document</comment> <comment xml:lang="ar">مستند Pocket Word</comment> + <comment xml:lang="ast">Documentu de PocketWord</comment> <comment xml:lang="bg">Документ — Pocket Word</comment> <comment xml:lang="ca">document de Pocket Word</comment> <comment xml:lang="cs">dokument Pocket Word</comment> @@ -17775,7 +18362,7 @@ <comment xml:lang="pt">documento Pocket Word</comment> <comment xml:lang="pt_BR">Documento do Pocket Word</comment> <comment xml:lang="ro">Document Pocket Word</comment> - <comment xml:lang="ru">документ Pocket Word</comment> + <comment xml:lang="ru">Документ Pocket Word</comment> <comment xml:lang="sk">Dokument Pocket Word</comment> <comment xml:lang="sl">Dokument Pocket Word</comment> <comment xml:lang="sr">документ Покет Ворда</comment> @@ -17831,7 +18418,7 @@ <comment xml:lang="pt">resultados de análise de perfil</comment> <comment xml:lang="pt_BR">Resultados do profiler</comment> <comment xml:lang="ro">rezultate profiler</comment> - <comment xml:lang="ru">результаты профилирования</comment> + <comment xml:lang="ru">Результаты профилирования</comment> <comment xml:lang="sk">Výsledky profilera</comment> <comment xml:lang="sl">rezultati profilirnika</comment> <comment xml:lang="sq">Rezultate të profiluesit</comment> @@ -17840,7 +18427,7 @@ <comment xml:lang="tr">profil sonuçları</comment> <comment xml:lang="uk">результати профілювання</comment> <comment xml:lang="vi">kết quả nét hiện trạng</comment> - <comment xml:lang="zh_CN">profiler 结果</comment> + <comment xml:lang="zh_CN">探查器结果</comment> <comment xml:lang="zh_TW">硬體資訊產生器成果</comment> <sub-class-of type="text/plain"/> <generic-icon name="text-x-generic"/> @@ -17849,6 +18436,7 @@ <mime-type type="application/x-pw"> <comment>Pathetic Writer document</comment> <comment xml:lang="ar">مستند Pathetic Writer</comment> + <comment xml:lang="ast">Documentu de Pathetic Writer</comment> <comment xml:lang="be@latin">Dakument Pathetic Writer</comment> <comment xml:lang="bg">Документ — Pathetic Writer</comment> <comment xml:lang="ca">document de Pathetic Writer</comment> @@ -17885,7 +18473,7 @@ <comment xml:lang="pt">documento do Pathetic Writer</comment> <comment xml:lang="pt_BR">Documento do Pathetic Writer</comment> <comment xml:lang="ro">Document Pathetic Writer</comment> - <comment xml:lang="ru">документ Pathetic Writer</comment> + <comment xml:lang="ru">Документ Pathetic Writer</comment> <comment xml:lang="sk">Dokument Pathetic Writer</comment> <comment xml:lang="sl">Dokument Pathetic Writer</comment> <comment xml:lang="sq">Dokument Pathetic Writer</comment> @@ -17940,7 +18528,7 @@ <comment xml:lang="pt">código binário Python</comment> <comment xml:lang="pt_BR">Código compilado Python</comment> <comment xml:lang="ro">Bytecode Python</comment> - <comment xml:lang="ru">байт-код Python</comment> + <comment xml:lang="ru">Байт-код Python</comment> <comment xml:lang="sk">Bajtový kód Python</comment> <comment xml:lang="sl">Datoteka bitne kode Python</comment> <comment xml:lang="sq">Bytecode Python</comment> @@ -17959,6 +18547,7 @@ </mime-type> <mime-type type="application/x-qtiplot"> <comment>QtiPlot document</comment> + <comment xml:lang="ast">Documentu de QtiPlot</comment> <comment xml:lang="ca">document QtiPlot</comment> <comment xml:lang="cs">dokument GtiPlot</comment> <comment xml:lang="da">QtiPlot-dokument</comment> @@ -17969,6 +18558,7 @@ <comment xml:lang="eu">QtiPlot dokumentua</comment> <comment xml:lang="fi">QtiPlot-asiakirja</comment> <comment xml:lang="fr">document QtiPlot</comment> + <comment xml:lang="ga">cáipéis QtiPlot</comment> <comment xml:lang="gl">Documento de QtiPilot</comment> <comment xml:lang="he">מסמך QtiPlot</comment> <comment xml:lang="hr">QtiPlot dokument</comment> @@ -17984,7 +18574,7 @@ <comment xml:lang="pl">Dokument QtiPlot</comment> <comment xml:lang="pt">documento QtiPlot</comment> <comment xml:lang="pt_BR">Documento do QtiPlot</comment> - <comment xml:lang="ru">документ QtiPlot</comment> + <comment xml:lang="ru">Документ QtiPlot</comment> <comment xml:lang="sk">Dokument QtiPlot</comment> <comment xml:lang="sl">Dokument QtiPlot</comment> <comment xml:lang="sr">КутиПлот документ</comment> @@ -18040,7 +18630,7 @@ <comment xml:lang="pt">folha de cálculo Quattro Pro</comment> <comment xml:lang="pt_BR">Planilha do Quattro Pro</comment> <comment xml:lang="ro">Foaie de calcul Quattro Pro</comment> - <comment xml:lang="ru">электронная таблица Quattro Pro</comment> + <comment xml:lang="ru">Электронная таблица Quattro Pro</comment> <comment xml:lang="sk">Zošit Quattro Pro</comment> <comment xml:lang="sl">Preglednica Quattro Pro</comment> <comment xml:lang="sq">Fletë llogaritjesh Quattro Pro</comment> @@ -18049,7 +18639,7 @@ <comment xml:lang="tr">Quattro Pro çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Quattro Pro</comment> <comment xml:lang="vi">Bảng tính Quattro Pro</comment> - <comment xml:lang="zh_CN">Quattro Pro 工作簿</comment> + <comment xml:lang="zh_CN">Quattro Pro 电子表格</comment> <comment xml:lang="zh_TW">Quattro Pro 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.wb1"/> @@ -18093,7 +18683,7 @@ <comment xml:lang="pt">lista de reprodução QuickTime metalink</comment> <comment xml:lang="pt_BR">Lista de reprodução metalink do QuickTime</comment> <comment xml:lang="ro">Listă cu metalegături QuickTime</comment> - <comment xml:lang="ru">список воспроизведения мета-ссылок QuickTime</comment> + <comment xml:lang="ru">Список воспроизведения мета-ссылок QuickTime</comment> <comment xml:lang="sk">Zoznam skladieb metalink QuickTime</comment> <comment xml:lang="sl">Seznam predvajanja QuickTime</comment> <comment xml:lang="sq">Listë titujsh metalink QuickTime</comment> @@ -18102,7 +18692,7 @@ <comment xml:lang="tr">QuickTime metalink çalma listesi</comment> <comment xml:lang="uk">список відтворення QuickTime metalink</comment> <comment xml:lang="vi">Danh mục nhạc siêu liên kết Quicktime</comment> - <comment xml:lang="zh_CN">QuickTime 元链接播放列表</comment> + <comment xml:lang="zh_CN">QuickTime Metalink 播放列表</comment> <comment xml:lang="zh_TW">QuickTime metalink 播放清單</comment> <generic-icon name="video-x-generic"/> <sub-class-of type="video/quicktime"/> @@ -18120,6 +18710,7 @@ <mime-type type="application/x-qw"> <comment>Quicken document</comment> <comment xml:lang="ar">مستند Quicken</comment> + <comment xml:lang="ast">Documentu de Quicken</comment> <comment xml:lang="az">Quicken sənədi</comment> <comment xml:lang="be@latin">Dakument Quicken</comment> <comment xml:lang="bg">Документ — Quicken</comment> @@ -18158,7 +18749,7 @@ <comment xml:lang="pt">documento Quicken</comment> <comment xml:lang="pt_BR">Documento do Quicken</comment> <comment xml:lang="ro">Document Quicken</comment> - <comment xml:lang="ru">документ Quicken</comment> + <comment xml:lang="ru">Документ Quicken</comment> <comment xml:lang="sk">Dokument Quicken</comment> <comment xml:lang="sl">Dokument Quicken</comment> <comment xml:lang="sq">Dokument Quicken</comment> @@ -18212,7 +18803,7 @@ <comment xml:lang="pt">arquivo RAR</comment> <comment xml:lang="pt_BR">Pacote RAR</comment> <comment xml:lang="ro">Arhivă RAR</comment> - <comment xml:lang="ru">архив RAR</comment> + <comment xml:lang="ru">Архив RAR</comment> <comment xml:lang="sk">Archív RAR</comment> <comment xml:lang="sl">Datoteka arhiva RAR</comment> <comment xml:lang="sq">Arkiv RAR</comment> @@ -18272,7 +18863,7 @@ <comment xml:lang="pt">arquivo DAR</comment> <comment xml:lang="pt_BR">Pacote DAR</comment> <comment xml:lang="ro">Arhivă DAR</comment> - <comment xml:lang="ru">архив DAR</comment> + <comment xml:lang="ru">Архив DAR</comment> <comment xml:lang="sk">Archív DAR</comment> <comment xml:lang="sl">Datoteka arhiva DAR</comment> <comment xml:lang="sq">Arkiv DAR</comment> @@ -18328,7 +18919,7 @@ <comment xml:lang="pt">arquivo Alzip</comment> <comment xml:lang="pt_BR">Pacote Alzip</comment> <comment xml:lang="ro">Arhivă Alzip</comment> - <comment xml:lang="ru">архив ALZIP</comment> + <comment xml:lang="ru">Архив ALZIP</comment> <comment xml:lang="sk">Archív Alzip</comment> <comment xml:lang="sl">Datoteka arhiva Alzip</comment> <comment xml:lang="sq">Arkiv Alzip</comment> @@ -18358,14 +18949,14 @@ <comment xml:lang="en_GB">rejected patch</comment> <comment xml:lang="eo">reĵeta flikaĵo</comment> <comment xml:lang="es">parche rechazado</comment> - <comment xml:lang="eu">baztertutako bide-izena</comment> + <comment xml:lang="eu">baztertutako adabakia</comment> <comment xml:lang="fi">hylättyjen muutosten tiedosto</comment> <comment xml:lang="fo">vrakað rætting</comment> <comment xml:lang="fr">correctif rejeté</comment> <comment xml:lang="ga">paiste diúltaithe</comment> <comment xml:lang="gl">parche rexeitado</comment> <comment xml:lang="he">טלאי שנדחה</comment> - <comment xml:lang="hr">odbijena zakrpa</comment> + <comment xml:lang="hr">Odbijena zakrpa</comment> <comment xml:lang="hu">visszautasított folt</comment> <comment xml:lang="ia">Patch rejectate</comment> <comment xml:lang="id">patch ditolak</comment> @@ -18384,7 +18975,7 @@ <comment xml:lang="pt">patch rejeitado</comment> <comment xml:lang="pt_BR">Arquivo de patch rejeitado</comment> <comment xml:lang="ro">petec respsins</comment> - <comment xml:lang="ru">отвергнутый патч</comment> + <comment xml:lang="ru">Отклонённый патч</comment> <comment xml:lang="sk">Odmietnutá záplata</comment> <comment xml:lang="sl">zavrnjen popravek</comment> <comment xml:lang="sq">Patch i kthyer mbrapsht</comment> @@ -18439,7 +19030,7 @@ <comment xml:lang="pt">pacote RPM</comment> <comment xml:lang="pt_BR">Pacote RPM</comment> <comment xml:lang="ro">Pachet RPM</comment> - <comment xml:lang="ru">пакет RPM</comment> + <comment xml:lang="ru">Пакет RPM</comment> <comment xml:lang="sk">Balík RPM</comment> <comment xml:lang="sl">Datoteka paketa RPM</comment> <comment xml:lang="sq">Paketë RPM</comment> @@ -18469,6 +19060,7 @@ <comment xml:lang="eu">Iturburu RPM paketea</comment> <comment xml:lang="fi">RPM-lähdepaketti</comment> <comment xml:lang="fr">paquet source RPM</comment> + <comment xml:lang="ga">pacáiste foinse RPM</comment> <comment xml:lang="gl">Paquete RPM de fontes</comment> <comment xml:lang="he">חבילת מקור RPM</comment> <comment xml:lang="hr">RPM paket izvora</comment> @@ -18484,7 +19076,7 @@ <comment xml:lang="pl">Źródłowy pakiet RPM</comment> <comment xml:lang="pt">pacote origem RPM</comment> <comment xml:lang="pt_BR">Pacote fonte RPM</comment> - <comment xml:lang="ru">пакет RPM с исходным кодом</comment> + <comment xml:lang="ru">Пакет RPM с исходным кодом</comment> <comment xml:lang="sk">Zdrojový balík RPM</comment> <comment xml:lang="sl">Paket izvorne kode RPM</comment> <comment xml:lang="sr">изворни РПМ пакет</comment> @@ -18537,7 +19129,7 @@ <comment xml:lang="pt">script Ruby</comment> <comment xml:lang="pt_BR">Script Ruby</comment> <comment xml:lang="ro">Script Ruby</comment> - <comment xml:lang="ru">сценарий Ruby</comment> + <comment xml:lang="ru">Сценарий Ruby</comment> <comment xml:lang="sk">Skript Ruby</comment> <comment xml:lang="sl">Skriptna datoteka Ruby</comment> <comment xml:lang="sq">Script Ruby</comment> @@ -18596,7 +19188,7 @@ <comment xml:lang="pt">script Markaby</comment> <comment xml:lang="pt_BR">Script Markaby</comment> <comment xml:lang="ro">Script Markaby</comment> - <comment xml:lang="ru">сценарий Markaby</comment> + <comment xml:lang="ru">Сценарий Markaby</comment> <comment xml:lang="sk">Skript Markaby</comment> <comment xml:lang="sl">Skriptna datoteka Markaby</comment> <comment xml:lang="sq">Script Markaby</comment> @@ -18623,6 +19215,7 @@ <comment xml:lang="eu">Rust iturburu-kodea</comment> <comment xml:lang="fi">Rust-lähdekoodi</comment> <comment xml:lang="fr">code source Rust</comment> + <comment xml:lang="ga">cód foinseach Rust</comment> <comment xml:lang="he">קוד מקור של Rust</comment> <comment xml:lang="hr">Rust izvorni kôd</comment> <comment xml:lang="hu">Rust forrásfájl</comment> @@ -18635,7 +19228,7 @@ <comment xml:lang="pl">Kod źródłowy Rust</comment> <comment xml:lang="pt">código origem Rust</comment> <comment xml:lang="pt_BR">Código-fonte Rust</comment> - <comment xml:lang="ru">исходный код Rust</comment> + <comment xml:lang="ru">Исходный код Rust</comment> <comment xml:lang="sk">Zdrojový kód Rust</comment> <comment xml:lang="sr">Раст изворни ко̂д</comment> <comment xml:lang="sv">Rust-källkod</comment> @@ -18684,7 +19277,7 @@ <comment xml:lang="pt">folha de cálculo SC/Xspread</comment> <comment xml:lang="pt_BR">Planilha do SC/Xspread</comment> <comment xml:lang="ro">Foaie de calcul SC/Xspread</comment> - <comment xml:lang="ru">электронная таблица SC/Xspread</comment> + <comment xml:lang="ru">Электронная таблица SC/Xspread</comment> <comment xml:lang="sk">Zošit SC/Xspread</comment> <comment xml:lang="sl">Preglednica SC/Xspread</comment> <comment xml:lang="sq">Fletë llogaritjesh SC/Xspread</comment> @@ -18693,7 +19286,7 @@ <comment xml:lang="tr">SC/Xspread çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця SC/Xspread</comment> <comment xml:lang="vi">Bảng tính SC/Xspread</comment> - <comment xml:lang="zh_CN">SC/Xspread 工作簿</comment> + <comment xml:lang="zh_CN">SC/Xspread 电子表格</comment> <comment xml:lang="zh_TW">SC/Xspread 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -18722,7 +19315,7 @@ <comment xml:lang="ga">cartlann bhlaoisce</comment> <comment xml:lang="gl">ficheiro shell</comment> <comment xml:lang="he">ארכיון מעטפת</comment> - <comment xml:lang="hr">arhiva ljuske</comment> + <comment xml:lang="hr">Arhiva ljuske</comment> <comment xml:lang="hu">héjarchívum</comment> <comment xml:lang="ia">Archivo de shell</comment> <comment xml:lang="id">arsip shell</comment> @@ -18741,7 +19334,7 @@ <comment xml:lang="pt">arquivo de terminal</comment> <comment xml:lang="pt_BR">Pacote shell</comment> <comment xml:lang="ro">arhivă shell</comment> - <comment xml:lang="ru">архив оболочки UNIX</comment> + <comment xml:lang="ru">Архив shell</comment> <comment xml:lang="sk">Archív shellu</comment> <comment xml:lang="sl">lupinski arhiv</comment> <comment xml:lang="sq">Arkiv shell</comment> @@ -18792,7 +19385,7 @@ <comment xml:lang="pt">biblioteca partilhada libtool</comment> <comment xml:lang="pt_BR">Biblioteca compartilhada libtool</comment> <comment xml:lang="ro">bibliotecă partajată libtool</comment> - <comment xml:lang="ru">разделяемая библиотека libtool</comment> + <comment xml:lang="ru">Разделяемая библиотека libtool</comment> <comment xml:lang="sk">Zdieľaná knižnica libtool</comment> <comment xml:lang="sl">Souporabna knjižnica libtool</comment> <comment xml:lang="sq">Librari e përbashkët libtool</comment> @@ -18848,7 +19441,7 @@ <comment xml:lang="pt">biblioteca partilhada</comment> <comment xml:lang="pt_BR">Biblioteca compartilhada</comment> <comment xml:lang="ro">bibliotecă partajată</comment> - <comment xml:lang="ru">разделяемая библиотека</comment> + <comment xml:lang="ru">Разделяемая библиотека</comment> <comment xml:lang="sk">Zdieľaná knižnica</comment> <comment xml:lang="sl">souporabljena knjižnica</comment> <comment xml:lang="sq">Librari e përbashkët</comment> @@ -18883,7 +19476,7 @@ <comment xml:lang="az">qabıq skripti</comment> <comment xml:lang="be@latin">skrypt abałonki</comment> <comment xml:lang="bg">Скрипт на обвивката</comment> - <comment xml:lang="ca">script de shell</comment> + <comment xml:lang="ca">script shell</comment> <comment xml:lang="cs">skript shellu</comment> <comment xml:lang="cy">sgript plisgyn</comment> <comment xml:lang="da">skalprogram</comment> @@ -18899,7 +19492,7 @@ <comment xml:lang="ga">script bhlaoisce</comment> <comment xml:lang="gl">script de shell</comment> <comment xml:lang="he">תסריט מעטפת</comment> - <comment xml:lang="hr">skripta ljuske</comment> + <comment xml:lang="hr">Skripta ljuske</comment> <comment xml:lang="hu">héj-parancsfájl</comment> <comment xml:lang="ia">Script de shell</comment> <comment xml:lang="id">skrip shell</comment> @@ -18918,7 +19511,7 @@ <comment xml:lang="pt">script de terminal</comment> <comment xml:lang="pt_BR">Script shell</comment> <comment xml:lang="ro">script shell</comment> - <comment xml:lang="ru">сценарий оболочки UNIX</comment> + <comment xml:lang="ru">Сценарий shell</comment> <comment xml:lang="sk">Skript shellu</comment> <comment xml:lang="sl">lupinski skript</comment> <comment xml:lang="sq">Script shell</comment> @@ -18987,7 +19580,7 @@ <comment xml:lang="pt">ficheiro Shockwave Flash</comment> <comment xml:lang="pt_BR">Arquivo Shockwave Flash</comment> <comment xml:lang="ro">Fișier Shockwave Flash</comment> - <comment xml:lang="ru">файл Shockwave Flash</comment> + <comment xml:lang="ru">Файл Shockwave Flash</comment> <comment xml:lang="sk">Súbor Shockwave Flash</comment> <comment xml:lang="sl">Datoteka Shockwave Flash</comment> <comment xml:lang="sq">File Flash Shockwave</comment> @@ -19029,7 +19622,7 @@ <comment xml:lang="ga">fuaim Shorten</comment> <comment xml:lang="gl">son Shorten</comment> <comment xml:lang="he">שמע של Shorten</comment> - <comment xml:lang="hr">Shorten audio</comment> + <comment xml:lang="hr">Shorten zvučni zapis</comment> <comment xml:lang="hu">Shorten hang</comment> <comment xml:lang="ia">Audio Shorten</comment> <comment xml:lang="id">Audio Shorten</comment> @@ -19047,7 +19640,7 @@ <comment xml:lang="pt">áudio Shorten</comment> <comment xml:lang="pt_BR">Áudio Shorten</comment> <comment xml:lang="ro">Audio Shorten</comment> - <comment xml:lang="ru">аудио Shorten</comment> + <comment xml:lang="ru">Аудио Shorten</comment> <comment xml:lang="sk">Zvuk Shorten</comment> <comment xml:lang="sl">Zvočna datoteka Shorten</comment> <comment xml:lang="sq">Audio Shorten</comment> @@ -19104,7 +19697,7 @@ <comment xml:lang="pt">folha de cálculo Siag</comment> <comment xml:lang="pt_BR">Planilha do Siag</comment> <comment xml:lang="ro">Foaie de calcul Siag</comment> - <comment xml:lang="ru">электронная таблица Siag</comment> + <comment xml:lang="ru">Электронная таблица Siag</comment> <comment xml:lang="sk">Zošit Siag</comment> <comment xml:lang="sl">Preglednica Siag</comment> <comment xml:lang="sq">Fletë llogaritjesh Siag</comment> @@ -19113,7 +19706,7 @@ <comment xml:lang="tr">Siag çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Siag</comment> <comment xml:lang="vi">Bảng tính Slag</comment> - <comment xml:lang="zh_CN">Siag 工作簿</comment> + <comment xml:lang="zh_CN">Siag 电子表格</comment> <comment xml:lang="zh_TW">Siag 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.siag"/> @@ -19121,6 +19714,7 @@ <mime-type type="image/x-skencil"> <comment>Skencil document</comment> <comment xml:lang="ar">مستند Skencil</comment> + <comment xml:lang="ast">Documentu de Skencil</comment> <comment xml:lang="be@latin">Dakument Skencil</comment> <comment xml:lang="bg">Документ — Skencil</comment> <comment xml:lang="ca">document Skencil</comment> @@ -19155,7 +19749,7 @@ <comment xml:lang="pt">documento Skencil</comment> <comment xml:lang="pt_BR">Documento do Skencil</comment> <comment xml:lang="ro">Document Skencil</comment> - <comment xml:lang="ru">документ Skencil</comment> + <comment xml:lang="ru">Документ Skencil</comment> <comment xml:lang="sk">Dokument Skencil</comment> <comment xml:lang="sl">Dokument Skencil</comment> <comment xml:lang="sq">Dokument Skencil</comment> @@ -19213,7 +19807,7 @@ <comment xml:lang="pt">pacote Stampede</comment> <comment xml:lang="pt_BR">Pacote Stampede</comment> <comment xml:lang="ro">Pachet Stampede</comment> - <comment xml:lang="ru">пакет Stampede</comment> + <comment xml:lang="ru">Пакет Stampede</comment> <comment xml:lang="sk">Balíček Stampede</comment> <comment xml:lang="sl">Datoteka paketa Stampede</comment> <comment xml:lang="sq">Paketë Stampede</comment> @@ -19229,18 +19823,28 @@ <mime-type type="application/x-sg1000-rom"> <comment>SG-1000 ROM</comment> <comment xml:lang="ca">ROM de SG-1000</comment> + <comment xml:lang="cs">ROM pro SG-1000</comment> <comment xml:lang="da">SG-1000 ROM</comment> <comment xml:lang="de">SG-1000 ROM</comment> + <comment xml:lang="en_GB">SG-1000 ROM</comment> <comment xml:lang="es">ROM de SG-1000</comment> + <comment xml:lang="eu">SG-1000 ROM</comment> <comment xml:lang="fi">SG-1000 -ROM</comment> <comment xml:lang="fr">ROM SG-1000</comment> + <comment xml:lang="ga">ROM SG-1000</comment> + <comment xml:lang="hr">SG-1000 ROM</comment> <comment xml:lang="hu">SG-1000 ROM</comment> + <comment xml:lang="id">ROM SG-1000</comment> + <comment xml:lang="it">ROM SG-1000</comment> <comment xml:lang="kk">SG-1000 ROM</comment> <comment xml:lang="ko">SG-1000 롬</comment> <comment xml:lang="pl">Plik ROM konsoli SG-1000</comment> <comment xml:lang="pt_BR">ROM de SG-1000</comment> <comment xml:lang="ru">SG-1000 ROM</comment> <comment xml:lang="sk">ROM pre SG-1000</comment> + <comment xml:lang="sr">СГ-1000 РОМ</comment> + <comment xml:lang="sv">SG-1000-rom</comment> + <comment xml:lang="tr">SG-1000 ROM</comment> <comment xml:lang="uk">ППП SG-1000</comment> <comment xml:lang="zh_CN">SG-1000 ROM</comment> <comment xml:lang="zh_TW">SG-1000 ROM</comment> @@ -19251,18 +19855,28 @@ <comment>Master System ROM</comment> <comment xml:lang="ca">ROM de Master System</comment> + <comment xml:lang="cs">ROM pro Master System</comment> <comment xml:lang="da">Master System ROM</comment> <comment xml:lang="de">Master System ROM</comment> + <comment xml:lang="en_GB">Master System ROM</comment> <comment xml:lang="es">ROM de Master System</comment> + <comment xml:lang="eu">Master System ROM</comment> <comment xml:lang="fi">Master System -ROM</comment> <comment xml:lang="fr">ROM Master System</comment> + <comment xml:lang="ga">ROM Master System</comment> + <comment xml:lang="hr">Master System ROM</comment> <comment xml:lang="hu">Master System ROM</comment> + <comment xml:lang="id">ROM Master System</comment> + <comment xml:lang="it">ROM Master System</comment> <comment xml:lang="kk">Master System ROM</comment> <comment xml:lang="ko">마스터 시스템 롬</comment> <comment xml:lang="pl">Plik ROM konsoli SMS</comment> <comment xml:lang="pt_BR">ROM de Master System</comment> <comment xml:lang="ru">Master System ROM</comment> <comment xml:lang="sk">ROM pre Master System</comment> + <comment xml:lang="sr">Мастер Систем РОМ</comment> + <comment xml:lang="sv">Master System-rom</comment> + <comment xml:lang="tr">Master System ROM</comment> <comment xml:lang="uk">ППП Master System</comment> <comment xml:lang="zh_CN">Master System ROM</comment> <comment xml:lang="zh_TW">Master System ROM</comment> @@ -19273,18 +19887,28 @@ <mime-type type="application/x-gamegear-rom"> <comment>Game Gear ROM</comment> <comment xml:lang="ca">ROM de Game Gear</comment> + <comment xml:lang="cs">ROM pro Game Gear</comment> <comment xml:lang="da">Game Gear ROM</comment> <comment xml:lang="de">Game Gear ROM</comment> + <comment xml:lang="en_GB">Game Gear ROM</comment> <comment xml:lang="es">ROM de Game Gear</comment> + <comment xml:lang="eu">Game Gear ROM</comment> <comment xml:lang="fi">Game Gear -ROM</comment> <comment xml:lang="fr">ROM Game Gear</comment> + <comment xml:lang="ga">ROM Game Gear</comment> + <comment xml:lang="hr">Game Gear ROM</comment> <comment xml:lang="hu">Game Gear ROM</comment> + <comment xml:lang="id">ROM Game Gear</comment> + <comment xml:lang="it">ROM Game Gear</comment> <comment xml:lang="kk">Game Gear ROM</comment> <comment xml:lang="ko">게임 기어 롬</comment> <comment xml:lang="pl">Plik ROM konsoli Game Gear</comment> <comment xml:lang="pt_BR">ROM de Game Gear</comment> <comment xml:lang="ru">Game Gear ROM</comment> <comment xml:lang="sk">ROM pre Game Gear</comment> + <comment xml:lang="sr">Гејм Гир РОМ</comment> + <comment xml:lang="sv">Game Gear-rom</comment> + <comment xml:lang="tr">Game Gear ROM</comment> <comment xml:lang="uk">ППП Game Gear</comment> <comment xml:lang="zh_CN">Game Gear ROM</comment> <comment xml:lang="zh_TW">Game Gear ROM</comment> @@ -19328,7 +19952,7 @@ <comment xml:lang="oc">ROM Super Nintendo</comment> <comment xml:lang="pl">Plik ROM konsoli SNES</comment> <comment xml:lang="pt">ROM Super Nintendo</comment> - <comment xml:lang="pt_BR">ROM do Super Nintendo</comment> + <comment xml:lang="pt_BR">ROM de Super Nintendo</comment> <comment xml:lang="ro">ROM Super Nintendo</comment> <comment xml:lang="ru">Super NES ROM</comment> <comment xml:lang="sk">ROM pre Super Nintendo</comment> @@ -19384,7 +20008,7 @@ <comment xml:lang="pt">arquivo StuffIt</comment> <comment xml:lang="pt_BR">Pacote StuffIt</comment> <comment xml:lang="ro">Arhivă StuffIt</comment> - <comment xml:lang="ru">архив StuffIt</comment> + <comment xml:lang="ru">Архив StuffIt</comment> <comment xml:lang="sk">Archív StuffIt</comment> <comment xml:lang="sl">Datoteka arhiva StuffIt</comment> <comment xml:lang="sq">Arkiv StuffIt</comment> @@ -19424,7 +20048,7 @@ <comment xml:lang="ga">fotheidil SubRip</comment> <comment xml:lang="gl">subtítulos SubRip</comment> <comment xml:lang="he">כתוביות של SubRip</comment> - <comment xml:lang="hr">SubRip titlovi</comment> + <comment xml:lang="hr">SubRip podnaslovi</comment> <comment xml:lang="hu">SubRip feliratok</comment> <comment xml:lang="ia">Subtitulos SubRip</comment> <comment xml:lang="id">Subjudul SubRip</comment> @@ -19442,7 +20066,7 @@ <comment xml:lang="pt">legendas SubRip</comment> <comment xml:lang="pt_BR">Legendas SubRip</comment> <comment xml:lang="ro">Subtitrare SubRip</comment> - <comment xml:lang="ru">субтитры SubRip</comment> + <comment xml:lang="ru">Субтитры SubRip</comment> <comment xml:lang="sk">Titulky SubRip</comment> <comment xml:lang="sl">Datoteka podnapisov SubRip</comment> <comment xml:lang="sq">Nëntituj SubRip</comment> @@ -19476,12 +20100,13 @@ <comment xml:lang="eu">WebVTT azpitituluak</comment> <comment xml:lang="fi">WebVTT-tekstitykset</comment> <comment xml:lang="fr">sous-titres WebVTT</comment> + <comment xml:lang="ga">fotheidil WebVTT</comment> <comment xml:lang="gl">subtítulos WebVTT</comment> <comment xml:lang="he">כתוביות WebVTT</comment> - <comment xml:lang="hr">WebVTT titlovi</comment> + <comment xml:lang="hr">WebVTT podnaslovi</comment> <comment xml:lang="hu">WebVTT feliratok</comment> <comment xml:lang="ia">Subtitulos WebVTT</comment> - <comment xml:lang="id">Subtitel WebVTT</comment> + <comment xml:lang="id">Subjudul WebVTT</comment> <comment xml:lang="it">Sottotitoli WebVTT</comment> <comment xml:lang="ja">WebVTT サブタイトル</comment> <comment xml:lang="ka">WebVTT ქვეტიტრები</comment> @@ -19493,7 +20118,7 @@ <comment xml:lang="pl">Napisy WebVTT</comment> <comment xml:lang="pt">legendas WebVTT</comment> <comment xml:lang="pt_BR">Legendas WebVTT</comment> - <comment xml:lang="ru">субтитры WebVTT</comment> + <comment xml:lang="ru">Субтитры WebVTT</comment> <comment xml:lang="sk">Titulky WebVTT</comment> <comment xml:lang="sl">Podnapisi WebVTT</comment> <comment xml:lang="sr">Веб ВТТ преводи</comment> @@ -19531,7 +20156,7 @@ <comment xml:lang="ga">fotheidil SAMI</comment> <comment xml:lang="gl">subtítulos SAMI</comment> <comment xml:lang="he">כתוביות SAMI</comment> - <comment xml:lang="hr">SAMI titlovi</comment> + <comment xml:lang="hr">SAMI podnaslovi</comment> <comment xml:lang="hu">SAMI feliratok</comment> <comment xml:lang="ia">Subtitulos SAMI</comment> <comment xml:lang="id">Subjudul SAMI</comment> @@ -19549,7 +20174,7 @@ <comment xml:lang="pt">legendas SAMI</comment> <comment xml:lang="pt_BR">Legendas SAMI</comment> <comment xml:lang="ro">Subtitrări SAMI</comment> - <comment xml:lang="ru">субтитры SAMI</comment> + <comment xml:lang="ru">Субтитры SAMI</comment> <comment xml:lang="sk">Titulky SAMI</comment> <comment xml:lang="sl">Datoteka podnapisov SAMI</comment> <comment xml:lang="sq">Nëntituj SAMI</comment> @@ -19590,7 +20215,7 @@ <comment xml:lang="ga">fotheidil MicroDVD</comment> <comment xml:lang="gl">subtítulos de MicroDVD</comment> <comment xml:lang="he">כתוביות של MicroDVD</comment> - <comment xml:lang="hr">MicroDVD titlovi</comment> + <comment xml:lang="hr">MicroDVD podnaslovi</comment> <comment xml:lang="hu">MicroDVD feliratok</comment> <comment xml:lang="ia">Subtitulos MicroDVD</comment> <comment xml:lang="id">Subjudul MicroDVD</comment> @@ -19609,7 +20234,7 @@ <comment xml:lang="pt">legendas MicroDVD</comment> <comment xml:lang="pt_BR">Legendas MicroDVD</comment> <comment xml:lang="ro">Subtitrări MicroDVD</comment> - <comment xml:lang="ru">субтитры MicroDVD</comment> + <comment xml:lang="ru">Субтитры MicroDVD</comment> <comment xml:lang="sk">Titulky MicroDVD</comment> <comment xml:lang="sl">Datoteka podnapisov MicroDVD</comment> <comment xml:lang="sq">Nëntituj MicroDVD</comment> @@ -19648,7 +20273,7 @@ <comment xml:lang="ga">fotheidil MPSub</comment> <comment xml:lang="gl">subtítulos MPSub</comment> <comment xml:lang="he">כתוביות MPSub</comment> - <comment xml:lang="hr">MPSub titlovi</comment> + <comment xml:lang="hr">MPSub podnaslovi</comment> <comment xml:lang="hu">MPSub feliratok</comment> <comment xml:lang="ia">Subtitulos MPSub</comment> <comment xml:lang="id">Subjudul MPSub</comment> @@ -19667,7 +20292,7 @@ <comment xml:lang="pt">legendas MPSub</comment> <comment xml:lang="pt_BR">Legendas MPSub</comment> <comment xml:lang="ro">Subtitrări MPSub</comment> - <comment xml:lang="ru">субтитры MPSub</comment> + <comment xml:lang="ru">Субтитры MPSub</comment> <comment xml:lang="sk">Titulky MPSub</comment> <comment xml:lang="sl">Datoteka podnapisov MPSub</comment> <comment xml:lang="sq">Nëntituj MPSub</comment> @@ -19706,7 +20331,7 @@ <comment xml:lang="ga">fotheidil SSA</comment> <comment xml:lang="gl">Subtitulos SSA</comment> <comment xml:lang="he">כתובית SSA</comment> - <comment xml:lang="hr">SSA titlovi</comment> + <comment xml:lang="hr">SSA podnaslovi</comment> <comment xml:lang="hu">SSA feliratok</comment> <comment xml:lang="ia">Subtitulos SSA</comment> <comment xml:lang="id">Subjudul SSA</comment> @@ -19724,7 +20349,7 @@ <comment xml:lang="pt">legendas SSA</comment> <comment xml:lang="pt_BR">Legendas SSA</comment> <comment xml:lang="ro">Subtitrări SSA</comment> - <comment xml:lang="ru">субтитры SSA</comment> + <comment xml:lang="ru">Субтитры SSA</comment> <comment xml:lang="sk">Titulky SSA</comment> <comment xml:lang="sl">Datoteka podnapisov SSA</comment> <comment xml:lang="sq">Nëntituj SSA</comment> @@ -19765,7 +20390,7 @@ <comment xml:lang="ga">fotheidil SubViewer</comment> <comment xml:lang="gl">subtítulos SubViewer</comment> <comment xml:lang="he">כתוביות של SubViewer</comment> - <comment xml:lang="hr">SubViewer titlovi</comment> + <comment xml:lang="hr">SubViewer podnaslovi</comment> <comment xml:lang="hu">SubViewer feliratok</comment> <comment xml:lang="ia">Subtitulos SubViewer</comment> <comment xml:lang="id">Subjudul SubViewer</comment> @@ -19783,7 +20408,7 @@ <comment xml:lang="pt">legendas SubViewer</comment> <comment xml:lang="pt_BR">Legendas SubViewer</comment> <comment xml:lang="ro">Subtitrare SubViewer</comment> - <comment xml:lang="ru">субтитры SubViewer</comment> + <comment xml:lang="ru">Субтитры SubViewer</comment> <comment xml:lang="sk">Titulky SubViewer</comment> <comment xml:lang="sl">Datoteka podnapisov SubViewer</comment> <comment xml:lang="sq">Nëntituj SubViewer</comment> @@ -19819,7 +20444,7 @@ <comment xml:lang="ga">ton buailte iMelody</comment> <comment xml:lang="gl">Melodía de iMelody</comment> <comment xml:lang="he">צלצול של iMelody</comment> - <comment xml:lang="hr">iMelody ton zvonjenja</comment> + <comment xml:lang="hr">iMelody melodija zvona</comment> <comment xml:lang="hu">iMelody csengőhang</comment> <comment xml:lang="ia">Tono de appello iMelody</comment> <comment xml:lang="id">nada dering iMelody</comment> @@ -19837,7 +20462,7 @@ <comment xml:lang="pt">toque iMelody</comment> <comment xml:lang="pt_BR">Toque de celular do iMelody</comment> <comment xml:lang="ro">Sonerie iMelody</comment> - <comment xml:lang="ru">мелодия iMelody</comment> + <comment xml:lang="ru">Мелодия iMelody</comment> <comment xml:lang="sk">Vyzváňacie melódie iMelody</comment> <comment xml:lang="sl">Zvonjenje iMelody</comment> <comment xml:lang="sq">Zile iMelody</comment> @@ -19876,7 +20501,7 @@ <comment xml:lang="ga">fuaim SMAF</comment> <comment xml:lang="gl">son SMAF</comment> <comment xml:lang="he">שמע SMAF</comment> - <comment xml:lang="hr">SMAF audio</comment> + <comment xml:lang="hr">SMAF zvučni zapis</comment> <comment xml:lang="hu">SMAF hang</comment> <comment xml:lang="ia">Audio SMAF</comment> <comment xml:lang="id">Audio SMAF</comment> @@ -19894,7 +20519,7 @@ <comment xml:lang="pt">áudio SMAF</comment> <comment xml:lang="pt_BR">Áudio SMAF</comment> <comment xml:lang="ro">Audio SMAF</comment> - <comment xml:lang="ru">аудио SMAF</comment> + <comment xml:lang="ru">Аудио SMAF</comment> <comment xml:lang="sk">Zvuk SMAF</comment> <comment xml:lang="sl">Zvočna datoteka SMAF</comment> <comment xml:lang="sq">Audio SMAF</comment> @@ -19935,7 +20560,7 @@ <comment xml:lang="ga">seinmliosta MRML</comment> <comment xml:lang="gl">lista de reprodución MRML</comment> <comment xml:lang="he">רשימת השמעה MRML</comment> - <comment xml:lang="hr">MRML popis za reprodukciju</comment> + <comment xml:lang="hr">MRML popis izvođenja</comment> <comment xml:lang="hu">MRML-lejátszólista</comment> <comment xml:lang="ia">Lista de selection MRML</comment> <comment xml:lang="id">Senarai putar MRML</comment> @@ -19954,7 +20579,7 @@ <comment xml:lang="pt">lista de reprodução MRML</comment> <comment xml:lang="pt_BR">Lista de reprodução do MRML</comment> <comment xml:lang="ro">Listă redare MRML</comment> - <comment xml:lang="ru">список воспроизведения MRML</comment> + <comment xml:lang="ru">Список воспроизведения MRML</comment> <comment xml:lang="sk">Zoznam skladieb MRML</comment> <comment xml:lang="sl">Seznam predvajanja MRML</comment> <comment xml:lang="sq">Listë titujsh MRML</comment> @@ -19993,7 +20618,7 @@ <comment xml:lang="ga">fuaim XMF</comment> <comment xml:lang="gl">son XMF</comment> <comment xml:lang="he">שמע XMF</comment> - <comment xml:lang="hr">XMF audio</comment> + <comment xml:lang="hr">XMF zvučni zapis</comment> <comment xml:lang="hu">XMF hang</comment> <comment xml:lang="ia">Audio XMF</comment> <comment xml:lang="id">Audio XMF</comment> @@ -20011,7 +20636,7 @@ <comment xml:lang="pt">aúdio XMF</comment> <comment xml:lang="pt_BR">Áudio XMF</comment> <comment xml:lang="ro">Audio XMF</comment> - <comment xml:lang="ru">аудио XMF</comment> + <comment xml:lang="ru">Аудио XMF</comment> <comment xml:lang="sk">Zvuk XMF</comment> <comment xml:lang="sl">Zvočna datoteka XMF</comment> <comment xml:lang="sq">Audio XMF</comment> @@ -20073,7 +20698,7 @@ <comment xml:lang="pt">arquivo SV4 CPIO</comment> <comment xml:lang="pt_BR">Pacote SV4 CPIO</comment> <comment xml:lang="ro">Arhivă SV4 CPIO</comment> - <comment xml:lang="ru">архив SV4 CPIO</comment> + <comment xml:lang="ru">Архив SV4 CPIO</comment> <comment xml:lang="sk">Archív SV4 CPIO</comment> <comment xml:lang="sl">Datoteka arhiva SV4 CPIO</comment> <comment xml:lang="sq">Arkiv SV4 CPIO</comment> @@ -20126,7 +20751,7 @@ <comment xml:lang="pt">arquivo SV4 CPIO (com CRC)</comment> <comment xml:lang="pt_BR">Pacote SV4 CPIO (com CRC)</comment> <comment xml:lang="ro">Arhivă SV4 CPIO (cu CRC)</comment> - <comment xml:lang="ru">архив SV4 CPIP (с CRC)</comment> + <comment xml:lang="ru">Архив SV4 CPIO (с CRC)</comment> <comment xml:lang="sk">Archív SV4 CPIO (s CRC)</comment> <comment xml:lang="sl">Datoteka arhiva SV4 CPIO (z razpršilom CRC)</comment> <comment xml:lang="sq">Arkiv SV4 CPIO (me CRC)</comment> @@ -20135,7 +20760,7 @@ <comment xml:lang="tr">SV4 CPIO arşivi (CRC ile)</comment> <comment xml:lang="uk">архів SV4 CPIO (з CRC)</comment> <comment xml:lang="vi">Kho nén CPIO SV4 (với CRC)</comment> - <comment xml:lang="zh_CN">SV4 CPIP 归档文件(带有 CRC)</comment> + <comment xml:lang="zh_CN">SV4 CPIP 归档文件（带 CRC）</comment> <comment xml:lang="zh_TW">SV4 CPIO 封存檔 (具有 CRC)</comment> <generic-icon name="package-x-generic"/> <glob pattern="*.sv4crc"/> @@ -20180,7 +20805,7 @@ <comment xml:lang="pt">arquivo Tar</comment> <comment xml:lang="pt_BR">Pacote Tar</comment> <comment xml:lang="ro">Arhivă Tar</comment> - <comment xml:lang="ru">архив TAR</comment> + <comment xml:lang="ru">Архив TAR</comment> <comment xml:lang="sk">Archív tar</comment> <comment xml:lang="sl">Datoteka arhiva Tar</comment> <comment xml:lang="sq">Arkiv tar</comment> @@ -20220,7 +20845,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite)</comment> <comment xml:lang="gl">arquivo Tar (comprimido)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana)</comment> + <comment xml:lang="hr">Tar arhiva (sažeta)</comment> <comment xml:lang="hu">Tar archívum (tömörített)</comment> <comment xml:lang="ia">Archivo Tar (comprimite)</comment> <comment xml:lang="id">Arsip Tar (terkompresi)</comment> @@ -20238,7 +20863,7 @@ <comment xml:lang="pt">arquivo Tar (comprimido)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată)</comment> - <comment xml:lang="ru">архив TAR (сжатый)</comment> + <comment xml:lang="ru">Архив TAR (сжатый)</comment> <comment xml:lang="sk">Archív tar (komprimovaný)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar)</comment> @@ -20247,7 +20872,7 @@ <comment xml:lang="tr">Tar arşivi (sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений)</comment> <comment xml:lang="vi">Kho nén tar (đã nén)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (UNIX 格式壓縮)</comment> <sub-class-of type="application/x-compress"/> <generic-icon name="package-x-generic"/> @@ -20259,8 +20884,8 @@ <comment xml:lang="ar">ملف الخط العام</comment> <comment xml:lang="be@latin">zvyčajny fajł šryftu</comment> <comment xml:lang="bg">Шрифт</comment> - <comment xml:lang="ca">fitxer genèric de tipus de lletra</comment> - <comment xml:lang="cs">obecný soubor písma</comment> + <comment xml:lang="ca">fitxer de lletra genèrica</comment> + <comment xml:lang="cs">obecný soubor s fontem</comment> <comment xml:lang="da">general skrifttypefil</comment> <comment xml:lang="de">Allgemeine Schriftdatei</comment> <comment xml:lang="el">Γενικό αρχείο γραμματοσειράς</comment> @@ -20274,7 +20899,7 @@ <comment xml:lang="ga">comhad cló ginearálta</comment> <comment xml:lang="gl">ficheiro de tipo de fonte xenérica</comment> <comment xml:lang="he">קובץ גופן גנרי</comment> - <comment xml:lang="hr">općenita datoteka fonta</comment> + <comment xml:lang="hr">Izvorna datoteka slova</comment> <comment xml:lang="hu">általános betűkészletfájl</comment> <comment xml:lang="ia">File de typo de litteras generic</comment> <comment xml:lang="id">berkas fonta generik</comment> @@ -20293,7 +20918,7 @@ <comment xml:lang="pt">ficheiro genérico de letra</comment> <comment xml:lang="pt_BR">Arquivo de fonte genérico</comment> <comment xml:lang="ro">fișier de font generic</comment> - <comment xml:lang="ru">обычный файл шрифта</comment> + <comment xml:lang="ru">Обычный файл шрифта</comment> <comment xml:lang="sk">Obyčajný súbor písma</comment> <comment xml:lang="sl">izvorna datoteka pisave</comment> <comment xml:lang="sq">File lloj gërme i përgjithshëm</comment> @@ -20312,8 +20937,8 @@ <comment xml:lang="ar">ملف الخط المرزم</comment> <comment xml:lang="be@latin">zapakavany fajł šryftu</comment> <comment xml:lang="bg">Шрифт — компресиран</comment> - <comment xml:lang="ca">fitxer empaquetat de tipus de lletra</comment> - <comment xml:lang="cs">komprimovaný soubor písma</comment> + <comment xml:lang="ca">fitxer de lletra empaquetada</comment> + <comment xml:lang="cs">komprimovaný soubor s fontem</comment> <comment xml:lang="da">pakket skrifttypefil</comment> <comment xml:lang="de">Gepackte Schriftdatei</comment> <comment xml:lang="el">Αρχείο συμπιεσμένης γραμματοσειράς</comment> @@ -20327,7 +20952,7 @@ <comment xml:lang="ga">comhad cló pacáilte</comment> <comment xml:lang="gl">ficheiro de fonte empaquetada</comment> <comment xml:lang="he">קובץ גופן ארוז</comment> - <comment xml:lang="hr">pakirana datoteka fonta</comment> + <comment xml:lang="hr">Zapakirana datoteka slova</comment> <comment xml:lang="hu">packed font-fájl</comment> <comment xml:lang="ia">File de typos de litteras impacchettate</comment> <comment xml:lang="id">berkas fonta terkemas</comment> @@ -20346,7 +20971,7 @@ <comment xml:lang="pt">ficheiro de letras empacotadas</comment> <comment xml:lang="pt_BR">Arquivo de fonte empacotado</comment> <comment xml:lang="ro">fișier font împachetat</comment> - <comment xml:lang="ru">сжатый файл шрифта</comment> + <comment xml:lang="ru">Сжатый файл шрифта</comment> <comment xml:lang="sk">Komprimovaný súbor písma</comment> <comment xml:lang="sl">pakirana datoteka pisave</comment> <comment xml:lang="sq">File lloj gërmash i kondensuar</comment> @@ -20363,6 +20988,7 @@ <mime-type type="application/x-tgif"> <comment>TGIF document</comment> <comment xml:lang="ar">مستند TGIF</comment> + <comment xml:lang="ast">Documentu de TGIF</comment> <comment xml:lang="be@latin">Dakument TGIF</comment> <comment xml:lang="bg">Документ — TGIF</comment> <comment xml:lang="ca">document TGIF</comment> @@ -20399,7 +21025,7 @@ <comment xml:lang="pt">documento TGIF</comment> <comment xml:lang="pt_BR">Documento TGIF</comment> <comment xml:lang="ro">Document TGIF</comment> - <comment xml:lang="ru">документ TGIF</comment> + <comment xml:lang="ru">Документ TGIF</comment> <comment xml:lang="sk">Dokument TGIF</comment> <comment xml:lang="sl">Dokument TGIF</comment> <comment xml:lang="sq">Dokument TGIF</comment> @@ -20438,7 +21064,7 @@ <comment xml:lang="ga">téama</comment> <comment xml:lang="gl">tema</comment> <comment xml:lang="he">ערכת נושא</comment> - <comment xml:lang="hr">tema</comment> + <comment xml:lang="hr">Tema</comment> <comment xml:lang="hu">téma</comment> <comment xml:lang="ia">Thema</comment> <comment xml:lang="id">tema</comment> @@ -20458,7 +21084,7 @@ <comment xml:lang="pt">tema</comment> <comment xml:lang="pt_BR">Tema</comment> <comment xml:lang="ro">temă</comment> - <comment xml:lang="ru">тема</comment> + <comment xml:lang="ru">Тема</comment> <comment xml:lang="sk">Motív</comment> <comment xml:lang="sl">tema</comment> <comment xml:lang="sq">Temë</comment> @@ -20476,6 +21102,7 @@ <mime-type type="application/x-toutdoux"> <comment>ToutDoux document</comment> <comment xml:lang="ar">مستند ToutDoux</comment> + <comment xml:lang="ast">Documentu de ToutDoux</comment> <comment xml:lang="az">ToutDoux sənədi</comment> <comment xml:lang="be@latin">Dakument ToutDoux</comment> <comment xml:lang="bg">Документ — ToutDoux</comment> @@ -20514,7 +21141,7 @@ <comment xml:lang="pt">documento ToutDoux</comment> <comment xml:lang="pt_BR">Documento do ToutDoux</comment> <comment xml:lang="ro">Document ToutDoux</comment> - <comment xml:lang="ru">документ ToutDoux</comment> + <comment xml:lang="ru">Документ ToutDoux</comment> <comment xml:lang="sk">Dokument ToutDoux</comment> <comment xml:lang="sl">Dokument ToutDoux</comment> <comment xml:lang="sq">Dokument ToutDoux</comment> @@ -20566,7 +21193,7 @@ <comment xml:lang="pt">cópia de segurança</comment> <comment xml:lang="pt_BR">Arquivo de backup</comment> <comment xml:lang="ro">fișier de backup</comment> - <comment xml:lang="ru">резервная копия</comment> + <comment xml:lang="ru">Резервная копия</comment> <comment xml:lang="sk">Záložný súbor</comment> <comment xml:lang="sl">varnostna kopija datoteke</comment> <comment xml:lang="sq">File backup</comment> @@ -20586,6 +21213,7 @@ <mime-type type="text/troff"> <comment>Troff document</comment> <comment xml:lang="ar">مستند Troff</comment> + <comment xml:lang="ast">Documentu de Troff</comment> <comment xml:lang="az">Troff sənədi</comment> <comment xml:lang="be@latin">Dakument Troff</comment> <comment xml:lang="bg">Документ — Troff</comment> @@ -20624,7 +21252,7 @@ <comment xml:lang="pt">documento Troff</comment> <comment xml:lang="pt_BR">Documento Troff</comment> <comment xml:lang="ro">Document Troff</comment> - <comment xml:lang="ru">документ Troff</comment> + <comment xml:lang="ru">Документ Troff</comment> <comment xml:lang="sk">Dokument troff</comment> <comment xml:lang="sl">Dokument Troff</comment> <comment xml:lang="sq">Dokument Troff</comment> @@ -20657,7 +21285,9 @@ <comment xml:lang="el">Έγγραφο βοήθειας manpage</comment> <comment xml:lang="en_GB">Manpage manual document</comment> <comment xml:lang="es">documento de manual de Manpage</comment> + <comment xml:lang="eu">Manpage eskuliburu dokumentua</comment> <comment xml:lang="fr">document manuel Manpage</comment> + <comment xml:lang="ga">cáipéis lámhleabhair Man</comment> <comment xml:lang="he">מסמך תיעוד man</comment> <comment xml:lang="hr">Manpage dokument priručnika</comment> <comment xml:lang="hu">Manpage kézikönyv-dokumentum</comment> @@ -20670,7 +21300,7 @@ <comment xml:lang="pl">Dokument podręcznika stron pomocy</comment> <comment xml:lang="pt">documento de ajuda Manpage</comment> <comment xml:lang="pt_BR">Documento Manpage</comment> - <comment xml:lang="ru">документ справочной системы Manpage</comment> + <comment xml:lang="ru">Документ справочной системы Manpage</comment> <comment xml:lang="sk">Dokument manuálu Manpage</comment> <comment xml:lang="sr">документ упутства странице упутства</comment> <comment xml:lang="sv">Manpage-manualdokument</comment> @@ -20704,7 +21334,7 @@ <comment xml:lang="ga">leathanach lámhleabhair (comhbhrúite)</comment> <comment xml:lang="gl">páxina de manual (comprimida)</comment> <comment xml:lang="he">דף עזר (מכווץ)</comment> - <comment xml:lang="hr">stranica priručnika (komprimirana)</comment> + <comment xml:lang="hr">Stranica priručnika (sažeta)</comment> <comment xml:lang="hu">kézikönyvoldal (tömörített)</comment> <comment xml:lang="ia">Pagina de manual (comprimite)</comment> <comment xml:lang="id">halaman manual (terkompresi)</comment> @@ -20723,7 +21353,7 @@ <comment xml:lang="pt">página de manual (comprimida)</comment> <comment xml:lang="pt_BR">Página de manual (compactada)</comment> <comment xml:lang="ro">pagină de manual (comprimată)</comment> - <comment xml:lang="ru">страница руководства (сжатая)</comment> + <comment xml:lang="ru">Страница руководства (сжатая)</comment> <comment xml:lang="sk">Manuálová stránka (komprimovaná)</comment> <comment xml:lang="sl">stran priročnika (stisnjena)</comment> <comment xml:lang="sq">Faqe manuali (e kompresuar)</comment> @@ -20732,7 +21362,7 @@ <comment xml:lang="tr">kılavuz dosyası (sıkıştırılmış)</comment> <comment xml:lang="uk">сторінка посібника (стиснена)</comment> <comment xml:lang="vi">trang hướng dẫn (đã nén)</comment> - <comment xml:lang="zh_CN">手册页 (压缩)</comment> + <comment xml:lang="zh_CN">手册页（压缩）</comment> <comment xml:lang="zh_TW">手冊頁面 (壓縮版)</comment> <generic-icon name="text-x-generic"/> </mime-type> @@ -20755,7 +21385,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le LZO)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con LZO)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZO)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana LZO-om)</comment> + <comment xml:lang="hr">Tar arhiva (LZO sažeta)</comment> <comment xml:lang="hu">Tar archívum (LZO-val tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con LZO)</comment> <comment xml:lang="id">Arsip Tar (terkompresi LZO)</comment> @@ -20773,7 +21403,7 @@ <comment xml:lang="pt">arquivo Tar (compressão LZO)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com LZO)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată LZO)</comment> - <comment xml:lang="ru">архив TAR (сжатый LZO)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lzo)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZO)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z LZO)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar me LZO)</comment> @@ -20782,7 +21412,7 @@ <comment xml:lang="tr">Tar arşivi (LZO ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений LZO)</comment> <comment xml:lang="vi">Kho nén tar (đã nén LZO)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(LZO 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（LZO 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (LZO 格式壓縮)</comment> <sub-class-of type="application/x-lzop"/> <generic-icon name="package-x-generic"/> @@ -20824,7 +21454,7 @@ <comment xml:lang="pt">arquivo XZ</comment> <comment xml:lang="pt_BR">Pacote XZ</comment> <comment xml:lang="ro">Arhivă XZ</comment> - <comment xml:lang="ru">архив XZ</comment> + <comment xml:lang="ru">Архив XZ</comment> <comment xml:lang="sk">Archív XZ</comment> <comment xml:lang="sl">Datoteka arhiva XZ</comment> <comment xml:lang="sr">ИксЗ архива</comment> @@ -20857,7 +21487,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le XZ)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con XZ)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י XZ)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana XZ-om)</comment> + <comment xml:lang="hr">Tar arhiva ( XZ sažeta)</comment> <comment xml:lang="hu">Tar archívum (XZ-vel tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con XZ)</comment> <comment xml:lang="id">Arsip Tar (terkompresi XZ)</comment> @@ -20873,14 +21503,14 @@ <comment xml:lang="pt">arquivo Tar (compressão XZ)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com XZ)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată XZ)</comment> - <comment xml:lang="ru">архив TAR (сжатый XZ)</comment> + <comment xml:lang="ru">Архив TAR (сжатый xz)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou XZ)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z XZ)</comment> <comment xml:lang="sr">Тар архива (запакована ИксЗ-ом)</comment> <comment xml:lang="sv">Tar-arkiv (XZ-komprimerat)</comment> <comment xml:lang="tr">Tar arşivi (XZ ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений XZ)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(XZ 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（XZ 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (XZ 格式壓縮)</comment> <sub-class-of type="application/x-xz"/> <generic-icon name="package-x-generic"/> @@ -20889,6 +21519,7 @@ </mime-type> <mime-type type="application/x-xzpdf"> <comment>PDF document (XZ-compressed)</comment> + <comment xml:lang="ast">Documentu PDF (comprimíu en XZ)</comment> <comment xml:lang="bg">Документ — PDF, компресиран с XZ</comment> <comment xml:lang="ca">document PDF (amb compressió XZ)</comment> <comment xml:lang="cs">dokument PDF (komprimovaný pomocí XZ)</comment> @@ -20900,9 +21531,10 @@ <comment xml:lang="eu">PDF dokumentua (XZ-rekin konprimitua)</comment> <comment xml:lang="fi">PDF-asiakirja (XZ-pakattu)</comment> <comment xml:lang="fr">document PDF (compressé XZ)</comment> + <comment xml:lang="ga">cáipéis PDF (comhbhrúite le XZ)</comment> <comment xml:lang="gl">documento PDF (comprimido en XZ)</comment> <comment xml:lang="he">מסמך PDF (מכווץ ע״י XZ)</comment> - <comment xml:lang="hr">PDF dokument (komprimiran XZ-om)</comment> + <comment xml:lang="hr">PDF dokument ( XZ sažet)</comment> <comment xml:lang="hu">PDF dokumentum (XZ-vel tömörített)</comment> <comment xml:lang="ia">Documento PDF (comprimite con XZ)</comment> <comment xml:lang="id">Dokumen PDF (terkompresi XZ)</comment> @@ -20917,14 +21549,14 @@ <comment xml:lang="pl">Dokument PDF (kompresja XZ)</comment> <comment xml:lang="pt">documento PDF (compressão XZ)</comment> <comment xml:lang="pt_BR">Documento PDF (compactado com XZ)</comment> - <comment xml:lang="ru">документ PDF (сжатый XZ)</comment> + <comment xml:lang="ru">Документ PDF (сжатый xz)</comment> <comment xml:lang="sk">Dokument PDF (komprimovaný pomocou XZ)</comment> <comment xml:lang="sl">Dokument PDF (XZ-stisnjen)</comment> <comment xml:lang="sr">ПДФ документ (запакован ИксЗ-ом)</comment> <comment xml:lang="sv">PDF-dokument (XZ-komprimerat)</comment> <comment xml:lang="tr">PDF belgesi (XZ ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PDF (стиснений xz)</comment> - <comment xml:lang="zh_CN">PDF 文档(XZ)</comment> + <comment xml:lang="zh_CN">PDF 文档（XZ）</comment> <comment xml:lang="zh_TW">PDF 文件 (XZ 格式壓縮)</comment> <sub-class-of type="application/x-xz"/> <generic-icon name="x-office-document"/> @@ -20968,7 +21600,7 @@ <comment xml:lang="pt">arquivo Ustar</comment> <comment xml:lang="pt_BR">Pacote Ustar</comment> <comment xml:lang="ro">Arhivă Ustar</comment> - <comment xml:lang="ru">архив Ustar</comment> + <comment xml:lang="ru">Архив Ustar</comment> <comment xml:lang="sk">Archív ustar</comment> <comment xml:lang="sl">Datoteka arhiva Ustar</comment> <comment xml:lang="sq">Arkiv Ustar</comment> @@ -21004,7 +21636,7 @@ <comment xml:lang="ga">cód foinseach WAIS</comment> <comment xml:lang="gl">código fonte WAIS</comment> <comment xml:lang="he">קוד מקור של WAIS</comment> - <comment xml:lang="hr">WAIS izvorni kod</comment> + <comment xml:lang="hr">WAIS izvorni kôd</comment> <comment xml:lang="hu">WAIS-forráskód</comment> <comment xml:lang="ia">Codice-fonte WAIS</comment> <comment xml:lang="id">Kode program WAIS</comment> @@ -21023,7 +21655,7 @@ <comment xml:lang="pt">código origem WAIS</comment> <comment xml:lang="pt_BR">Código-fonte WAIS</comment> <comment xml:lang="ro">Cod sursă WAIS</comment> - <comment xml:lang="ru">исходный код WAIS</comment> + <comment xml:lang="ru">Исходный код WAIS</comment> <comment xml:lang="sk">Zdrojový kód WAIS</comment> <comment xml:lang="sl">Datoteka izvorne kode WAIS</comment> <comment xml:lang="sq">Kod burues WAIS</comment> @@ -21077,7 +21709,7 @@ <comment xml:lang="pt">imagem do WordPerfect/Drawperfect</comment> <comment xml:lang="pt_BR">Imagem do WordPerfect/Drawperfect</comment> <comment xml:lang="ro">Imagine WordPerfect/Drawperfect</comment> - <comment xml:lang="ru">изображение WordPerfect/Drawperfect</comment> + <comment xml:lang="ru">Изображение WordPerfect/Drawperfect</comment> <comment xml:lang="sk">Obrázok WordPerfect/Drawperfect</comment> <comment xml:lang="sl">Slikovna datoteka Drawperfect</comment> <comment xml:lang="sq">Figurë WordPerfect/Drawperfect</comment> @@ -21091,6 +21723,54 @@ <generic-icon name="image-x-generic"/> <glob pattern="*.wpg"/> </mime-type> + <mime-type type="application/x-wonderswan-rom"> + <comment>Bandai WonderSwan ROM</comment> + <comment xml:lang="ca">ROM de Bandai WonderSwan</comment> + <comment xml:lang="cs">ROM pro Bandai WonderSwan</comment> + <comment xml:lang="de">Bandai WonderSwan ROM</comment> + <comment xml:lang="en_GB">Bandai WonderSwan ROM</comment> + <comment xml:lang="es">ROM de Bandai WonderSwan</comment> + <comment xml:lang="hr">Bandai WonderSwan ROM</comment> + <comment xml:lang="hu">Bandai WonderSwan ROM</comment> + <comment xml:lang="id">ROM Bandai WonderSwan</comment> + <comment xml:lang="it">ROM Bandai WonderSwan</comment> + <comment xml:lang="kk">Bandai WonderSwan ROM</comment> + <comment xml:lang="ko">반다이 원더스완 롬</comment> + <comment xml:lang="pl">Plik ROM konsoli Bandai WonderSwan</comment> + <comment xml:lang="pt_BR">ROM de WonderSwan da Bandai</comment> + <comment xml:lang="ru">Bandai WonderSwan ROM</comment> + <comment xml:lang="sk">ROM pre Bandai WonderSwan</comment> + <comment xml:lang="sv">Bandai WonderSwan-rom</comment> + <comment xml:lang="uk">ROM Bandai WonderSwan</comment> + <comment xml:lang="zh_CN">万代 WonderSwan ROM</comment> + <comment xml:lang="zh_TW">Bandai WonderSwan ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.ws"/> + </mime-type> + <mime-type type="application/x-wonderswan-color-rom"> + <comment>Bandai WonderSwan Color ROM</comment> + <comment xml:lang="ca">ROM de Bandai WonderSwan Color</comment> + <comment xml:lang="cs">ROM pro Bandai WonderSwan Color</comment> + <comment xml:lang="de">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="en_GB">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="es">ROM de Bandai WonderSwan Color</comment> + <comment xml:lang="hr">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="hu">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="id">ROM Bandai WonderSwan Color</comment> + <comment xml:lang="it">ROM Bandai WonderSwan Color</comment> + <comment xml:lang="kk">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="ko">반다이 원더스완 컬러 롬</comment> + <comment xml:lang="pl">Plik ROM konsoli Bandai WonderSwan Color</comment> + <comment xml:lang="pt_BR">ROM de WonderSwan Color da Bandai</comment> + <comment xml:lang="ru">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="sk">ROM pre Bandai WonderSwan Color</comment> + <comment xml:lang="sv">Bandai WonderSwan Color-rom</comment> + <comment xml:lang="uk">ROM Bandai WonderSwan Color</comment> + <comment xml:lang="zh_CN">万代 WonderSwan Color ROM</comment> + <comment xml:lang="zh_TW">Bandai WonderSwan Color ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.wsc"/> + </mime-type> <mime-type type="application/x-x509-ca-cert"> <comment>DER/PEM/Netscape-encoded X.509 certificate</comment> <comment xml:lang="ar">شهادة DER/PEM/Netscape-encoded X.509</comment> @@ -21111,7 +21791,7 @@ <comment xml:lang="ga">teastas X.509 ionchódaithe le DER/PEM/Netscape</comment> <comment xml:lang="gl">certificado X.509 codificado con DER/PEM/Netscape</comment> <comment xml:lang="he">אישור מסוג X.509 של DER/PEM/Netscape-encoded</comment> - <comment xml:lang="hr">DER/PEM/Netscape-kodiran X.509 certifikat</comment> + <comment xml:lang="hr">DER/PEM/Netscape-kodiran X.509 vjerodajnica</comment> <comment xml:lang="hu">DER/PEM/Netscape formátumú X.509-tanúsítvány</comment> <comment xml:lang="ia">Certificato X.509 codificate in DER/PEM/Netscape</comment> <comment xml:lang="id">Sertifikat DER/PEM/Netscape-tersandi X.509</comment> @@ -21131,7 +21811,7 @@ <comment xml:lang="pt">certificado X.509 codificado com DER/PEM/Netscape</comment> <comment xml:lang="pt_BR">Certificado X.509 codificado com DER/PEM/Netscape</comment> <comment xml:lang="ro">Certificat DER/PEM/Netscape-codat X.509</comment> - <comment xml:lang="ru">сертификат X.509 (DER/PEM/Netscape-закодированный)</comment> + <comment xml:lang="ru">Сертификат X.509 (DER/PEM/Netscape-закодированный)</comment> <comment xml:lang="sk">Certifikát X.509 kódovaný ako DER/PEM/Netscape</comment> <comment xml:lang="sl">Datoteka potrdila DER/PEM/Netscape X.509</comment> <comment xml:lang="sq">Çertifikatë DER/PEM/Netscape-encoded X.509</comment> @@ -21151,6 +21831,7 @@ <mime-type type="application/x-zerosize"> <comment>empty document</comment> <comment xml:lang="ar">مستند فارغ</comment> + <comment xml:lang="ast">documentu baleru</comment> <comment xml:lang="be@latin">pusty dakument</comment> <comment xml:lang="bg">Празен документ</comment> <comment xml:lang="ca">document buit</comment> @@ -21168,7 +21849,7 @@ <comment xml:lang="ga">cáipéis fholamh</comment> <comment xml:lang="gl">documeto baleiro</comment> <comment xml:lang="he">מסמך ריק</comment> - <comment xml:lang="hr">prazan dokument</comment> + <comment xml:lang="hr">Prazan dokument</comment> <comment xml:lang="hu">üres dokumentum</comment> <comment xml:lang="ia">Documento vacue</comment> <comment xml:lang="id">dokumen kosong</comment> @@ -21187,7 +21868,7 @@ <comment xml:lang="pt">documento vazio</comment> <comment xml:lang="pt_BR">Documento vazio</comment> <comment xml:lang="ro">document gol</comment> - <comment xml:lang="ru">пустой документ</comment> + <comment xml:lang="ru">Пустой документ</comment> <comment xml:lang="sk">Prázdny dokument</comment> <comment xml:lang="sl">prazen dokument</comment> <comment xml:lang="sq">Dokument bosh</comment> @@ -21239,7 +21920,7 @@ <comment xml:lang="pt">arquivo Zoo</comment> <comment xml:lang="pt_BR">Pacote Zoo</comment> <comment xml:lang="ro">Arhivă Zoo</comment> - <comment xml:lang="ru">архив ZOO</comment> + <comment xml:lang="ru">Архив ZOO</comment> <comment xml:lang="sk">Archív zoo</comment> <comment xml:lang="sl">Datoteka arhiva ZOO</comment> <comment xml:lang="sq">Arkiv zoo</comment> @@ -21295,7 +21976,7 @@ <comment xml:lang="pt">página XHTML</comment> <comment xml:lang="pt_BR">Página XHTML</comment> <comment xml:lang="ro">Pagină XHTML</comment> - <comment xml:lang="ru">страница XHTML</comment> + <comment xml:lang="ru">Страница XHTML</comment> <comment xml:lang="sk">Stránka XHTML</comment> <comment xml:lang="sl">Datoteka spletne strani XHTML</comment> <comment xml:lang="sq">Faqe XHTML</comment> @@ -21360,7 +22041,7 @@ <comment xml:lang="pt">arquivo Zip</comment> <comment xml:lang="pt_BR">Pacote Zip</comment> <comment xml:lang="ro">Arhivă zip</comment> - <comment xml:lang="ru">архив ZIP</comment> + <comment xml:lang="ru">Архив ZIP</comment> <comment xml:lang="sk">Archív ZIP</comment> <comment xml:lang="sl">Datoteka arhiva ZIP</comment> <comment xml:lang="sq">Arkiv zip</comment> @@ -21391,6 +22072,7 @@ <comment xml:lang="eu">WIM disko irudia</comment> <comment xml:lang="fi">WIM-levytiedosto</comment> <comment xml:lang="fr">image disque WIM</comment> + <comment xml:lang="ga">íomhá diosca WIM</comment> <comment xml:lang="he">דמות דיסק WIM</comment> <comment xml:lang="hr">WIM slika diska</comment> <comment xml:lang="hu">WIM lemezkép</comment> @@ -21403,13 +22085,13 @@ <comment xml:lang="pl">Obraz dysku WIM</comment> <comment xml:lang="pt">imagem de disco WIM</comment> <comment xml:lang="pt_BR">Imagem de disco WIM</comment> - <comment xml:lang="ru">образ диска WIM</comment> + <comment xml:lang="ru">Образ диска WIM</comment> <comment xml:lang="sk">Obraz disku WIM</comment> <comment xml:lang="sr">слика диска ВИМ-а</comment> <comment xml:lang="sv">WIM-diskavbild</comment> <comment xml:lang="tr">WIM disk kalıbı</comment> <comment xml:lang="uk">образ диска WIM</comment> - <comment xml:lang="zh_CN">WIM 磁盘镜像</comment> + <comment xml:lang="zh_CN">WIM 磁盘映像</comment> <comment xml:lang="zh_TW">WIM 磁碟映像檔</comment> <acronym>WIM</acronym> <expanded-acronym>Windows Imaging Format</expanded-acronym> @@ -21441,7 +22123,7 @@ <comment xml:lang="ga">fuaim Dolby Digital</comment> <comment xml:lang="gl">son Dolby Digital</comment> <comment xml:lang="he">שמע Dolby Digital</comment> - <comment xml:lang="hr">Dolby Digital audio</comment> + <comment xml:lang="hr">Dolby Digital zvučni zapis</comment> <comment xml:lang="hu">Dolby Digital hang</comment> <comment xml:lang="ia">Audio Dolby Digital</comment> <comment xml:lang="id">Audio Dolby Digital</comment> @@ -21461,7 +22143,7 @@ <comment xml:lang="pt">áudio Dolby Digital</comment> <comment xml:lang="pt_BR">Áudio Dolby Digital</comment> <comment xml:lang="ro">Audio Dolby Digital</comment> - <comment xml:lang="ru">аудио Dolby Digital</comment> + <comment xml:lang="ru">Аудио Dolby Digital</comment> <comment xml:lang="sk">Zvuk Dolby Digital</comment> <comment xml:lang="sl">Zvočna datoteka Dolby Digital</comment> <comment xml:lang="sq">Audio Dolby Digital</comment> @@ -21489,6 +22171,7 @@ <comment xml:lang="eu">DTS audioa</comment> <comment xml:lang="fi">DTS-ääni</comment> <comment xml:lang="fr">audio DTS</comment> + <comment xml:lang="ga">fuaim DTS</comment> <comment xml:lang="gl">Son DTS</comment> <comment xml:lang="he">שמע DTS</comment> <comment xml:lang="hr">DTS zvučni zapis</comment> @@ -21501,10 +22184,10 @@ <comment xml:lang="ko">DTS 오디오</comment> <comment xml:lang="lv">DTS audio</comment> <comment xml:lang="oc">àudio DTS</comment> - <comment xml:lang="pl">Dźwięk DTS</comment> + <comment xml:lang="pl">Plik dźwiękowy DTS</comment> <comment xml:lang="pt">aúdio DTS</comment> <comment xml:lang="pt_BR">Áudio DTS</comment> - <comment xml:lang="ru">аудио DTS</comment> + <comment xml:lang="ru">Аудио DTS</comment> <comment xml:lang="sk">Zvuk DTS</comment> <comment xml:lang="sl">Zvok DTS</comment> <comment xml:lang="sr">ДТС звук</comment> @@ -21534,6 +22217,7 @@ <comment xml:lang="eu">DTSHD audioa</comment> <comment xml:lang="fi">DTS-HD-ääni</comment> <comment xml:lang="fr">audio DTSHD</comment> + <comment xml:lang="ga">fuaim DTSHD</comment> <comment xml:lang="gl">Son DTSHD</comment> <comment xml:lang="he">שמע DTSHD</comment> <comment xml:lang="hr">DTSHD zvučni zapis</comment> @@ -21546,10 +22230,10 @@ <comment xml:lang="ko">DTSHD 오디오</comment> <comment xml:lang="lv">DTSHD audio</comment> <comment xml:lang="oc">àudio DTSHD</comment> - <comment xml:lang="pl">Dźwięk DTSHD</comment> + <comment xml:lang="pl">Plik dźwiękowy DTSHD</comment> <comment xml:lang="pt">áudio DTSHD</comment> <comment xml:lang="pt_BR">Áudio DTSHD</comment> - <comment xml:lang="ru">аудио DTSHD</comment> + <comment xml:lang="ru">Аудио DTSHD</comment> <comment xml:lang="sk">Zvuk DTSHD</comment> <comment xml:lang="sl">Zvok DTSHD</comment> <comment xml:lang="sr">ДТСХД звук</comment> @@ -21585,7 +22269,7 @@ <comment xml:lang="ga">fuaim AMR</comment> <comment xml:lang="gl">son AMR</comment> <comment xml:lang="he">שמע AMR</comment> - <comment xml:lang="hr">AMR audio</comment> + <comment xml:lang="hr">AMR zvučni zapis</comment> <comment xml:lang="hu">AMR hang</comment> <comment xml:lang="ia">Audio AMR</comment> <comment xml:lang="id">Audio AMR</comment> @@ -21604,7 +22288,7 @@ <comment xml:lang="pt">áudio AMR</comment> <comment xml:lang="pt_BR">Áudio AMR</comment> <comment xml:lang="ro">Audio AMR</comment> - <comment xml:lang="ru">аудио AMR</comment> + <comment xml:lang="ru">Аудио AMR</comment> <comment xml:lang="sk">Zvuk AMR</comment> <comment xml:lang="sl">Zvočna datoteka AMR</comment> <comment xml:lang="sq">Audio AMR</comment> @@ -21644,7 +22328,7 @@ <comment xml:lang="ga">fuaim AMR-WB</comment> <comment xml:lang="gl">son AMR-WB</comment> <comment xml:lang="he">שמע AMR-WN</comment> - <comment xml:lang="hr">AMR-WB audio</comment> + <comment xml:lang="hr">AMR-WB zvučni zapis</comment> <comment xml:lang="hu">AMR-WB hang</comment> <comment xml:lang="ia">Audio AMR-WB</comment> <comment xml:lang="id">Audio AMR-WB</comment> @@ -21663,7 +22347,7 @@ <comment xml:lang="pt">áudio AMR-WB</comment> <comment xml:lang="pt_BR">Áudio AMR-WB</comment> <comment xml:lang="ro">Audio AMR-WB</comment> - <comment xml:lang="ru">аудио AMR-WB</comment> + <comment xml:lang="ru">Аудио AMR-WB</comment> <comment xml:lang="sk">Zvuk AMR-WB</comment> <comment xml:lang="sl">Zvočna datoteka AMR-WB</comment> <comment xml:lang="sq">Audio AMR-WB</comment> @@ -21724,7 +22408,7 @@ <comment xml:lang="pt">áudio ULAW (Sun)</comment> <comment xml:lang="pt_BR">Áudio ULAW (Sun)</comment> <comment xml:lang="ro">Fișier audio ULAW (Sun)</comment> - <comment xml:lang="ru">аудио ULAW (Sun)</comment> + <comment xml:lang="ru">Аудио ULAW (Sun)</comment> <comment xml:lang="sk">Zvuk ULAW (Sun)</comment> <comment xml:lang="sl">Zvočna datoteka ULAW (Sun)</comment> <comment xml:lang="sq">Audio ULAW (Sun)</comment> @@ -21761,7 +22445,7 @@ <comment xml:lang="ga">fuaim Commodore 64</comment> <comment xml:lang="gl">son de Commodore 64</comment> <comment xml:lang="he">שמע של Commodore 64</comment> - <comment xml:lang="hr">Commodore 64 audio</comment> + <comment xml:lang="hr">Commodore 64 zvučni zapis</comment> <comment xml:lang="hu">Commodore 64 hang</comment> <comment xml:lang="ia">Audio Commodore 64</comment> <comment xml:lang="id">Audio Commodore 64</comment> @@ -21781,7 +22465,7 @@ <comment xml:lang="pt">áudio Commodore 64</comment> <comment xml:lang="pt_BR">Áudio Commodore 64</comment> <comment xml:lang="ro">Audio Commodore 64</comment> - <comment xml:lang="ru">аудио Commodore 64</comment> + <comment xml:lang="ru">Аудио Commodore 64</comment> <comment xml:lang="sk">Zvuk Commodore 64</comment> <comment xml:lang="sl">Zvočna datoteka Commodore 64</comment> <comment xml:lang="sq">Audio Commodore 64</comment> @@ -21839,7 +22523,7 @@ <comment xml:lang="pt">áudio PCM</comment> <comment xml:lang="pt_BR">Áudio PCM</comment> <comment xml:lang="ro">Audio PCM</comment> - <comment xml:lang="ru">аудио PCM</comment> + <comment xml:lang="ru">Аудио PCM</comment> <comment xml:lang="sk">Zvuk PCM</comment> <comment xml:lang="sl">Zvočna datoteka PCM</comment> <comment xml:lang="sq">Audio PCM</comment> @@ -21888,7 +22572,7 @@ <comment xml:lang="ga">fuaim AIFC</comment> <comment xml:lang="gl">son AIFC</comment> <comment xml:lang="he">שמע AIFC</comment> - <comment xml:lang="hr">AIFC audio</comment> + <comment xml:lang="hr">AIFC zvučni zapis</comment> <comment xml:lang="hu">AIFC hang</comment> <comment xml:lang="ia">Audio AIFC</comment> <comment xml:lang="id">Audio AIFC</comment> @@ -21908,7 +22592,7 @@ <comment xml:lang="pt">áudio AIFC</comment> <comment xml:lang="pt_BR">Áudio AIFC</comment> <comment xml:lang="ro">Fișier audio AIFC</comment> - <comment xml:lang="ru">аудио AIFC</comment> + <comment xml:lang="ru">Аудио AIFC</comment> <comment xml:lang="sk">Zvuk AIFC</comment> <comment xml:lang="sl">Zvočna datoteka AIFC</comment> <comment xml:lang="sq">Audio AIFC</comment> @@ -21951,7 +22635,7 @@ <comment xml:lang="ga">fuaim AIFF/Amiga/Mac</comment> <comment xml:lang="gl">son AIFF/Amiga/Mac</comment> <comment xml:lang="he">שמע AIFF/Amiga/Mac</comment> - <comment xml:lang="hr">AIFF/Amiga/Mac audio</comment> + <comment xml:lang="hr">AIFF/Amiga/Mac zvučni zapis</comment> <comment xml:lang="hu">AIFF/Amiga/Mac hang</comment> <comment xml:lang="ia">Audio AIFF/Amiga/Mac</comment> <comment xml:lang="id">Audio AIFF/Amiga/Mac</comment> @@ -21971,7 +22655,7 @@ <comment xml:lang="pt">áudio AIFF/Amiga/Mac</comment> <comment xml:lang="pt_BR">Áudio AIFF/Amiga/Mac</comment> <comment xml:lang="ro">Audio AIFF/Amiga/Mac</comment> - <comment xml:lang="ru">аудио AIFF/Amiga/Mac</comment> + <comment xml:lang="ru">Аудио AIFF/Amiga/Mac</comment> <comment xml:lang="sk">Zvuk AIFF/Amiga/Mac</comment> <comment xml:lang="sl">Zvočna datoteka AIFF/Amiga/Mac</comment> <comment xml:lang="sq">Audio AIFF/Amiga/Mac</comment> @@ -22029,7 +22713,7 @@ <comment xml:lang="pt">áudio Monkey</comment> <comment xml:lang="pt_BR">Áudio Monkey's</comment> <comment xml:lang="ro">Audio Monkey's</comment> - <comment xml:lang="ru">аудио Monkey's</comment> + <comment xml:lang="ru">Аудио Monkey's</comment> <comment xml:lang="sk">Zvuk Monkey's</comment> <comment xml:lang="sl">Zvočna datoteka Monkey</comment> <comment xml:lang="sq">Audio Monkey's</comment> @@ -22038,13 +22722,44 @@ <comment xml:lang="tr">Monkey's sesi</comment> <comment xml:lang="uk">звук Monkey's</comment> <comment xml:lang="vi">Âm thanh cua Monkey</comment> - <comment xml:lang="zh_CN">Monkey's audio 音频</comment> + <comment xml:lang="zh_CN">Monkey's Audio 音频</comment> <comment xml:lang="zh_TW">Monkey's 音訊</comment> <magic priority="50"> <match value="MAC " type="string" offset="0"/> </magic> <glob pattern="*.ape"/> </mime-type> + <mime-type type="audio/x-pn-audibleaudio"> + <comment>Audible.Com audio</comment> + <comment xml:lang="ca">àudio Audible.Com</comment> + <comment xml:lang="cs">zvuk Audible.Com</comment> + <comment xml:lang="de">Audible.Com-Audio</comment> + <comment xml:lang="en_GB">Audible.Com audio</comment> + <comment xml:lang="es">sonido de Audible.com</comment> + <comment xml:lang="hr">Audible.Com zvučni zapis</comment> + <comment xml:lang="hu">Audible.Com hang</comment> + <comment xml:lang="id">Audio Audible.Com</comment> + <comment xml:lang="it">Audio Audible.Com</comment> + <comment xml:lang="kk">Audible.Com аудиосы</comment> + <comment xml:lang="ko">Audible.Com 오디오</comment> + <comment xml:lang="pl">Plik dźwiękowy Audible.com</comment> + <comment xml:lang="pt_BR">Áudio de audible.com</comment> + <comment xml:lang="ru">Аудио Audible.Com</comment> + <comment xml:lang="sk">Audio Audible.Com</comment> + <comment xml:lang="sv">Audible.Com-ljud</comment> + <comment xml:lang="uk">звук Audible.Com</comment> + <comment xml:lang="zh_CN">Audible.Com 音频</comment> + <comment xml:lang="zh_TW">Audible.Com 音訊</comment> + <magic priority="50"> + + <match value="1469084982" type="big32" offset="4"/> + <match value="aax " type="string" offset="8"/> + </magic> + <glob pattern="*.aa"/> + <glob pattern="*.aax"/> + <alias type="audio/vnd.audible"/> + <alias type="audio/vnd.audible.aax"/> + </mime-type> <mime-type type="audio/x-it"> <comment>Impulse Tracker audio</comment> <comment xml:lang="ar">Impulse Tracker سمعي</comment> @@ -22067,7 +22782,7 @@ <comment xml:lang="ga">fuaim Impulse Tracker</comment> <comment xml:lang="gl">son de Impulse Tracker</comment> <comment xml:lang="he">שמע של Impulse Tracker</comment> - <comment xml:lang="hr">Impulse Tracker audio</comment> + <comment xml:lang="hr">Impulse Tracker zvučni zapis</comment> <comment xml:lang="hu">Impulse Tracker hang</comment> <comment xml:lang="ia">Audio Impulse Tracker</comment> <comment xml:lang="id">Audio Impulse Tracker</comment> @@ -22086,7 +22801,7 @@ <comment xml:lang="pt">áudio Impulse Tracker</comment> <comment xml:lang="pt_BR">Áudio Impulse Tracker</comment> <comment xml:lang="ro">Audio Impulse Tracker</comment> - <comment xml:lang="ru">аудио Impulse Tracker</comment> + <comment xml:lang="ru">Аудио Impulse Tracker</comment> <comment xml:lang="sk">Zvuk Impulse Tracker</comment> <comment xml:lang="sl">Zvočna datoteka Impulse Tracker</comment> <comment xml:lang="sq">Audio Impulse Tracker</comment> @@ -22122,7 +22837,7 @@ <comment xml:lang="ga">fuaim FLAC</comment> <comment xml:lang="gl">son FLAC</comment> <comment xml:lang="he">קובץ שמע מסוג FLAC</comment> - <comment xml:lang="hr">FLAC audio</comment> + <comment xml:lang="hr">FLAC zvučni zapis</comment> <comment xml:lang="hu">FLAC hang</comment> <comment xml:lang="ia">Audio FLAC</comment> <comment xml:lang="id">Audio FLAC</comment> @@ -22142,7 +22857,7 @@ <comment xml:lang="pt">áudio FLAC</comment> <comment xml:lang="pt_BR">Áudio FLAC</comment> <comment xml:lang="ro">Audio FLAC</comment> - <comment xml:lang="ru">аудио FLAC</comment> + <comment xml:lang="ru">Аудио FLAC</comment> <comment xml:lang="sk">Zvuk FLAC</comment> <comment xml:lang="sl">Zvočna datoteka Flac</comment> <comment xml:lang="sq">Audio FLAC</comment> @@ -22179,7 +22894,7 @@ <comment xml:lang="ga">fuaim WavPack</comment> <comment xml:lang="gl">son WavPack</comment> <comment xml:lang="he">שמע WavPack</comment> - <comment xml:lang="hr">WavPack audio</comment> + <comment xml:lang="hr">WavPack zvučni zapis</comment> <comment xml:lang="hu">WavPack hang</comment> <comment xml:lang="ia">Audio WavPack</comment> <comment xml:lang="id">Audio WavPack</comment> @@ -22197,7 +22912,7 @@ <comment xml:lang="pt">áudio WavPack</comment> <comment xml:lang="pt_BR">Áudio WavPack</comment> <comment xml:lang="ro">Audio WavPack</comment> - <comment xml:lang="ru">аудио WavPack</comment> + <comment xml:lang="ru">Аудио WavPack</comment> <comment xml:lang="sk">Zvuk WavPack</comment> <comment xml:lang="sl">Zvočna datoteka WavPack</comment> <comment xml:lang="sq">Audio WavPack</comment> @@ -22230,7 +22945,7 @@ <comment xml:lang="fi">WavPack-äänikorjaustiedosto</comment> <comment xml:lang="fo">WavPack ljóðrættingarfíla</comment> <comment xml:lang="fr">fichier de correction audio WavPack</comment> - <comment xml:lang="ga">comhad cheartú fhuaim WavPack</comment> + <comment xml:lang="ga">comhad ceartúchán fuaime WavPack</comment> <comment xml:lang="gl">ficheiro de corrección de son WavPack</comment> <comment xml:lang="he">קובץ תיקון שמע של WavPack</comment> <comment xml:lang="hr">WavPack datoteka ispravke zvuka</comment> @@ -22251,7 +22966,7 @@ <comment xml:lang="pt">ficheiro de correção áudio WavPack</comment> <comment xml:lang="pt_BR">Arquivo de correção de áudio WavPack</comment> <comment xml:lang="ro">Fișier audio de corecție WavPack</comment> - <comment xml:lang="ru">файл коррекции аудио WavPack</comment> + <comment xml:lang="ru">Файл коррекции аудио WavPack</comment> <comment xml:lang="sk">Opravný zvukový súbor WavPack</comment> <comment xml:lang="sl">popravljalna zvočna datoteka WavPack</comment> <comment xml:lang="sq">File korrigjgimi audio WavPack</comment> @@ -22260,7 +22975,7 @@ <comment xml:lang="tr">WavPack ses düzeltme dosyası</comment> <comment xml:lang="uk">файл корекції звуку WavPack</comment> <comment xml:lang="vi">Tập tin sửa chữa âm thanh WavPack</comment> - <comment xml:lang="zh_CN">WavPack 音频校正文档</comment> + <comment xml:lang="zh_CN">WavPack 音频校正文件</comment> <comment xml:lang="zh_TW">WavPack 音訊校正檔</comment> <magic priority="50"> <match value="wvpk" type="string" offset="0"/> @@ -22289,7 +23004,7 @@ <comment xml:lang="ga">fuaim MIDI</comment> <comment xml:lang="gl">son MIDI</comment> <comment xml:lang="he">שמע MIDI</comment> - <comment xml:lang="hr">MIDI audio</comment> + <comment xml:lang="hr">MIDI zvučni zapis</comment> <comment xml:lang="hu">MIDI hang</comment> <comment xml:lang="ia">Audio MIDI</comment> <comment xml:lang="id">Audio MIDI</comment> @@ -22308,7 +23023,7 @@ <comment xml:lang="pt">áudio MIDI</comment> <comment xml:lang="pt_BR">Áudio MIDI</comment> <comment xml:lang="ro">Audio MIDI</comment> - <comment xml:lang="ru">аудио MIDI</comment> + <comment xml:lang="ru">Аудио MIDI</comment> <comment xml:lang="sk">Zvuk MIDI</comment> <comment xml:lang="sl">Zvočna datoteka MIDI</comment> <comment xml:lang="sq">Audio MIDI</comment> @@ -22346,7 +23061,7 @@ <comment xml:lang="ga">fuaim chomhbhrúite Tracker</comment> <comment xml:lang="gl">son comprimido de Tracker</comment> <comment xml:lang="he">שמע גשש מכווץ</comment> - <comment xml:lang="hr">komprimirani Tracker audio</comment> + <comment xml:lang="hr">Sažeti Tracker zvučni zapis</comment> <comment xml:lang="hu">tömörített Tracker hang</comment> <comment xml:lang="ia">Audio Tracker comprimite</comment> <comment xml:lang="id">audio Tracker terkompresi</comment> @@ -22363,7 +23078,7 @@ <comment xml:lang="pt">áudio comprimido Tracker</comment> <comment xml:lang="pt_BR">Áudio Tracker compactado</comment> <comment xml:lang="ro">Tracker audio comprimat</comment> - <comment xml:lang="ru">аудио Tracker (сжатое)</comment> + <comment xml:lang="ru">Сжатое аудио Tracker</comment> <comment xml:lang="sk">Komprimovaný zvuk Tracker</comment> <comment xml:lang="sl">Skrčena zvočna datoteka Tracker</comment> <comment xml:lang="sq">Audio Tracker e kompresuar</comment> @@ -22391,6 +23106,7 @@ <comment xml:lang="eu">AAC audioa</comment> <comment xml:lang="fi">AAC-ääni</comment> <comment xml:lang="fr">audio AAC</comment> + <comment xml:lang="ga">fuaim AAC</comment> <comment xml:lang="gl">Son AAC</comment> <comment xml:lang="he">שמע AAC</comment> <comment xml:lang="hr">AAC zvučni zapis</comment> @@ -22403,10 +23119,10 @@ <comment xml:lang="ko">AAC 오디오</comment> <comment xml:lang="lv">AAC audio</comment> <comment xml:lang="oc">àudio AAC</comment> - <comment xml:lang="pl">Dźwięk AAC</comment> + <comment xml:lang="pl">Plik dźwiękowy AAC</comment> <comment xml:lang="pt">áudio AAC</comment> <comment xml:lang="pt_BR">Áudio AAC</comment> - <comment xml:lang="ru">аудио AAC</comment> + <comment xml:lang="ru">Аудио AAC</comment> <comment xml:lang="sk">Zvuk AAC</comment> <comment xml:lang="sl">Zvok AAC</comment> <comment xml:lang="sr">ААЦ звук</comment> @@ -22422,8 +23138,17 @@ <match value="0xFFF0" type="big16" offset="0" mask="0xFFF6"/> </magic> <glob pattern="*.aac"/> + <glob pattern="*.adts"/> + <glob weight="10" pattern="*.ass"/> <alias type="audio/x-aac"/> </mime-type> + <mime-type type="audio/usac"> + <comment>USAC audio</comment> + <acronym>USAC</acronym> + <expanded-acronym>Unified Speech and Audio Coding</expanded-acronym> + <glob pattern="*.loas"/> + <glob pattern="*.xhe"/> + </mime-type> <mime-type type="audio/mp4"> <comment>MPEG-4 audio</comment> <comment xml:lang="ar">MPEG-4 سمعي</comment> @@ -22444,7 +23169,7 @@ <comment xml:lang="ga">fuaim MPEG-4</comment> <comment xml:lang="gl">son MPEG-4</comment> <comment xml:lang="he">שמע MPEG-4</comment> - <comment xml:lang="hr">MPEG-4 audio</comment> + <comment xml:lang="hr">MPEG-4 zvučni zapis</comment> <comment xml:lang="hu">MPEG-4 hang</comment> <comment xml:lang="ia">Audio MPEG-4</comment> <comment xml:lang="id">Audio MPEG-4</comment> @@ -22463,7 +23188,7 @@ <comment xml:lang="pt">áudio MPEG-4</comment> <comment xml:lang="pt_BR">Áudio MPEG-4</comment> <comment xml:lang="ro">Audio MPEG-4</comment> - <comment xml:lang="ru">аудио MPEG-4</comment> + <comment xml:lang="ru">Аудио MPEG-4</comment> <comment xml:lang="sk">Zvuk MPEG-4</comment> <comment xml:lang="sl">Zvočna datoteka MPEG-4</comment> <comment xml:lang="sq">Audio MPEG-4</comment> @@ -22482,9 +23207,15 @@ <glob pattern="*.m4a"/> <glob pattern="*.f4a"/> </mime-type> + <mime-type type="audio/x-m4r"> + <comment>MPEG-4 Ringtone</comment> + <glob pattern="*.m4r"/> + <sub-class-of type="video/mp4"/> + </mime-type> <mime-type type="video/mp4"> <comment>MPEG-4 video</comment> <comment xml:lang="ar">MPEG-4 مرئي</comment> + <comment xml:lang="ast">Videu en MPEG-4</comment> <comment xml:lang="be@latin">Videa MPEG-4</comment> <comment xml:lang="bg">Видео — MPEG-4</comment> <comment xml:lang="ca">vídeo MPEG-4</comment> @@ -22502,7 +23233,7 @@ <comment xml:lang="ga">físeán MPEG-4</comment> <comment xml:lang="gl">vídeo MPEG-4</comment> <comment xml:lang="he">וידאו MPEG-4</comment> - <comment xml:lang="hr">MPEG-4 video</comment> + <comment xml:lang="hr">MPEG-4 video snimka</comment> <comment xml:lang="hu">MPEG-4 videó</comment> <comment xml:lang="ia">Video MPEG-4</comment> <comment xml:lang="id">Video MPEG-4</comment> @@ -22521,7 +23252,7 @@ <comment xml:lang="pt">vídeo MPEG-4</comment> <comment xml:lang="pt_BR">Vídeo MPEG-4</comment> <comment xml:lang="ro">Video MPEG-4</comment> - <comment xml:lang="ru">видео MPEG-4</comment> + <comment xml:lang="ru">Видео MPEG-4</comment> <comment xml:lang="sk">Video MPEG-4</comment> <comment xml:lang="sl">Video datoteka MPEG-4</comment> <comment xml:lang="sq">Video MPEG-4</comment> @@ -22563,10 +23294,10 @@ <comment xml:lang="fi">MPEG-4-äänikirja</comment> <comment xml:lang="fo">MPEG-4 ljóðbók</comment> <comment xml:lang="fr">livre audio MPEG-4</comment> - <comment xml:lang="ga">leabhar fhuaim MPEG-4</comment> + <comment xml:lang="ga">closleabhar MPEG-4</comment> <comment xml:lang="gl">sonlibro de MPEG-4</comment> <comment xml:lang="he">ספר דיגיטלי MPEG-4</comment> - <comment xml:lang="hr">MPEG-4 audio knjiga</comment> + <comment xml:lang="hr">MPEG-4 zvučna knjiga</comment> <comment xml:lang="hu">MPEG-4 hangoskönyv</comment> <comment xml:lang="ia">Libro audio MPEG-4</comment> <comment xml:lang="id">Buku audio MPEG-4</comment> @@ -22585,7 +23316,7 @@ <comment xml:lang="pt">livro áudio MPEG-4</comment> <comment xml:lang="pt_BR">Áudio livro MPEG-4</comment> <comment xml:lang="ro">Carte audio MPEG-4</comment> - <comment xml:lang="ru">аудиокнига MPEG-4</comment> + <comment xml:lang="ru">Аудиокнига MPEG-4</comment> <comment xml:lang="sk">Zvuková kniha MPEG-4</comment> <comment xml:lang="sl">Zvočna knjiga MPEG-4</comment> <comment xml:lang="sq">Audiolibër MPEG-4</comment> @@ -22641,7 +23372,7 @@ <comment xml:lang="pt">ficheiro multimédia 3GPP</comment> <comment xml:lang="pt_BR">Arquivo multimídia 3GPP</comment> <comment xml:lang="ro">Fișier multimedia 3GPP</comment> - <comment xml:lang="ru">мультимедийный файл 3GPP</comment> + <comment xml:lang="ru">Мультимедийный файл 3GPP</comment> <comment xml:lang="sk">Súbor multimédií 3GPP</comment> <comment xml:lang="sl">Večpredstavnostna datoteka 3GPP</comment> <comment xml:lang="sq">File multimedial 3GPP</comment> @@ -22707,7 +23438,7 @@ <comment xml:lang="pt">ficheiro multimédia 3GPP2</comment> <comment xml:lang="pt_BR">Arquivo multimídia 3GPP2</comment> <comment xml:lang="ro">Fișier multimedia 3GPP2</comment> - <comment xml:lang="ru">мультимедийный файл 3GPP2</comment> + <comment xml:lang="ru">Мультимедийный файл 3GPP2</comment> <comment xml:lang="sk">Súbor multimédií 3GPP2</comment> <comment xml:lang="sl">Večpredstavnostna datoteka 3GPP2</comment> <comment xml:lang="sr">3ГПП2 мултимедијална датотека</comment> @@ -22747,7 +23478,7 @@ <comment xml:lang="ga">fuaim Amiga SoundTracker</comment> <comment xml:lang="gl">son de Amiga SoundTracker</comment> <comment xml:lang="he">קובץ שמע של Amiga SoundTracker</comment> - <comment xml:lang="hr">Amiga SoundTracker audio</comment> + <comment xml:lang="hr">Amiga SoundTracker zvučni zapis</comment> <comment xml:lang="hu">Amiga SoundTracker hang</comment> <comment xml:lang="ia">Audio Amiga SoundTracker</comment> <comment xml:lang="id">Audio Amida SoundTracker</comment> @@ -22767,7 +23498,7 @@ <comment xml:lang="pt">áudio SoundTracker do Amiga</comment> <comment xml:lang="pt_BR">Áudio Amiga SoundTracker</comment> <comment xml:lang="ro">Audio Amiga SoundTracker</comment> - <comment xml:lang="ru">аудио Amiga SoundTracker</comment> + <comment xml:lang="ru">Аудио Amiga SoundTracker</comment> <comment xml:lang="sk">Zvuk Amiga SoundTracker</comment> <comment xml:lang="sl">Zvočna datoteka Amiga SoundTracker</comment> <comment xml:lang="sq">Audio Amiga SoundTracker</comment> @@ -22840,7 +23571,7 @@ <comment xml:lang="ga">fuaim MP2</comment> <comment xml:lang="gl">son MP2</comment> <comment xml:lang="he">שמע MP2</comment> - <comment xml:lang="hr">MP2 audio</comment> + <comment xml:lang="hr">MP2 zvučni zapis</comment> <comment xml:lang="hu">MP2 hang</comment> <comment xml:lang="ia">Audio MP2</comment> <comment xml:lang="id">Audio MP2</comment> @@ -22858,7 +23589,7 @@ <comment xml:lang="pt">áudio MP2</comment> <comment xml:lang="pt_BR">Áudio MP2</comment> <comment xml:lang="ro">Audio MP2</comment> - <comment xml:lang="ru">аудио MP2</comment> + <comment xml:lang="ru">Аудио MP2</comment> <comment xml:lang="sk">Zvuk MP2</comment> <comment xml:lang="sl">Zvočna datoteka MP2</comment> <comment xml:lang="sq">Audio MP2</comment> @@ -22894,7 +23625,7 @@ <comment xml:lang="ga">fuaim MP3</comment> <comment xml:lang="gl">son MP3</comment> <comment xml:lang="he">שמע MP3</comment> - <comment xml:lang="hr">MP3 audio</comment> + <comment xml:lang="hr">MP3 zvučni zapis</comment> <comment xml:lang="hu">MP3 hang</comment> <comment xml:lang="ia">Audio MP3</comment> <comment xml:lang="id">Audio MP3</comment> @@ -22914,7 +23645,7 @@ <comment xml:lang="pt">áudio MP3</comment> <comment xml:lang="pt_BR">Áudio MP3</comment> <comment xml:lang="ro">Audio MP3</comment> - <comment xml:lang="ru">аудио MP3</comment> + <comment xml:lang="ru">Аудио MP3</comment> <comment xml:lang="sk">Zvuk MP3</comment> <comment xml:lang="sl">Zvočna datoteka MP3</comment> <comment xml:lang="sq">Audio MP3</comment> @@ -22972,11 +23703,11 @@ <comment xml:lang="nl">MP3-audio (gestreamd)</comment> <comment xml:lang="nn">Strauma MP3-lyd</comment> <comment xml:lang="oc">àudio MP3 (flux)</comment> - <comment xml:lang="pl">Dźwięk MP3 (strumień)</comment> + <comment xml:lang="pl">Plik dźwiękowy MP3 (strumień)</comment> <comment xml:lang="pt">áudio MP3 (em fluxo)</comment> <comment xml:lang="pt_BR">Áudio MP3 (em fluxo)</comment> <comment xml:lang="ro">Audio MP3 (flux)</comment> - <comment xml:lang="ru">аудио MP3 (потоковое)</comment> + <comment xml:lang="ru">Аудио MP3 (потоковое)</comment> <comment xml:lang="sk">Zvuk MP3 (streamovaný)</comment> <comment xml:lang="sl">Zvočna datoteka MP3 (pretočna)</comment> <comment xml:lang="sq">Audio MP3 (streamed)</comment> @@ -22985,7 +23716,7 @@ <comment xml:lang="tr">MP3 sesi (akış)</comment> <comment xml:lang="uk">звук MP3 (потоковий)</comment> <comment xml:lang="vi">Âm thanh MP3 (chạy luồng)</comment> - <comment xml:lang="zh_CN">MP3 流音频</comment> + <comment xml:lang="zh_CN">MP3 音频流媒体</comment> <comment xml:lang="zh_TW">MP3 音訊 (串流)</comment> <sub-class-of type="text/plain"/> <alias type="audio/mpegurl"/> @@ -23033,14 +23764,14 @@ <comment xml:lang="pt">lista de reprodução HTTP Live Streaming</comment> <comment xml:lang="pt_BR">Lista de Reprodução Streaming ao Vivo de HTTP</comment> <comment xml:lang="ro">Listă de redare difuzată ca flux HTTP</comment> - <comment xml:lang="ru">список воспроизведения HTTP-потока</comment> + <comment xml:lang="ru">Список воспроизведения HTTP-потока</comment> <comment xml:lang="sk">Zoznam stôp HTTP Live Streaming</comment> <comment xml:lang="sl">Seznam predvajanja živega pretoka HTTP</comment> <comment xml:lang="sr">ХТТП списак нумера Живог Протока</comment> <comment xml:lang="sv">HTTP Live Streaming-spellista</comment> <comment xml:lang="tr">HTTP Canlı Akış çalma listesi</comment> <comment xml:lang="uk">список відтворення HTTP Live Streaming</comment> - <comment xml:lang="zh_CN">HTTP 直播流播放列表</comment> + <comment xml:lang="zh_CN">HTTP 实时流播放列表</comment> <comment xml:lang="zh_TW">HTTP 即時串流播放清單</comment> <sub-class-of type="text/plain"/> <glob pattern="*.m3u"/> @@ -23071,7 +23802,7 @@ <comment xml:lang="ga">seinmliosta Microsoft ASX</comment> <comment xml:lang="gl">lista de reprodución Microsoft ASX</comment> <comment xml:lang="he">רשימת השמעה ASX (מיקרוסופט)</comment> - <comment xml:lang="hr">Microsoft ASX popis za reprodukciju</comment> + <comment xml:lang="hr">Microsoft ASX popis izvođenja</comment> <comment xml:lang="hu">Microsoft ASX lejátszólista</comment> <comment xml:lang="ia">Lista de selection Microsoft ASX</comment> <comment xml:lang="id">Senarai putar Microsoft ASX</comment> @@ -23090,7 +23821,7 @@ <comment xml:lang="pt">lista de reprodução Microsoft ASX</comment> <comment xml:lang="pt_BR">Lista de reprodução do Microsoft ASX</comment> <comment xml:lang="ro">Listă redare Microsoft ASX</comment> - <comment xml:lang="ru">список воспроизведения Microsoft ASX</comment> + <comment xml:lang="ru">Список воспроизведения Microsoft ASX</comment> <comment xml:lang="sk">Zoznam skladieb Microsoft ASX</comment> <comment xml:lang="sl">Seznam predvajanja Microsoft ASX</comment> <comment xml:lang="sq">Listë titujsh Microsoft ASF</comment> @@ -23154,7 +23885,7 @@ <comment xml:lang="pt">áudio PSF</comment> <comment xml:lang="pt_BR">Áudio PSF</comment> <comment xml:lang="ro">Audio PSF</comment> - <comment xml:lang="ru">аудио PSF</comment> + <comment xml:lang="ru">Аудио PSF</comment> <comment xml:lang="sk">Zvuk PSF</comment> <comment xml:lang="sl">Zvočna datoteka PSF</comment> <comment xml:lang="sq">Audio PSF</comment> @@ -23192,7 +23923,7 @@ <comment xml:lang="ga">fuaim MiniPSF</comment> <comment xml:lang="gl">son MiniPSF</comment> <comment xml:lang="he">שמע של MiniPSP</comment> - <comment xml:lang="hr">MiniPSF audio</comment> + <comment xml:lang="hr">MiniPSF zvučni zapis</comment> <comment xml:lang="hu">MiniPSF hang</comment> <comment xml:lang="ia">Audio MiniPSF</comment> <comment xml:lang="id">Audio MiniPSF</comment> @@ -23211,7 +23942,7 @@ <comment xml:lang="pt">áudio MiniPSF</comment> <comment xml:lang="pt_BR">Áudio MiniPSF</comment> <comment xml:lang="ro">Audio MiniPSF</comment> - <comment xml:lang="ru">аудио MiniPSF</comment> + <comment xml:lang="ru">Аудио MiniPSF</comment> <comment xml:lang="sk">Zvuk MiniPSF</comment> <comment xml:lang="sl">Zvočna datoteka MiniPSF</comment> <comment xml:lang="sq">Audio MiniPSF</comment> @@ -23243,7 +23974,7 @@ <comment xml:lang="fi">PSFlib-äänikirjasto</comment> <comment xml:lang="fo">PSFlib ljóðsavn</comment> <comment xml:lang="fr">bibliothèque audio PSFlib</comment> - <comment xml:lang="ga">leabharlann fhuaim PSFlib</comment> + <comment xml:lang="ga">leabharlann fhuaime PSFlib</comment> <comment xml:lang="gl">Biblioteca de son PSFlib</comment> <comment xml:lang="he">ספריית שמע PSFlib</comment> <comment xml:lang="hr">PSFlib zvučna biblioteka</comment> @@ -23264,7 +23995,7 @@ <comment xml:lang="pt">biblioteca áudio PSFlib</comment> <comment xml:lang="pt_BR">Biblioteca de áudio PSFlib</comment> <comment xml:lang="ro">Bibliotecă audio PSFlib</comment> - <comment xml:lang="ru">фонотека PSFlib</comment> + <comment xml:lang="ru">Фонотека PSFlib</comment> <comment xml:lang="sk">Zvuková knižnica PSFlib</comment> <comment xml:lang="sl">Zvočna knjižnica PSFlib</comment> <comment xml:lang="sq">Librari audio PSFlib</comment> @@ -23273,7 +24004,7 @@ <comment xml:lang="tr">PSFlib ses kitaplığı</comment> <comment xml:lang="uk">аудіобібліотека PSFlib</comment> <comment xml:lang="vi">Thư viện âm thanh PSFlib</comment> - <comment xml:lang="zh_CN">PSFlib 音频库文件</comment> + <comment xml:lang="zh_CN">PSFlib 音频库</comment> <comment xml:lang="zh_TW">PSFlib 音訊庫</comment> <acronym>PSFlib</acronym> <expanded-acronym>Portable Sound Format Library</expanded-acronym> @@ -23299,7 +24030,7 @@ <comment xml:lang="ga">fuaim Windows Media</comment> <comment xml:lang="gl">son de Windows Media</comment> <comment xml:lang="he">שמע של Windows Media</comment> - <comment xml:lang="hr">Windows Media audio</comment> + <comment xml:lang="hr">Windows Media zvučni zapis</comment> <comment xml:lang="hu">Windows Media hang</comment> <comment xml:lang="ia">Audio Windows Media</comment> <comment xml:lang="id">Audio Windows Media</comment> @@ -23317,7 +24048,7 @@ <comment xml:lang="pt">áudio Windows Media</comment> <comment xml:lang="pt_BR">Áudio do Windows Media</comment> <comment xml:lang="ro">Audio Windows Media</comment> - <comment xml:lang="ru">аудио Windows Media</comment> + <comment xml:lang="ru">Аудио Windows Media</comment> <comment xml:lang="sk">Zvuk Windows Media</comment> <comment xml:lang="sl">Zvočna datoteka Windows Media</comment> <comment xml:lang="sq">Audio Windows Media</comment> @@ -23351,7 +24082,7 @@ <comment xml:lang="ga">fuaim Musepack</comment> <comment xml:lang="gl">son de Musepack</comment> <comment xml:lang="he">שמע של Musepack</comment> - <comment xml:lang="hr">Musepack audio</comment> + <comment xml:lang="hr">Musepack zvučni zapis</comment> <comment xml:lang="hu">Musepack hang</comment> <comment xml:lang="ia">Audio Musepack</comment> <comment xml:lang="id">Audio Musepack</comment> @@ -23369,7 +24100,7 @@ <comment xml:lang="pt">áudio Musepack</comment> <comment xml:lang="pt_BR">Áudio Musepack</comment> <comment xml:lang="ro">Audio Musepack</comment> - <comment xml:lang="ru">аудио Musepack</comment> + <comment xml:lang="ru">Аудио Musepack</comment> <comment xml:lang="sk">Zvuk Musepack</comment> <comment xml:lang="sl">Zvočna datoteka Musepack</comment> <comment xml:lang="sq">Audio Musepack</comment> @@ -23390,6 +24121,7 @@ <mime-type type="audio/vnd.rn-realaudio"> <comment>RealAudio document</comment> <comment xml:lang="ar">مستند RealAudio</comment> + <comment xml:lang="ast">Documentu RealAudio</comment> <comment xml:lang="be@latin">Dakument RealAudio</comment> <comment xml:lang="bg">Документ — RealAudio</comment> <comment xml:lang="ca">document RealAudio</comment> @@ -23425,7 +24157,7 @@ <comment xml:lang="pt">documento RealAudio</comment> <comment xml:lang="pt_BR">Documento RealAudio</comment> <comment xml:lang="ro">Document RealAudio</comment> - <comment xml:lang="ru">документ RealAudio</comment> + <comment xml:lang="ru">Документ RealAudio</comment> <comment xml:lang="sk">Dokument RealAudio</comment> <comment xml:lang="sl">Dokument RealAudio</comment> <comment xml:lang="sq">Dokument RealAudio</comment> @@ -23457,7 +24189,7 @@ <comment xml:lang="fi">RealMedia-metatiedosto</comment> <comment xml:lang="fo">RealMedia metafíla</comment> <comment xml:lang="fr">métafichier RealMedia</comment> - <comment xml:lang="ga">meiteachomhad RealMedia</comment> + <comment xml:lang="ga">Meiteachomhad RealMedia</comment> <comment xml:lang="gl">Metaficheiro RealMedia</comment> <comment xml:lang="he">קובץ מטא של RealMedia</comment> <comment xml:lang="hr">RealMedia meta datoteka</comment> @@ -23478,7 +24210,7 @@ <comment xml:lang="pt">metaficheiro RealMedia</comment> <comment xml:lang="pt_BR">Meta arquivo do RealMedia</comment> <comment xml:lang="ro">Metafișier RealMedia</comment> - <comment xml:lang="ru">мета-файл RealMedia</comment> + <comment xml:lang="ru">Мета-файл RealMedia</comment> <comment xml:lang="sk">RealMedia Metafile</comment> <comment xml:lang="sl">Metadatoteka RealMedia</comment> <comment xml:lang="sq">Metafile RealMedia</comment> @@ -23494,6 +24226,7 @@ <mime-type type="video/vnd.rn-realvideo"> <comment>RealVideo document</comment> <comment xml:lang="ar">مستند RealVideo</comment> + <comment xml:lang="ast">Documentu RealVideo</comment> <comment xml:lang="be@latin">Dakument RealVideo</comment> <comment xml:lang="bg">Документ — RealVideo</comment> <comment xml:lang="ca">document RealVideo</comment> @@ -23529,7 +24262,7 @@ <comment xml:lang="pt">documento RealVideo</comment> <comment xml:lang="pt_BR">Documento RealVideo</comment> <comment xml:lang="ro">Document RealVideo</comment> - <comment xml:lang="ru">документ RealVideo</comment> + <comment xml:lang="ru">Документ RealVideo</comment> <comment xml:lang="sk">Dokument RealVideo</comment> <comment xml:lang="sl">Video datoteka RealVideo</comment> <comment xml:lang="sq">Dokument RealVideo</comment> @@ -23547,6 +24280,7 @@ <mime-type type="application/vnd.rn-realmedia"> <comment>RealMedia document</comment> <comment xml:lang="ar">مستند RealMedia</comment> + <comment xml:lang="ast">Documentu RealMedia</comment> <comment xml:lang="be@latin">Dakument RealMedia</comment> <comment xml:lang="bg">Документ — RealMedia</comment> <comment xml:lang="ca">document RealMedia</comment> @@ -23582,7 +24316,7 @@ <comment xml:lang="pt">documento RealMedia</comment> <comment xml:lang="pt_BR">Documento RealMedia</comment> <comment xml:lang="ro">Document RealMedia</comment> - <comment xml:lang="ru">документ RealMedia</comment> + <comment xml:lang="ru">Документ RealMedia</comment> <comment xml:lang="sk">Dokument RealMedia</comment> <comment xml:lang="sl">Dokument RealMedia</comment> <comment xml:lang="sq">Dokument RealMedia</comment> @@ -23608,6 +24342,7 @@ <mime-type type="image/vnd.rn-realpix"> <comment>RealPix document</comment> <comment xml:lang="ar">مستند RealPix</comment> + <comment xml:lang="ast">Documentu RealPix</comment> <comment xml:lang="be@latin">Dakument RealPix</comment> <comment xml:lang="bg">Документ — RealPix</comment> <comment xml:lang="ca">document RealPix</comment> @@ -23643,7 +24378,7 @@ <comment xml:lang="pt">documento RealPix</comment> <comment xml:lang="pt_BR">Documento RealPix</comment> <comment xml:lang="ro">Document RealPix</comment> - <comment xml:lang="ru">документ RealPix</comment> + <comment xml:lang="ru">Документ RealPix</comment> <comment xml:lang="sk">Dokument RealPix</comment> <comment xml:lang="sl">Dokument RealPix</comment> <comment xml:lang="sq">Dokument RealPix</comment> @@ -23659,6 +24394,7 @@ <mime-type type="text/vnd.rn-realtext"> <comment>RealText document</comment> <comment xml:lang="ar">مستند RealText</comment> + <comment xml:lang="ast">Documentu RealText</comment> <comment xml:lang="be@latin">Dakument RealText</comment> <comment xml:lang="bg">Документ — RealText</comment> <comment xml:lang="ca">document RealText</comment> @@ -23694,7 +24430,7 @@ <comment xml:lang="pt">documento RealText</comment> <comment xml:lang="pt_BR">Documento RealText</comment> <comment xml:lang="ro">Document RealText</comment> - <comment xml:lang="ru">документ RealText</comment> + <comment xml:lang="ru">Документ RealText</comment> <comment xml:lang="sk">Dokument RealText</comment> <comment xml:lang="sl">Dokument RealText</comment> <comment xml:lang="sq">Dokument RealText</comment> @@ -23729,7 +24465,7 @@ <comment xml:lang="ga">fuaim RIFF</comment> <comment xml:lang="gl">son RIFF</comment> <comment xml:lang="he">שמע RIFF</comment> - <comment xml:lang="hr">RIFF audio</comment> + <comment xml:lang="hr">RIFF zvučni zapis</comment> <comment xml:lang="hu">RIFF-kép</comment> <comment xml:lang="ia">Audio RIFF</comment> <comment xml:lang="id">Audio RIFF</comment> @@ -23748,7 +24484,7 @@ <comment xml:lang="pt">áudio RIFF</comment> <comment xml:lang="pt_BR">Áudio RIFF</comment> <comment xml:lang="ro">Audio RIFF</comment> - <comment xml:lang="ru">аудио RIFF</comment> + <comment xml:lang="ru">Аудио RIFF</comment> <comment xml:lang="sk">Zvuk RIFF</comment> <comment xml:lang="sl">Zvočna datoteka RIFF</comment> <comment xml:lang="sq">Audio RIFF</comment> @@ -23771,6 +24507,7 @@ <comment xml:lang="es">contenedor RIFF</comment> <comment xml:lang="eu">RIFF edukitzailea</comment> <comment xml:lang="fr">conteneur RIFF</comment> + <comment xml:lang="ga">coimeádán RIFF</comment> <comment xml:lang="gl">Contenedor RIFF</comment> <comment xml:lang="he">מכולת RIFF</comment> <comment xml:lang="hr">RIFF spremnik</comment> @@ -23820,7 +24557,7 @@ <comment xml:lang="ga">fuaim Scream Tracker 3</comment> <comment xml:lang="gl">son Scream Tracker 3</comment> <comment xml:lang="he">שמע של Scream Tracker 3</comment> - <comment xml:lang="hr">Scream Tracker 3 audio</comment> + <comment xml:lang="hr">Scream Tracker 3 zvučni zapis</comment> <comment xml:lang="hu">Scream Tracker 3 hang</comment> <comment xml:lang="ia">Audio Scream Tracker 3</comment> <comment xml:lang="id">Audio Scream Tracker 3</comment> @@ -23839,7 +24576,7 @@ <comment xml:lang="pt">áudio Scream Tracker 3</comment> <comment xml:lang="pt_BR">Áudio Scream Tracker 3</comment> <comment xml:lang="ro">Audio Scream Tracker 3</comment> - <comment xml:lang="ru">аудио Scream Tracker 3</comment> + <comment xml:lang="ru">Аудио Scream Tracker 3</comment> <comment xml:lang="sk">Skladba Scream Tracker 3</comment> <comment xml:lang="sl">Zvočna datoteka Scream Tracker 3</comment> <comment xml:lang="sq">Audio Scream Tracker 3</comment> @@ -23875,7 +24612,7 @@ <comment xml:lang="ga">seinmliosta MP3 ShoutCast</comment> <comment xml:lang="gl">lista de reprodución MP3 de ShoutCast</comment> <comment xml:lang="he">רשימת השמעה MP3 של ShoutCast</comment> - <comment xml:lang="hr">MP3 ShoutCast popis za reprodukciju</comment> + <comment xml:lang="hr">MP3 ShoutCast popis izvođenja</comment> <comment xml:lang="hu">MP3 ShoutCast-lejátszólista</comment> <comment xml:lang="ia">Lista de selection MP3 ShoutCast</comment> <comment xml:lang="id">Senarai putar MP3 ShoutCast</comment> @@ -23894,7 +24631,7 @@ <comment xml:lang="pt">lista de reprodução MP3 ShoutCast</comment> <comment xml:lang="pt_BR">Lista de reprodução MP3 ShoutCast</comment> <comment xml:lang="ro">Listă MP3 ShoutCast</comment> - <comment xml:lang="ru">список воспроизведения MP3 ShoutCast</comment> + <comment xml:lang="ru">Список воспроизведения MP3 ShoutCast</comment> <comment xml:lang="sk">Zoznam skladieb MP3 ShoutCast</comment> <comment xml:lang="sl">Seznam predvajanja MP3 ShoutCast</comment> <comment xml:lang="sq">Listë titujsh MP3 ShoutCast</comment> @@ -23936,7 +24673,7 @@ <comment xml:lang="ga">fuaim Scream Tracker</comment> <comment xml:lang="gl">son Scream Tracker</comment> <comment xml:lang="he">שמע של Scream Tracker</comment> - <comment xml:lang="hr">Scream Tracker audio</comment> + <comment xml:lang="hr">Scream Tracker zvučni zapis</comment> <comment xml:lang="hu">Scream Tracker hang</comment> <comment xml:lang="ia">Audio Scream Tracker</comment> <comment xml:lang="id">Audio Scream Tracker</comment> @@ -23955,7 +24692,7 @@ <comment xml:lang="pt">áudio Scream Tracker</comment> <comment xml:lang="pt_BR">Áudio Scream Tracker</comment> <comment xml:lang="ro">Audio Scream Tracker</comment> - <comment xml:lang="ru">аудио Scream Tracker</comment> + <comment xml:lang="ru">Аудио Scream Tracker</comment> <comment xml:lang="sk">Skladba Scream Tracker</comment> <comment xml:lang="sl">Zvočna datoteka Scream Tracker</comment> <comment xml:lang="sq">Audio Scream Tracker</comment> @@ -23995,7 +24732,7 @@ <comment xml:lang="ga">fuaim VOC</comment> <comment xml:lang="gl">son VOC</comment> <comment xml:lang="he">שמע VOC</comment> - <comment xml:lang="hr">VOC audio</comment> + <comment xml:lang="hr">VOC zvučni zapis</comment> <comment xml:lang="hu">VOC hang</comment> <comment xml:lang="ia">Audio VOC</comment> <comment xml:lang="id">Audio VOC</comment> @@ -24014,7 +24751,7 @@ <comment xml:lang="pt">áudio VOC</comment> <comment xml:lang="pt_BR">Áudio VOC</comment> <comment xml:lang="ro">Audio VOC</comment> - <comment xml:lang="ru">аудио VOC</comment> + <comment xml:lang="ru">Аудио VOC</comment> <comment xml:lang="sk">Zvuk VOC</comment> <comment xml:lang="sl">Zvočna datoteka VOC</comment> <comment xml:lang="sq">Audio VOC</comment> @@ -24049,7 +24786,7 @@ <comment xml:lang="ga">fuaim WAV</comment> <comment xml:lang="gl">son WAV</comment> <comment xml:lang="he">שמע WAV</comment> - <comment xml:lang="hr">WAV audio</comment> + <comment xml:lang="hr">WAV zvučni zapis</comment> <comment xml:lang="hu">WAV hang</comment> <comment xml:lang="ia">Audio WAV</comment> <comment xml:lang="id">Audio WAV</comment> @@ -24068,7 +24805,7 @@ <comment xml:lang="pt">áudio WAV</comment> <comment xml:lang="pt_BR">Áudio WAV</comment> <comment xml:lang="ro">Audio WAV</comment> - <comment xml:lang="ru">аудио WAV</comment> + <comment xml:lang="ru">Аудио WAV</comment> <comment xml:lang="sk">Zvuk WAV</comment> <comment xml:lang="sl">Zvočna datoteka WAV</comment> <comment xml:lang="sq">Audio WAV</comment> @@ -24128,7 +24865,7 @@ <comment xml:lang="pt">instrumento Scream Tracker</comment> <comment xml:lang="pt_BR">Instrumento Scream Tracker</comment> <comment xml:lang="ro">Instrument Scream Tracker</comment> - <comment xml:lang="ru">инструмент Scream Tracker</comment> + <comment xml:lang="ru">Инструмент Scream Tracker</comment> <comment xml:lang="sk">Nástroj pre Scream Tracker</comment> <comment xml:lang="sl">Datoteka zvoka glasbila Scream Tracker</comment> <comment xml:lang="sq">Instrument Scream Tracker</comment> @@ -24166,7 +24903,7 @@ <comment xml:lang="ga">fuaim FastTracker II</comment> <comment xml:lang="gl">son de FastTracker II</comment> <comment xml:lang="he">שמע FastTracker II</comment> - <comment xml:lang="hr">FastTracker II audio</comment> + <comment xml:lang="hr">FastTracker II zvučni zapis</comment> <comment xml:lang="hu">FastTracker II hang</comment> <comment xml:lang="ia">Audio FastTracker II</comment> <comment xml:lang="id">Audio FastTracker II</comment> @@ -24186,7 +24923,7 @@ <comment xml:lang="pt">áudio FastTracker II</comment> <comment xml:lang="pt_BR">Áudio FastTracker II</comment> <comment xml:lang="ro">Audio FastTracker II</comment> - <comment xml:lang="ru">аудио FastTracker II</comment> + <comment xml:lang="ru">Аудио FastTracker II</comment> <comment xml:lang="sk">Zvuk FastTracker II</comment> <comment xml:lang="sl">Zvočna datoteka FastTracker II</comment> <comment xml:lang="sq">Audio FastTracker II</comment> @@ -24222,7 +24959,7 @@ <comment xml:lang="ga">fuaim TrueAudio</comment> <comment xml:lang="gl">son Trueson</comment> <comment xml:lang="he">שמע TrueAudio</comment> - <comment xml:lang="hr">TrueAudio audio</comment> + <comment xml:lang="hr">TrueAudio zvučni zapis</comment> <comment xml:lang="hu">TrueAudio hang</comment> <comment xml:lang="ia">Audio TrueAudio</comment> <comment xml:lang="id">Audio TrueAudio</comment> @@ -24240,7 +24977,7 @@ <comment xml:lang="pt">áudio TrueAudio</comment> <comment xml:lang="pt_BR">Áudio TrueAudio</comment> <comment xml:lang="ro">Audio TrueAudio</comment> - <comment xml:lang="ru">аудио TrueAudio</comment> + <comment xml:lang="ru">Аудио TrueAudio</comment> <comment xml:lang="sk">Zvuk TrueAudio</comment> <comment xml:lang="sl">Zvočna datoteka TrueAudio</comment> <comment xml:lang="sq">Audio TrueAudio</comment> @@ -24298,7 +25035,7 @@ <comment xml:lang="pt">imagem BMP Windows</comment> <comment xml:lang="pt_BR">Imagem BMP do Windows</comment> <comment xml:lang="ro">Imagine Windows BMP</comment> - <comment xml:lang="ru">изображение Windows BMP</comment> + <comment xml:lang="ru">Изображение Windows BMP</comment> <comment xml:lang="sk">Obrázok Windows BMP</comment> <comment xml:lang="sl">Slikovna datoteka Windows BMP</comment> <comment xml:lang="sq">Figurë Windows BMP</comment> @@ -24360,7 +25097,7 @@ <comment xml:lang="pt">imagem WBMP</comment> <comment xml:lang="pt_BR">Imagem WBMP</comment> <comment xml:lang="ro">Imagine WBMP</comment> - <comment xml:lang="ru">изображение WBMP</comment> + <comment xml:lang="ru">Изображение WBMP</comment> <comment xml:lang="sk">Obrázok WBMP</comment> <comment xml:lang="sl">Slikovna datoteka WBMP</comment> <comment xml:lang="sq">Figurë WBMP</comment> @@ -24393,7 +25130,7 @@ <comment xml:lang="fi">Computer Graphics -metatiedosto</comment> <comment xml:lang="fo">Teldugrafikk metafíla</comment> <comment xml:lang="fr">métafichier Computer Graphics</comment> - <comment xml:lang="ga">meiteachomhad Grafaicí Ríomhaire</comment> + <comment xml:lang="ga">Meiteachomhad Grafaicí Ríomhaire</comment> <comment xml:lang="gl">metaficheiro de Computer Graphics</comment> <comment xml:lang="he">קובץ-מטה מסוג Computer Graphics</comment> <comment xml:lang="hr">Computer Graphics meta datoteka</comment> @@ -24415,7 +25152,7 @@ <comment xml:lang="pt">metaficheiro Computer Graphics</comment> <comment xml:lang="pt_BR">Meta-arquivo do Computer Graphics</comment> <comment xml:lang="ro">Metafișier Computer Graphics</comment> - <comment xml:lang="ru">метафайл компьютерной графики</comment> + <comment xml:lang="ru">Метафайл компьютерной графики</comment> <comment xml:lang="sk">Computer Graphics Metafile</comment> <comment xml:lang="sl">Metadatoteka računalniške grafike (CGM)</comment> <comment xml:lang="sq">Metafile Computer Graphics</comment> @@ -24424,7 +25161,7 @@ <comment xml:lang="tr">Computer Graphics Meta dosyası</comment> <comment xml:lang="uk">метафайл комп'ютерної графіки</comment> <comment xml:lang="vi">Siêu tập tin đồ họa máy tính (CMF)</comment> - <comment xml:lang="zh_CN">CGM 计算机图像元文件</comment> + <comment xml:lang="zh_CN">计算机图形图元文件 (CGM)</comment> <comment xml:lang="zh_TW">CGM 影像</comment> <glob pattern="*.cgm"/> </mime-type> @@ -24468,7 +25205,7 @@ <comment xml:lang="pt">fax CCITT G3</comment> <comment xml:lang="pt_BR">Fax do CCITT G3</comment> <comment xml:lang="ro">Fax CCITT G3</comment> - <comment xml:lang="ru">факс CCITT G3</comment> + <comment xml:lang="ru">Факс CCITT G3</comment> <comment xml:lang="sk">Fax CCITT G3</comment> <comment xml:lang="sl">Datoteka faksimila CCITT G3</comment> <comment xml:lang="sq">Fax CCITT G3</comment> @@ -24523,7 +25260,7 @@ <comment xml:lang="pt">imagem de fax G3</comment> <comment xml:lang="pt_BR">Imagem de fax G3</comment> <comment xml:lang="ro">Imagine fax G3</comment> - <comment xml:lang="ru">факсовое изображение G3</comment> + <comment xml:lang="ru">Факсовое изображение G3</comment> <comment xml:lang="sk">Obrázok fax G3</comment> <comment xml:lang="sl">Slikovna datoteka G3 fax</comment> <comment xml:lang="sq">Figurë Fax G3</comment> @@ -24532,7 +25269,7 @@ <comment xml:lang="tr">G3 fax görüntüsü</comment> <comment xml:lang="uk">факс G3</comment> <comment xml:lang="vi">Ảnh điện thư G3</comment> - <comment xml:lang="zh_CN">G3 传真文档</comment> + <comment xml:lang="zh_CN">G3 传真图像</comment> <comment xml:lang="zh_TW">G3 傳真圖</comment> </mime-type> <mime-type type="image/gif"> @@ -24577,7 +25314,7 @@ <comment xml:lang="pt">imagem GIF</comment> <comment xml:lang="pt_BR">Imagem GIF</comment> <comment xml:lang="ro">Imagine GIF</comment> - <comment xml:lang="ru">изображение GIF</comment> + <comment xml:lang="ru">Изображение GIF</comment> <comment xml:lang="sk">Obrázok GIF</comment> <comment xml:lang="sl">Slikovna datoteka GIF</comment> <comment xml:lang="sq">Figurë GIF</comment> @@ -24593,6 +25330,16 @@ </magic> <glob pattern="*.gif"/> </mime-type> + <mime-type type="image/heif"> + <comment>HEIF image</comment> + <acronym>HEIF</acronym> + <expanded-acronym>High Efficiency Image File</expanded-acronym> + <glob pattern="*.heic"/> + <glob pattern="*.heif"/> + <alias type="image/heic"/> + <alias type="image/heic-sequence"/> + <alias type="image/heif-sequence"/> + </mime-type> <mime-type type="image/ief"> <comment>IEF image</comment> <comment xml:lang="ar">صورة IEF</comment> @@ -24634,7 +25381,7 @@ <comment xml:lang="pt">imagem IEF</comment> <comment xml:lang="pt_BR">Imagem IEF</comment> <comment xml:lang="ro">Imagine IEF</comment> - <comment xml:lang="ru">изображение IEF</comment> + <comment xml:lang="ru">Изображение IEF</comment> <comment xml:lang="sk">Obrázok IEF</comment> <comment xml:lang="sl">Slikovna datoteka IEF</comment> <comment xml:lang="sq">Figurë IEF</comment> @@ -24688,7 +25435,7 @@ <comment xml:lang="pt">imagem JPEG</comment> <comment xml:lang="pt_BR">Imagem JPEG</comment> <comment xml:lang="ro">Imagine JPEG</comment> - <comment xml:lang="ru">изображение JPEG</comment> + <comment xml:lang="ru">Изображение JPEG</comment> <comment xml:lang="sk">Obrázok JPEG</comment> <comment xml:lang="sl">Slikovna datoteka JPEG</comment> <comment xml:lang="sq">Figurë JPEG</comment> @@ -24708,69 +25455,164 @@ <glob pattern="*.jpe"/> <alias type="image/pjpeg"/> </mime-type> - <mime-type type="image/jp2"> - <comment>JPEG-2000 image</comment> - <comment xml:lang="ar">صورة JPEG-2000</comment> - <comment xml:lang="be@latin">Vyjava JPEG-2000</comment> - <comment xml:lang="bg">Изображение — JPEG-2000</comment> - <comment xml:lang="ca">imatge JPEG-2000</comment> - <comment xml:lang="cs">obrázek JPEG-2000</comment> - <comment xml:lang="da">JPEG2000-billede</comment> - <comment xml:lang="de">JPEG-2000-Bild</comment> - <comment xml:lang="el">Εικόνα JPEG-2000</comment> - <comment xml:lang="en_GB">JPEG-2000 image</comment> - <comment xml:lang="eo">JPEG-2000-bildo</comment> - <comment xml:lang="es">imagen JPEG-2000</comment> - <comment xml:lang="eu">JPEG-2000 irudia</comment> - <comment xml:lang="fi">JPEG-2000-kuva</comment> - <comment xml:lang="fo">JPEG-2000 mynd</comment> - <comment xml:lang="fr">image JPEG-2000</comment> - <comment xml:lang="ga">íomhá JPEG-2000</comment> - <comment xml:lang="gl">imaxe JPEG-2000</comment> - <comment xml:lang="he">תמונת JPEG-2000</comment> - <comment xml:lang="hr">JPEG-2000 slika</comment> - <comment xml:lang="hu">JPEG-2000 kép</comment> - <comment xml:lang="ia">Imagine JPEG-2000</comment> - <comment xml:lang="id">Citra JPEG-2000</comment> - <comment xml:lang="it">Immagine JPEG-2000</comment> - <comment xml:lang="ja">JPEG-2000 画像</comment> - <comment xml:lang="kk">JPEG-2000 суреті</comment> - <comment xml:lang="ko">JPEG-2000 그림</comment> - <comment xml:lang="lt">JPEG-2000 paveikslėlis</comment> - <comment xml:lang="lv">JPEG-2000 attēls</comment> - <comment xml:lang="ms">Imej JPEG-2000</comment> - <comment xml:lang="nb">JPEG-2000-bilde</comment> - <comment xml:lang="nl">JPEG-2000-afbeelding</comment> - <comment xml:lang="nn">JPEG-2000-bilete</comment> - <comment xml:lang="oc">imatge JPEG-2000</comment> - <comment xml:lang="pl">Obraz JPEG-2000</comment> - <comment xml:lang="pt">imagem JPEG-2000</comment> + <mime-type type="video/x-mjpeg"> + <comment>MJPEG video stream</comment> + <acronym>MJPEG</acronym> + <expanded-acronym>Motion JPEG</expanded-acronym> + <sub-class-of type="image/jpeg"/> + <glob pattern="*.mjpeg"/> + <glob pattern="*.mjpg"/> + </mime-type> + <mime-type type="image/x-jp2-codestream"> + <comment>JPEG-2000 codestream</comment> + <comment xml:lang="ca">flux de codis JPEG-2000</comment> + <comment xml:lang="cs">datový tok JPEG-2000</comment> + <comment xml:lang="de">JPEG-2000 Codestream</comment> + <comment xml:lang="en_GB">JPEG-2000 codestream</comment> + <comment xml:lang="es">secuencia de código JPEG-2000</comment> + <comment xml:lang="hr">JPEG-2000 kôd strujanja</comment> + <comment xml:lang="hu">JPEG-2000 kódfolyam</comment> + <comment xml:lang="id">codestream JPEG-2000</comment> + <comment xml:lang="it">Codestream JPEG-2000</comment> + <comment xml:lang="kk">JPEG-2000 код ағыны</comment> + <comment xml:lang="ko">JPEG-2000 코드스트림</comment> + <comment xml:lang="pl">Strumień kodu JPEG-2000</comment> <comment xml:lang="pt_BR">Imagem JPEG-2000</comment> - <comment xml:lang="ro">Imagine JPEG-2000</comment> - <comment xml:lang="ru">изображение JPEG-2000</comment> - <comment xml:lang="sk">Obrázok JPEG-2000</comment> - <comment xml:lang="sl">Slikovna datoteka JPEG-2000</comment> - <comment xml:lang="sq">Figurë JPEG-2000</comment> - <comment xml:lang="sr">ЈПЕГ-2000 слика</comment> - <comment xml:lang="sv">JPEG-2000-bild</comment> - <comment xml:lang="tr">JPEG-2000 görüntüsü</comment> - <comment xml:lang="uk">зображення JPEG-2000</comment> - <comment xml:lang="vi">Ảnh JPEG-2000</comment> - <comment xml:lang="zh_CN">JPEG-2000 图像</comment> - <comment xml:lang="zh_TW">JPEG-2000 影像</comment> + <comment xml:lang="ru">Кодовый поток JPEG-2000</comment> + <comment xml:lang="sk">JPEG-2000 codestream</comment> + <comment xml:lang="sv">JPEG-2000-kodström</comment> + <comment xml:lang="uk">потік коду JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 码流</comment> + <comment xml:lang="zh_TW">JPEG-2000 代碼串流</comment> + <magic priority="50"> + <match value="0xff4fff51" type="big32" offset="0"/> + </magic> + <glob pattern="*.j2c"/> + <glob pattern="*.j2k"/> + <glob pattern="*.jpc"/> + </mime-type> + <mime-type type="image/jp2"> + <comment>JPEG-2000 JP2 image</comment> + <comment xml:lang="ca">imatge JPEG-2000 JP2</comment> + <comment xml:lang="cs">obrázek JPEG-2000 JP2</comment> + <comment xml:lang="de">JPEG-2000 JP2-Bild</comment> + <comment xml:lang="en_GB">JPEG-2000 JP2 image</comment> + <comment xml:lang="es">imagen JPEG-2000 JP2</comment> + <comment xml:lang="fi">JPEG-2000 JP2 -kuva</comment> + <comment xml:lang="hr">JPEG-2000 JP2 slika</comment> + <comment xml:lang="hu">JPEG-2000 JP2 kép</comment> + <comment xml:lang="id">Citra JPEG-2000 JP2</comment> + <comment xml:lang="it">Immagine JPEG-2000 JP2</comment> + <comment xml:lang="kk">JPEG-2000 JP2 суреті</comment> + <comment xml:lang="ko">JPEG-2000 JP2 그림</comment> + <comment xml:lang="pl">Obraz JP2 JPEG-2000</comment> + <comment xml:lang="pt_BR">Imagem JP2 de JPEG-2000</comment> + <comment xml:lang="ru">Изоражение JPEG-2000 JP2</comment> + <comment xml:lang="sk">Obrázok JPEG-2000 JP2</comment> + <comment xml:lang="sv">JPEG-2000 JP2-bild</comment> + <comment xml:lang="uk">зображення JP2 JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 JP2 图像</comment> + <comment xml:lang="zh_TW">JPEG-2000 JP2 影像</comment> + <acronym>JP2</acronym> + <expanded-acronym>JPEG-2000</expanded-acronym> <alias type="image/jpeg2000"/> - <alias type="image/jpx"/> <alias type="image/jpeg2000-image"/> <alias type="image/x-jpeg2000-image"/> <magic priority="50"> - <match value="\xFF\x4F\xFF\x51\x00" type="string" offset="0"/> - <match value="0x0c6a5020" type="big32" offset="3"/> - <match value="jp2" type="string" offset="20"/> + <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jp2\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/> </magic> <glob pattern="*.jp2"/> - <glob pattern="*.jpx"/> + <glob pattern="*.jpg2"/> + </mime-type> + <mime-type type="image/jpx"> + <comment>JPEG-2000 JPX image</comment> + <comment xml:lang="ca">imatge JPEG-2000 JPX</comment> + <comment xml:lang="cs">obrázek JPEG-2000 JPX</comment> + <comment xml:lang="de">JPEG-2000 JPX-Bild</comment> + <comment xml:lang="en_GB">JPEG-2000 JPX image</comment> + <comment xml:lang="es">imagen JPEG-2000 JPX</comment> + <comment xml:lang="fi">JPEG-2000 JPX -kuva</comment> + <comment xml:lang="hr">JPEG-2000 JPX slika</comment> + <comment xml:lang="hu">JPEG-2000 JPX kép</comment> + <comment xml:lang="id">Citra JPEG-2000 JPX</comment> + <comment xml:lang="it">Immagine JPEG-2000 JPX</comment> + <comment xml:lang="kk">JPEG-2000 JPX суреті</comment> + <comment xml:lang="ko">JPEG-2000 JPX 그림</comment> + <comment xml:lang="pl">Obraz JPX JPEG-2000</comment> + <comment xml:lang="pt_BR">Imagem JPX de JPEG-2000</comment> + <comment xml:lang="ru">Изображение JPEG-2000 JPX</comment> + <comment xml:lang="sk">Obrázok JPEG-2000 JPX</comment> + <comment xml:lang="sv">JPEG-2000 JPX-bild</comment> + <comment xml:lang="uk">зображення JPX JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 JPX 图像</comment> + <comment xml:lang="zh_TW">JPEG-2000 JPX 影像</comment> + <acronym>JPX</acronym> + <expanded-acronym>JPEG-2000 eXtended</expanded-acronym> + <magic priority="50"> + <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jpx\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/> + </magic> <glob pattern="*.jpf"/> - + <glob pattern="*.jpx"/> + </mime-type> + <mime-type type="image/jpm"> + <comment>JPEG-2000 JPM image</comment> + <comment xml:lang="ca">imatge JPEG-2000 JPM</comment> + <comment xml:lang="cs">obrázek JPEG-2000 JPM</comment> + <comment xml:lang="de">JPEG-2000 JPM-Bild</comment> + <comment xml:lang="en_GB">JPEG-2000 JPM image</comment> + <comment xml:lang="es">imagen JPEG-2000 JPM</comment> + <comment xml:lang="fi">JPEG-2000 JPM -kuva</comment> + <comment xml:lang="hr">JPEG-2000 JPM slika</comment> + <comment xml:lang="hu">JPEG-2000 JPM kép</comment> + <comment xml:lang="id">Citra JPEG-2000 JPM</comment> + <comment xml:lang="it">Immagine JPEG-2000 JPM</comment> + <comment xml:lang="kk">JPEG-2000 JPM суреті</comment> + <comment xml:lang="ko">JPEG-2000 JPM 그림</comment> + <comment xml:lang="pl">Obraz JPM JPEG-2000</comment> + <comment xml:lang="pt_BR">Imagem JPM de JPEG-2000</comment> + <comment xml:lang="ru">Изображение JPEG-2000 JPM</comment> + <comment xml:lang="sk">Obrázok JPEG-2000 JPM</comment> + <comment xml:lang="sv">JPEG-2000 JPM-bild</comment> + <comment xml:lang="uk">зображення JPM JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 JPM 图像</comment> + <comment xml:lang="zh_TW">JPEG-2000 JPM 影像</comment> + <acronym>JPM</acronym> + <expanded-acronym>JPEG-2000 Mixed</expanded-acronym> + <magic priority="50"> + <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jpm\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/> + </magic> + <glob pattern="*.jpm"/> + <glob pattern="*.jpgm"/> + </mime-type> + <mime-type type="video/mj2"> + <comment>JPEG-2000 MJ2 video</comment> + <comment xml:lang="ca">vídeo JPEG-2000 MJ2</comment> + <comment xml:lang="cs">video JPEG-2000 MJ2</comment> + <comment xml:lang="de">JPEG-2000 MJ2-Video</comment> + <comment xml:lang="en_GB">JPEG-2000 MJ2 video</comment> + <comment xml:lang="es">vídeo JPEG-2000 MJ2</comment> + <comment xml:lang="fi">JPEG-2000 MJ2 -video</comment> + <comment xml:lang="hr">JPEG-2000 MJ2 video snimka</comment> + <comment xml:lang="hu">JPEG-2000 MJ2 videó</comment> + <comment xml:lang="id">Video JPEG-2000 MJ2</comment> + <comment xml:lang="it">Video JPEG-2000 MJ2</comment> + <comment xml:lang="kk">JPEG-2000 MJ2 видеосы</comment> + <comment xml:lang="ko">JPEG-2000 MJ2 동영상</comment> + <comment xml:lang="pl">Plik wideo MJ2 JPEG-2000</comment> + <comment xml:lang="pt_BR">Imagem MJ2 de JPEG-2000</comment> + <comment xml:lang="ru">Видео JPEG-2000 MJ2</comment> + <comment xml:lang="sk">Video JPEG-2000 MJ2</comment> + <comment xml:lang="sv">JPEG-2000 MJ2-bild</comment> + <comment xml:lang="uk">зображення MJ2 JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 MJ2 视频</comment> + <comment xml:lang="zh_TW">JPEG-2000 MJ2 視訊</comment> + <acronym>MJ2</acronym> + <expanded-acronym>Motion JPEG-2000</expanded-acronym> + <magic priority="50"> + <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a mjp2" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/> + </magic> + <glob pattern="*.mj2"/> + <glob pattern="*.mjp2"/> </mime-type> <mime-type type="image/openraster"> <comment>OpenRaster archiving image</comment> @@ -24807,14 +25649,14 @@ <comment xml:lang="pt">imagem arquivo OpenRaster</comment> <comment xml:lang="pt_BR">Imagem de arquivamento OpenRaster</comment> <comment xml:lang="ro">Arhivă imagine OpenRaster</comment> - <comment xml:lang="ru">архивное изображение OpenRaster</comment> + <comment xml:lang="ru">Архивное изображение OpenRaster</comment> <comment xml:lang="sk">Archivačný obrázok OpenRaster</comment> <comment xml:lang="sl">Odtis arhiva OpenRaster</comment> <comment xml:lang="sr">слика Опен Растер архивирања</comment> <comment xml:lang="sv">OpenRaster-arkivbild</comment> <comment xml:lang="tr">OpenRaster arşivleme görüntüsü</comment> <comment xml:lang="uk">архівоване зображення OpenRaster</comment> - <comment xml:lang="zh_CN">OpenRaster 归档映像</comment> + <comment xml:lang="zh_CN">OpenRaster 归档图像</comment> <comment xml:lang="zh_TW">OpenRaster 封存影像</comment> <sub-class-of type="application/zip"/> <magic priority="70"> @@ -24864,7 +25706,7 @@ <comment xml:lang="pt">superfície DirectDraw</comment> <comment xml:lang="pt_BR">Superfície do DirectDraw</comment> <comment xml:lang="ro">Suprafață DirectDraw</comment> - <comment xml:lang="ru">плоскость DirectDraw</comment> + <comment xml:lang="ru">Плоскость DirectDraw</comment> <comment xml:lang="sk">Plocha DirectDraw</comment> <comment xml:lang="sl">Datoteka predmeta DirectDraw</comment> <comment xml:lang="sq">Superfaqe DirectDraw</comment> @@ -24899,7 +25741,7 @@ <comment xml:lang="ga">cúrsóir X11</comment> <comment xml:lang="gl">Cursor X11</comment> <comment xml:lang="he">סמן של X11</comment> - <comment xml:lang="hr">X11 kursor</comment> + <comment xml:lang="hr">X11 pokazivač</comment> <comment xml:lang="hu">X11 kurzor</comment> <comment xml:lang="ia">Cursor X11</comment> <comment xml:lang="id">Kursor X11</comment> @@ -24917,7 +25759,7 @@ <comment xml:lang="pt">cursor X11</comment> <comment xml:lang="pt_BR">Cursor do X11</comment> <comment xml:lang="ro">Cursor X11</comment> - <comment xml:lang="ru">курсор X11</comment> + <comment xml:lang="ru">Курсор X11</comment> <comment xml:lang="sk">Kurzor X11</comment> <comment xml:lang="sl">Datoteka kazalke X11</comment> <comment xml:lang="sq">Kursor X11</comment> @@ -24971,7 +25813,7 @@ <comment xml:lang="pt">imagem EXR</comment> <comment xml:lang="pt_BR">Imagem EXR</comment> <comment xml:lang="ro">Imagine EXR</comment> - <comment xml:lang="ru">изображение EXR</comment> + <comment xml:lang="ru">Изображение EXR</comment> <comment xml:lang="sk">Obrázok EXR</comment> <comment xml:lang="sl">Slikovna datoteka EXR</comment> <comment xml:lang="sq">Figurë EXR</comment> @@ -25026,7 +25868,7 @@ <comment xml:lang="pt">desenho Quickdraw/PICT de Macintosh</comment> <comment xml:lang="pt_BR">Desenho do Macintosh Quickdraw/PICT</comment> <comment xml:lang="ro">Desen Macintosh Quickdraw/PICT</comment> - <comment xml:lang="ru">рисунок Macintosh Quickdraw/PICT</comment> + <comment xml:lang="ru">Рисунок Macintosh Quickdraw/PICT</comment> <comment xml:lang="sk">Kresba Macintosh QuickDraw/PICT</comment> <comment xml:lang="sl">Datoteka risbe Macintosh Quickdraw/PICT</comment> <comment xml:lang="sq">Vizatim Macintosh Quickdraw/PICT</comment> @@ -25097,7 +25939,7 @@ <comment xml:lang="pt">imagem UFRaw ID</comment> <comment xml:lang="pt_BR">Imagem ID do UFRaw</comment> <comment xml:lang="ro">ID imagine UFRaw</comment> - <comment xml:lang="ru">изображение UFRaw ID</comment> + <comment xml:lang="ru">Изображение UFRaw ID</comment> <comment xml:lang="sk">Obrázok ID UFRaw</comment> <comment xml:lang="sl">Slikovna datoteka UFRaw ID</comment> <comment xml:lang="sq">Figurë UFRaw ID</comment> @@ -25130,7 +25972,7 @@ <comment xml:lang="fi">digitaalinen raakakuva</comment> <comment xml:lang="fo">talgild rámynd</comment> <comment xml:lang="fr">image brute numérique</comment> - <comment xml:lang="ga">amhíomhá digiteach</comment> + <comment xml:lang="ga">amhíomhá dhigiteach</comment> <comment xml:lang="gl">imaxe en bruto dixital</comment> <comment xml:lang="he">תמונה דיגטלית גולמית</comment> <comment xml:lang="hr">Digitalna osnovna slika</comment> @@ -25151,7 +25993,7 @@ <comment xml:lang="pt">imagem digital em bruto</comment> <comment xml:lang="pt_BR">Imagem digital bruta</comment> <comment xml:lang="ro">imagine digitală brută</comment> - <comment xml:lang="ru">необработанные цифровые изображения</comment> + <comment xml:lang="ru">Необработанное цифровое изображение</comment> <comment xml:lang="sk">Digitálny surový obrázok</comment> <comment xml:lang="sl">surova digitalna slika</comment> <comment xml:lang="sq">Figurë raw dixhitale</comment> @@ -25201,7 +26043,7 @@ <comment xml:lang="pt">negativo Adobe DNG</comment> <comment xml:lang="pt_BR">Negativo DNG da Adobe</comment> <comment xml:lang="ro">Negativ Adobe DNG</comment> - <comment xml:lang="ru">негатив Adobe DNG</comment> + <comment xml:lang="ru">Негатив Adobe DNG</comment> <comment xml:lang="sk">Adobe Digital Negative (DNG)</comment> <comment xml:lang="sl">Datoteka negativa Adobe DNG</comment> <comment xml:lang="sq">Negativ Adobe DNG</comment> @@ -25258,7 +26100,7 @@ <comment xml:lang="pt">imagem em bruto Canon CRW</comment> <comment xml:lang="pt_BR">Imagem bruta CRW da Canon</comment> <comment xml:lang="ro">Imagine brută Canon CRW</comment> - <comment xml:lang="ru">необработанное изображение Canon CRW</comment> + <comment xml:lang="ru">Необработанное изображение Canon CRW</comment> <comment xml:lang="sk">Surový obrázok Canon CRW</comment> <comment xml:lang="sl">Surova slikovna datoteka Canon CRW</comment> <comment xml:lang="sq">Figurë raw Canon CRW</comment> @@ -25267,7 +26109,7 @@ <comment xml:lang="tr">Canon CRW ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив CRW Canon</comment> <comment xml:lang="vi">Ảnh thô Canon CRW</comment> - <comment xml:lang="zh_CN">Canon CRW 原始图像</comment> + <comment xml:lang="zh_CN">佳能 CRW 原始图像</comment> <comment xml:lang="zh_TW">Canon CRW 原生影像</comment> <acronym>CRW</acronym> <expanded-acronym>Canon RaW</expanded-acronym> @@ -25316,7 +26158,7 @@ <comment xml:lang="pt">imagem em bruto Canon CR2</comment> <comment xml:lang="pt_BR">Imagem bruta CR2 da Canon</comment> <comment xml:lang="ro">Imagine brută Canon CR2</comment> - <comment xml:lang="ru">необработанное изображение Canon CR2</comment> + <comment xml:lang="ru">Необработанное изображение Canon CR2</comment> <comment xml:lang="sk">Surový obrázok Canon CR2</comment> <comment xml:lang="sl">Surova slikovna datoteka Canon CR2</comment> <comment xml:lang="sq">Figurë raw Canon CR2</comment> @@ -25325,7 +26167,7 @@ <comment xml:lang="tr">Canon CR2 ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив CR2 Canon</comment> <comment xml:lang="vi">Ảnh thô Canon CR2</comment> - <comment xml:lang="zh_CN">Canon CR2 原始图像</comment> + <comment xml:lang="zh_CN">佳能 CR2 原始图像</comment> <comment xml:lang="zh_TW">Canon CR2 原生影像</comment> <acronym>CR2</acronym> <expanded-acronym>Canon Raw 2</expanded-acronym> @@ -25371,7 +26213,7 @@ <comment xml:lang="pt">imagem em bruto Fuji RAF</comment> <comment xml:lang="pt_BR">Imagem bruta RAF da Fuji</comment> <comment xml:lang="ro">Imagine brută Fuji RAF</comment> - <comment xml:lang="ru">необработанное изображение Fuji RAF</comment> + <comment xml:lang="ru">Необработанное изображение Fuji RAF</comment> <comment xml:lang="sk">Surový obrázok Fuji RAF</comment> <comment xml:lang="sl">Surova slikovna datoteka Fuji RAF</comment> <comment xml:lang="sq">Figurë raw Fuji RAF</comment> @@ -25380,7 +26222,7 @@ <comment xml:lang="tr">Fuji RAF ham görüntüsü</comment> <comment xml:lang="uk">Цифровий негатив RAF Fuji</comment> <comment xml:lang="vi">Ảnh thô Fuji RAF</comment> - <comment xml:lang="zh_CN">富士RAF 原始图像</comment> + <comment xml:lang="zh_CN">富士 RAF 原始图像</comment> <comment xml:lang="zh_TW">Fuji RAF 原生影像</comment> <acronym>RAF</acronym> <expanded-acronym>RAw Format</expanded-acronym> @@ -25427,7 +26269,7 @@ <comment xml:lang="pt">imagem em bruto Kodak DCR</comment> <comment xml:lang="pt_BR">Imagem bruta DCR da Kodak</comment> <comment xml:lang="ro">Imagine brută Kodak DCR</comment> - <comment xml:lang="ru">необработанное изображение Kodak DCR</comment> + <comment xml:lang="ru">Необработанное изображение Kodak DCR</comment> <comment xml:lang="sk">Surový obrázok Kodak DCR</comment> <comment xml:lang="sl">Surova slikovna datoteka Kodak DCR</comment> <comment xml:lang="sq">Figurë raw Kodak DCR</comment> @@ -25436,7 +26278,7 @@ <comment xml:lang="tr">Kodak DCR ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив DCR Kodak</comment> <comment xml:lang="vi">Ảnh thô Kodak DCR</comment> - <comment xml:lang="zh_CN">Kodak DCR 原始图像</comment> + <comment xml:lang="zh_CN">柯达 DCR 原始图像</comment> <comment xml:lang="zh_TW">Kodak DCR 原生影像</comment> <acronym>DCR</acronym> <expanded-acronym>Digital Camera Raw</expanded-acronym> @@ -25481,7 +26323,7 @@ <comment xml:lang="pt">imagem em bruto Kodak K25</comment> <comment xml:lang="pt_BR">Imagem bruta K25 da Kodak</comment> <comment xml:lang="ro">Imagine brută Kodak K25</comment> - <comment xml:lang="ru">необработанное изображение Kodak K25</comment> + <comment xml:lang="ru">Необработанное изображение Kodak K25</comment> <comment xml:lang="sk">Surový obrázok Kodak K25</comment> <comment xml:lang="sl">Surova slikovna datoteka Kodak K25</comment> <comment xml:lang="sq">Figurë raw Kodak K25</comment> @@ -25490,7 +26332,7 @@ <comment xml:lang="tr">Kodak K25 ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив K25 Kodak</comment> <comment xml:lang="vi">Ảnh thô Kodak K25</comment> - <comment xml:lang="zh_CN">Kodak K25 原始图像</comment> + <comment xml:lang="zh_CN">柯达 K25 原始图像</comment> <comment xml:lang="zh_TW">Kodak K25 原生影像</comment> <acronym>K25</acronym> <expanded-acronym>Kodak DC25</expanded-acronym> @@ -25535,7 +26377,7 @@ <comment xml:lang="pt">imagem em bruto Kodak KDC</comment> <comment xml:lang="pt_BR">Imagem bruta KDC da Kodak</comment> <comment xml:lang="ro">Imagine brută Kodak KDC</comment> - <comment xml:lang="ru">необработанное изображение Kodak KDC</comment> + <comment xml:lang="ru">Необработанное изображение Kodak KDC</comment> <comment xml:lang="sk">Surový obrázok Kodak KDC</comment> <comment xml:lang="sl">Surova slikovna datoteka Kodak KDC</comment> <comment xml:lang="sq">Figurë raw Kodak KDC</comment> @@ -25544,7 +26386,7 @@ <comment xml:lang="tr">Kodak KDC ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив KDC Kodak</comment> <comment xml:lang="vi">Ảnh thô Kodak KDC</comment> - <comment xml:lang="zh_CN">Kodak KDC 原始图像</comment> + <comment xml:lang="zh_CN">柯达 KDC 原始图像</comment> <comment xml:lang="zh_TW">Kodak KDC 原生影像</comment> <acronym>KDC</acronym> <expanded-acronym>Kodak Digital Camera</expanded-acronym> @@ -25592,7 +26434,7 @@ <comment xml:lang="pt">imagem em bruto Minolta MRW</comment> <comment xml:lang="pt_BR">Imagem bruta MRW do Minolta</comment> <comment xml:lang="ro">Imagine brută Minolta MRW</comment> - <comment xml:lang="ru">необработанное изображение Minolta MRW</comment> + <comment xml:lang="ru">Необработанное изображение Minolta MRW</comment> <comment xml:lang="sk">Surový obrázok Minolta MRW</comment> <comment xml:lang="sl">Surova slikovna datoteka Minolta MRW</comment> <comment xml:lang="sq">Figurë raw Minolta MRW</comment> @@ -25601,7 +26443,7 @@ <comment xml:lang="tr">Minolta MRW ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив MRW Minolta</comment> <comment xml:lang="vi">Ảnh thô Minolta MRW</comment> - <comment xml:lang="zh_CN">Minolta MRW 原始图像</comment> + <comment xml:lang="zh_CN">美能达 MRW 原始图像</comment> <comment xml:lang="zh_TW">Minolta MRW 原生影像</comment> <acronym>MRW</acronym> <expanded-acronym>Minolta RaW</expanded-acronym> @@ -25648,7 +26490,7 @@ <comment xml:lang="pt">imagem em bruto Nikon NEF</comment> <comment xml:lang="pt_BR">Imagem bruta NEF da Nikon</comment> <comment xml:lang="ro">Imagine brută Nikon NEF</comment> - <comment xml:lang="ru">необработанное изображение Nikon NEF</comment> + <comment xml:lang="ru">Необработанное изображение Nikon NEF</comment> <comment xml:lang="sk">Surový obrázok Nikon NEF</comment> <comment xml:lang="sl">Surova slikovna datoteka Nikon NEF</comment> <comment xml:lang="sq">Figurë raw Nikon NEF</comment> @@ -25657,7 +26499,7 @@ <comment xml:lang="tr">Nikon NEF ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив NEF Nikon</comment> <comment xml:lang="vi">Ảnh thô Nikon NEF</comment> - <comment xml:lang="zh_CN">Nikon NEF 原始图像</comment> + <comment xml:lang="zh_CN">尼康 NEF 原始图像</comment> <comment xml:lang="zh_TW">Nikon NEF 原生影像</comment> <acronym>NEF</acronym> <expanded-acronym>Nikon Electronic Format</expanded-acronym> @@ -25703,7 +26545,7 @@ <comment xml:lang="pt">imagem em bruto Olympus ORF</comment> <comment xml:lang="pt_BR">Imagem bruta ORF da Olympus</comment> <comment xml:lang="ro">Imagine brută Olympus ORF</comment> - <comment xml:lang="ru">необработанное изображение Olympus ORF</comment> + <comment xml:lang="ru">Необработанное изображение Olympus ORF</comment> <comment xml:lang="sk">Surový obrázok Olympus ORF</comment> <comment xml:lang="sl">Surova slikovna datoteka Olympus ORF</comment> <comment xml:lang="sq">Figurë raw Olympus ORF</comment> @@ -25712,7 +26554,7 @@ <comment xml:lang="tr">Olympus ORF ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив ORF Olympus</comment> <comment xml:lang="vi">Ảnh thô Olympus ORF</comment> - <comment xml:lang="zh_CN">Olympus ORF 原始图像</comment> + <comment xml:lang="zh_CN">奥林巴斯 ORF 原始图像</comment> <comment xml:lang="zh_TW">Olympus ORF 原生影像</comment> <acronym>ORF</acronym> <expanded-acronym>Olympus Raw Format</expanded-acronym> @@ -25727,7 +26569,7 @@ </magic> <glob pattern="*.orf"/> </mime-type> - <mime-type type="image/x-panasonic-raw"> + <mime-type type="image/x-panasonic-rw"> <comment>Panasonic raw image</comment> <comment xml:lang="ar">صورة Panasonic خامة</comment> <comment xml:lang="be@latin">Suvoraja vyjava Panasonic</comment> @@ -25764,7 +26606,7 @@ <comment xml:lang="pt">imagem em bruto Panasonic</comment> <comment xml:lang="pt_BR">Imagem bruta da Panasonic</comment> <comment xml:lang="ro">Imagine brută Panasonic</comment> - <comment xml:lang="ru">необработанное изображение Panasonic</comment> + <comment xml:lang="ru">Необработанное изображение Panasonic</comment> <comment xml:lang="sk">Surový obrázok Panasonic</comment> <comment xml:lang="sl">Surova slikovna datoteka Panasonic</comment> <comment xml:lang="sq">Figurë raw Panasonic</comment> @@ -25773,7 +26615,7 @@ <comment xml:lang="tr">Panasonic ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив Panasonic</comment> <comment xml:lang="vi">Ảnh thô Panasonic</comment> - <comment xml:lang="zh_CN">Panasonic 原始图像</comment> + <comment xml:lang="zh_CN">松下原始图像</comment> <comment xml:lang="zh_TW">Panasonic 原生影像</comment> <sub-class-of type="image/x-dcraw"/> <magic priority="50"> @@ -25781,8 +26623,9 @@ <match value="IIU\x00\x08\x00\x00\x00" type="string" offset="0"/> </magic> <glob pattern="*.raw"/> + <alias type="image/x-panasonic-raw"/> </mime-type> - <mime-type type="image/x-panasonic-raw2"> + <mime-type type="image/x-panasonic-rw2"> <comment>Panasonic raw2 image</comment> <comment xml:lang="bg">Изображение — Panasonic raw2</comment> <comment xml:lang="ca">imatge «RAW2» de Panasonic</comment> @@ -25795,6 +26638,7 @@ <comment xml:lang="eu">Panasonic raw2 irudia</comment> <comment xml:lang="fi">Panasonic raw2 -kuva</comment> <comment xml:lang="fr">image raw2 Panasonic</comment> + <comment xml:lang="ga">íomhá raw2 Panasonic</comment> <comment xml:lang="gl">imaxe en bruto raw2 de Panasonic</comment> <comment xml:lang="he">תמונת raw2 של Panasonic</comment> <comment xml:lang="hr">Panasonic raw2 image</comment> @@ -25811,14 +26655,14 @@ <comment xml:lang="pl">Obraz raw2 Panasonic</comment> <comment xml:lang="pt">imagem em bruto Panasonic</comment> <comment xml:lang="pt_BR">Imagem raw2 da Panasonic</comment> - <comment xml:lang="ru">необработанное изображение Panasonic RAW 2</comment> + <comment xml:lang="ru">Необработанное изображение Panasonic raw2</comment> <comment xml:lang="sk">Surový obrázok Panasonic raw2</comment> <comment xml:lang="sl">Slikovna datoteka Panasonic raw2</comment> <comment xml:lang="sr">Панасоник сирова2 слика</comment> <comment xml:lang="sv">Panasonic raw2-bild</comment> <comment xml:lang="tr">Panasonic raw2 görüntüsü</comment> <comment xml:lang="uk">зображення формату raw2 Panasonic</comment> - <comment xml:lang="zh_CN">Panasonic raw2 图像</comment> + <comment xml:lang="zh_CN">松下 raw2 图像</comment> <comment xml:lang="zh_TW">Panasonic raw2 影像</comment> <sub-class-of type="image/x-dcraw"/> <magic priority="50"> @@ -25826,6 +26670,7 @@ <match value="IIU\x00\x18\x00\x00\x00" type="string" offset="0"/> </magic> <glob pattern="*.rw2"/> + <alias type="image/x-panasonic-raw2"/> </mime-type> <mime-type type="image/x-pentax-pef"> <comment>Pentax PEF raw image</comment> @@ -25864,7 +26709,7 @@ <comment xml:lang="pt">imagem em bruto Pentax PEF</comment> <comment xml:lang="pt_BR">Imagem bruta PEF da Pentax</comment> <comment xml:lang="ro">Imagine brută Pentax PEF</comment> - <comment xml:lang="ru">необработанное изображение Pentax PEF</comment> + <comment xml:lang="ru">Необработанное изображение Pentax PEF</comment> <comment xml:lang="sk">Surový obrázok Pentax PEF</comment> <comment xml:lang="sl">Surova slikovna datoteka Pentax PEF</comment> <comment xml:lang="sq">Figurë raw Pentax PEF</comment> @@ -25873,7 +26718,7 @@ <comment xml:lang="tr">Pentax PEF ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив PEF Pentax</comment> <comment xml:lang="vi">Ảnh thô Pentax PEF</comment> - <comment xml:lang="zh_CN">Pentax PEF 原始图像</comment> + <comment xml:lang="zh_CN">宾得 PEF 原始图像</comment> <comment xml:lang="zh_TW">Pentax PEF 原生影像</comment> <acronym>PEF</acronym> <expanded-acronym>Pentax Electronic Format</expanded-acronym> @@ -25918,7 +26763,7 @@ <comment xml:lang="pt">imagem em bruto Sigma X3F</comment> <comment xml:lang="pt_BR">Imagem bruta X3F da Sigma</comment> <comment xml:lang="ro">Imagine brută Sigma X3F</comment> - <comment xml:lang="ru">необработанное изображение Sigma X3F</comment> + <comment xml:lang="ru">Необработанное изображение Sigma X3F</comment> <comment xml:lang="sk">Surový obrázok Sigma X3F</comment> <comment xml:lang="sl">Surova slikovna datoteka Sigma X3F</comment> <comment xml:lang="sq">Fifurë raw Sigma X3F</comment> @@ -25927,7 +26772,7 @@ <comment xml:lang="tr">Sigma X3F ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив X3F Sigma</comment> <comment xml:lang="vi">Ảnh thô Sigma X3F</comment> - <comment xml:lang="zh_CN">Sigma X3F 原始图像</comment> + <comment xml:lang="zh_CN">适马 X3F 原始图像</comment> <comment xml:lang="zh_TW">Sigma X3F 原生影像</comment> <acronym>X3F</acronym> <expanded-acronym>X3 Foveon</expanded-acronym> @@ -25978,7 +26823,7 @@ <comment xml:lang="pt">imagem em bruto Sony SRF</comment> <comment xml:lang="pt_BR">Imagem bruta SRF da Sony</comment> <comment xml:lang="ro">Imagine brută Sony SRF</comment> - <comment xml:lang="ru">необработанное изображение Sony SRF</comment> + <comment xml:lang="ru">Необработанное изображение Sony SRF</comment> <comment xml:lang="sk">Surový obrázok Sony SRF</comment> <comment xml:lang="sl">Surova slikovna datoteka Sony SRF</comment> <comment xml:lang="sq">Figurë raw Sony SRF</comment> @@ -25987,7 +26832,7 @@ <comment xml:lang="tr">Sony SRF ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив SRF Sony</comment> <comment xml:lang="vi">Ảnh thô Sony SRF</comment> - <comment xml:lang="zh_CN">Sony SRF 原始映像</comment> + <comment xml:lang="zh_CN">索尼 SRF 原始映像</comment> <comment xml:lang="zh_TW">Sony SRF 原生影像</comment> <acronym>SRF</acronym> <expanded-acronym>Sony Raw Format</expanded-acronym> @@ -26032,7 +26877,7 @@ <comment xml:lang="pt">imagem em bruto Sony SR2</comment> <comment xml:lang="pt_BR">Imagem bruta SR2 da Sony</comment> <comment xml:lang="ro">Imagine brută Sony SR2</comment> - <comment xml:lang="ru">необработанное изображение Sony SR2</comment> + <comment xml:lang="ru">Необработанное изображение Sony SR2</comment> <comment xml:lang="sk">Surový obrázok Sony SR2</comment> <comment xml:lang="sl">Surova slikovna datoteka Sony SR2</comment> <comment xml:lang="sq">Figurë raw Sony SR2</comment> @@ -26041,7 +26886,7 @@ <comment xml:lang="tr">Sony SR2 ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив SR2 Sony</comment> <comment xml:lang="vi">Ảnh thô Sony SR2</comment> - <comment xml:lang="zh_CN">Sony SR2 原始映像</comment> + <comment xml:lang="zh_CN">索尼 SR2 原始映像</comment> <comment xml:lang="zh_TW">Sony SR2 原生影像</comment> <acronym>SR2</acronym> <expanded-acronym>Sony Raw format 2</expanded-acronym> @@ -26086,7 +26931,7 @@ <comment xml:lang="pt">imagem em bruto Sony ARW</comment> <comment xml:lang="pt_BR">Imagem bruta ARW da Sony</comment> <comment xml:lang="ro">Imagine brută Sony ARW</comment> - <comment xml:lang="ru">необработанное изображение Sony ARW</comment> + <comment xml:lang="ru">Необработанное изображение Sony ARW</comment> <comment xml:lang="sk">Surový obrázok Sony ARW</comment> <comment xml:lang="sl">Surova slikovna datoteka Sony ARW</comment> <comment xml:lang="sq">Figurë raw Sony ARW</comment> @@ -26095,7 +26940,7 @@ <comment xml:lang="tr">Sony ARW ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив ARW Sony</comment> <comment xml:lang="vi">Ảnh thô Sony ARW</comment> - <comment xml:lang="zh_CN">Sony ARW 原始映像</comment> + <comment xml:lang="zh_CN">索尼 ARW 原始映像</comment> <comment xml:lang="zh_TW">Sony ARW 原生影像</comment> <acronym>ARW</acronym> <expanded-acronym>Alpha Raw format</expanded-acronym> @@ -26144,7 +26989,7 @@ <comment xml:lang="pt">imagem PNG</comment> <comment xml:lang="pt_BR">Imagem PNG</comment> <comment xml:lang="ro">Imagine PNG</comment> - <comment xml:lang="ru">изображение PNG</comment> + <comment xml:lang="ru">Изображение PNG</comment> <comment xml:lang="sk">Obrázok PNG</comment> <comment xml:lang="sl">Slikovna datoteka PNG</comment> <comment xml:lang="sq">Figurë PNG</comment> @@ -26175,7 +27020,7 @@ <comment xml:lang="eu">'Run Lenght Encoded' bitmap irudia</comment> <comment xml:lang="fi">RLE-koodattu bittikartta</comment> <comment xml:lang="fr">image matricielle Run Length Encoded</comment> - <comment xml:lang="ga">íomhá mhapa giotáin Run Length Encoded</comment> + <comment xml:lang="ga">íomhá ghiotánmhapach ionchódaithe fad reatha</comment> <comment xml:lang="gl">mapa de bits con codificación do tamaño durante a execución</comment> <comment xml:lang="he">מקודד מפת סיביות של Run Length</comment> <comment xml:lang="hr">Run Length Encoded bitmap slika</comment> @@ -26196,7 +27041,7 @@ <comment xml:lang="pt">mapa de bitas Run Length Encoded</comment> <comment xml:lang="pt_BR">Classe de comprimento imagem bitmap codificada</comment> <comment xml:lang="ro">Imagine bitmap codată RLE</comment> - <comment xml:lang="ru">растровое изображение (сжатое RLE)</comment> + <comment xml:lang="ru">Растровое изображение, сжатое RLE</comment> <comment xml:lang="sk">Bitmapový obrázok Run Length Encoded</comment> <comment xml:lang="sl">Zaporedno kodirana bitna slika (RLE)</comment> <comment xml:lang="sq">Figurë bitmap RLE (Run Length Encoded)</comment> @@ -26247,7 +27092,7 @@ <comment xml:lang="pt">imagem SVG</comment> <comment xml:lang="pt_BR">Imagem SVG</comment> <comment xml:lang="ro">Imagine SVG</comment> - <comment xml:lang="ru">изображение SVG</comment> + <comment xml:lang="ru">Изображение SVG</comment> <comment xml:lang="sk">Obrázok SVG</comment> <comment xml:lang="sl">Slikovna vektorska datoteka SVG</comment> <comment xml:lang="sq">Figurë SVG</comment> @@ -26287,7 +27132,7 @@ <comment xml:lang="ga">íomhá SVG comhbhrúite</comment> <comment xml:lang="gl">imaxe SVG comprimida</comment> <comment xml:lang="he">תמונת SVG מכווצת</comment> - <comment xml:lang="hr">komprimirana SVG slika</comment> + <comment xml:lang="hr">Sažeta SVG slika</comment> <comment xml:lang="hu">tömörített SVG kép</comment> <comment xml:lang="ia">Imagine SVG comprimite</comment> <comment xml:lang="id">Citra SVG terkompresi</comment> @@ -26305,7 +27150,7 @@ <comment xml:lang="pt">imagem SVG comprimida</comment> <comment xml:lang="pt_BR">Imagem SVG compactada</comment> <comment xml:lang="ro">imagine comprimată SVG</comment> - <comment xml:lang="ru">сжатое изображение SVG</comment> + <comment xml:lang="ru">Сжатое изображение SVG</comment> <comment xml:lang="sk">Komprimovaný obrázok SVG</comment> <comment xml:lang="sl">Slikovna datoteka SVG (stisnjena)</comment> <comment xml:lang="sq">Figurë SVG e kompresuar</comment> @@ -26360,7 +27205,7 @@ <comment xml:lang="pt">imagem TIFF</comment> <comment xml:lang="pt_BR">Imagem TIFF</comment> <comment xml:lang="ro">Imagine TIFF</comment> - <comment xml:lang="ru">изображение TIFF</comment> + <comment xml:lang="ru">Изображение TIFF</comment> <comment xml:lang="sk">Obrázok TIFF</comment> <comment xml:lang="sl">Slikovna datoteka TIFF</comment> <comment xml:lang="sq">Figurë TIFF</comment> @@ -26389,9 +27234,9 @@ <comment xml:lang="el">Πολυσέλιδη εικόνα TIFF</comment> <comment xml:lang="en_GB">Multi-page TIFF image</comment> <comment xml:lang="es">imagen TIFF de varias páginas</comment> - <comment xml:lang="eu">Orri anitzeko TIFF irudia</comment> <comment xml:lang="fi">Monisivuinen TIFF-kuva</comment> <comment xml:lang="fr">Image TIFF multi-page</comment> + <comment xml:lang="ga">íomhá il-leathanach TIFF</comment> <comment xml:lang="gl">Imaxe TIFF multipáxina</comment> <comment xml:lang="he">תמונת TIFF עם ריבוי עמודים</comment> <comment xml:lang="hr">Višestrana TIFF slika</comment> @@ -26425,7 +27270,7 @@ <comment xml:lang="be@latin">Vyjava AutoCAD</comment> <comment xml:lang="bg">Изображение — AutoCAD</comment> <comment xml:lang="ca">imatge d'AutoCAD</comment> - <comment xml:lang="cs">obrázek AutoCAD</comment> + <comment xml:lang="cs">výkres AutoCAD</comment> <comment xml:lang="cy">Delwedd AutoCAD</comment> <comment xml:lang="da">AutoCAD-billede</comment> <comment xml:lang="de">AutoCAD-Bild</comment> @@ -26460,7 +27305,7 @@ <comment xml:lang="pt">imagem AutoCAD</comment> <comment xml:lang="pt_BR">Imagem do AutoCAD</comment> <comment xml:lang="ro">Imagine AutoCAD</comment> - <comment xml:lang="ru">изображение AutoCAD</comment> + <comment xml:lang="ru">Изображение AutoCAD</comment> <comment xml:lang="sk">Obrázok AutoCAD</comment> <comment xml:lang="sl">Slikovna datoteka AutoCAD</comment> <comment xml:lang="sq">Figurë AutoCAD</comment> @@ -26490,7 +27335,7 @@ <comment xml:lang="fi">DXF-vektorikuva</comment> <comment xml:lang="fo">DXF vektormynd</comment> <comment xml:lang="fr">image vectorielle DXF</comment> - <comment xml:lang="ga">íomhá veicteoir DXF</comment> + <comment xml:lang="ga">íomhá veicteoireach DXF</comment> <comment xml:lang="gl">imaxe de vector DXF</comment> <comment xml:lang="he">תמונת DXF וקטורית</comment> <comment xml:lang="hr">DXF vektorska slika</comment> @@ -26513,7 +27358,7 @@ <comment xml:lang="pt">imagem de vectores DXF</comment> <comment xml:lang="pt_BR">Imagem vetorial DXF</comment> <comment xml:lang="ro">Imagine vectorială DXF</comment> - <comment xml:lang="ru">векторное изображение DXF</comment> + <comment xml:lang="ru">Векторное изображение DXF</comment> <comment xml:lang="sk">Vektorový obrázok DXF</comment> <comment xml:lang="sl">Slikovna vektorska datoteka DXF</comment> <comment xml:lang="sq">Figurë vektoriale DFX</comment> @@ -26533,6 +27378,7 @@ <mime-type type="image/vnd.ms-modi"> <comment>Microsoft Document Imaging format</comment> <comment xml:lang="ar">صيغة مستند تصوير مايكروسوفت</comment> + <comment xml:lang="ast">Formatu d'imáxenes de Microsoft Document</comment> <comment xml:lang="bg">Изображение — Microsoft Document Imaging</comment> <comment xml:lang="ca">format Microsoft Document Imaging</comment> <comment xml:lang="cs">formát Microsoft Document Imaging</comment> @@ -26564,7 +27410,7 @@ <comment xml:lang="pt">formato Microsoft Document Imaging</comment> <comment xml:lang="pt_BR">Formato do Microsoft Document Imaging</comment> <comment xml:lang="ro">Format Microsoft Document Imaging</comment> - <comment xml:lang="ru">формат Microsoft Document Imaging</comment> + <comment xml:lang="ru">Формат Microsoft Document Imaging</comment> <comment xml:lang="sk">Formát Microsoft Document Imaging</comment> <comment xml:lang="sl">Zapis Microsoft Document Imaging</comment> <comment xml:lang="sr">запис слика Мајкрософтовог документа</comment> @@ -26572,7 +27418,7 @@ <comment xml:lang="tr">Microsoft Belge Görüntüleme biçimi</comment> <comment xml:lang="uk">формат Microsoft Document Imaging</comment> <comment xml:lang="vi">Định dạng tạo ảnh tài liệu Microsoft</comment> - <comment xml:lang="zh_CN">Microsoft Document Imaging 扫描图像</comment> + <comment xml:lang="zh_CN">Microsoft Document Imaging 格式</comment> <comment xml:lang="zh_TW">微軟文件影像格式</comment> <acronym>MDI</acronym> <expanded-acronym>Microsoft Document Imaging</expanded-acronym> @@ -26593,6 +27439,7 @@ <comment xml:lang="eu">WebP irudia</comment> <comment xml:lang="fi">WebP-kuva</comment> <comment xml:lang="fr">image WebP</comment> + <comment xml:lang="ga">íomhá WebP</comment> <comment xml:lang="gl">Imaxe WebP</comment> <comment xml:lang="he">תמונת WebP</comment> <comment xml:lang="hr">WebP slika</comment> @@ -26664,7 +27511,7 @@ <comment xml:lang="pt">imagem 3D Studio</comment> <comment xml:lang="pt_BR">Imagem do 3D Studio</comment> <comment xml:lang="ro">Imagine 3D Studio</comment> - <comment xml:lang="ru">сцена 3D Studio</comment> + <comment xml:lang="ru">Сцена 3D Studio</comment> <comment xml:lang="sk">Obrázok 3D Studio</comment> <comment xml:lang="sl">Slikovna datoteka 3D Studio</comment> <comment xml:lang="sq">Figurë 3D Studio</comment> @@ -26717,7 +27564,7 @@ <comment xml:lang="pt">imagem Applix Graphics</comment> <comment xml:lang="pt_BR">Imagem do Applix Graphics</comment> <comment xml:lang="ro">Imagine Applix Graphics</comment> - <comment xml:lang="ru">изображение Applix Graphics</comment> + <comment xml:lang="ru">Изображение Applix Graphics</comment> <comment xml:lang="sk">Obrázok Applix Graphics</comment> <comment xml:lang="sl">Slikovna datoteka Applix Graphics</comment> <comment xml:lang="sq">Figurë Applix Graphics</comment> @@ -26754,7 +27601,7 @@ <comment xml:lang="ga">íomhá EPS (comhbhrúite le bzip)</comment> <comment xml:lang="gl">imaxe EPS (comprimida con bzip)</comment> <comment xml:lang="he">תמונת EPS (מכווץ בbzip)</comment> - <comment xml:lang="hr">EPS slika (komprimirana bzip-om)</comment> + <comment xml:lang="hr">EPS slika (bzip sažeta)</comment> <comment xml:lang="hu">EPS kép (bzip-tömörítésű)</comment> <comment xml:lang="ia">Imagine EPS (comprimite con bzip)</comment> <comment xml:lang="id">Citra EPS (terkompresi bzip)</comment> @@ -26773,7 +27620,7 @@ <comment xml:lang="pt">imagem EPS (compressão bzip)</comment> <comment xml:lang="pt_BR">Imagem EPS (compactada com bzip)</comment> <comment xml:lang="ro">Imagine EPS (compresie bzip)</comment> - <comment xml:lang="ru">изображение EPS (сжатое bzip)</comment> + <comment xml:lang="ru">Изображение EPS (сжатое bzip)</comment> <comment xml:lang="sk">Obrázok EPS (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Slikovna datoteka EPS (stisnjena z bzip)</comment> <comment xml:lang="sq">Figurë EPS (e kompresuar me bzip)</comment> @@ -26782,7 +27629,7 @@ <comment xml:lang="tr">EPS görüntüsü (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">зображення EPS (стиснене bzip)</comment> <comment xml:lang="vi">Ảnh EPS (đã nén bzip)</comment> - <comment xml:lang="zh_CN">EPS 图像(bzip 压缩)</comment> + <comment xml:lang="zh_CN">EPS 图像（bzip 压缩）</comment> <comment xml:lang="zh_TW">EPS 影像 (bzip 格式壓縮)</comment> <sub-class-of type="application/x-bzip"/> <glob pattern="*.eps.bz2"/> @@ -26831,7 +27678,7 @@ <comment xml:lang="pt">imagem raster CMU</comment> <comment xml:lang="pt_BR">Imagem raster CMU</comment> <comment xml:lang="ro">Imagine raster CMU</comment> - <comment xml:lang="ru">растровое изображение CMU</comment> + <comment xml:lang="ru">Растровое изображение CMU</comment> <comment xml:lang="sk">Rastrový obrázok CMU</comment> <comment xml:lang="sl">Slikovna rastrska datoteka CMU</comment> <comment xml:lang="sq">Figurë raster CMU</comment> @@ -26840,7 +27687,7 @@ <comment xml:lang="tr">CMU tarama görüntüsü</comment> <comment xml:lang="uk">растрове зображення CMU</comment> <comment xml:lang="vi">Ảnh mành CMU</comment> - <comment xml:lang="zh_CN">CMU 矢量图像</comment> + <comment xml:lang="zh_CN">CMU 光栅图像</comment> <comment xml:lang="zh_TW">CMU raster 影像</comment> <glob pattern="*.ras"/> </mime-type> @@ -26881,7 +27728,7 @@ <comment xml:lang="pt">imagem GIMP comprimida</comment> <comment xml:lang="pt_BR">Imagem do GIMP compactada</comment> <comment xml:lang="ro">imagine comprimată GIMP</comment> - <comment xml:lang="ru">сжатое изображение GIMP</comment> + <comment xml:lang="ru">Сжатое изображение GIMP</comment> <comment xml:lang="sk">Komprimovaný obrázok GIMP</comment> <comment xml:lang="sl">Slikovna datoteka GIMP (stisnjena)</comment> <comment xml:lang="sq">Figurë GIMP e kompresuar</comment> @@ -26934,7 +27781,7 @@ <comment xml:lang="pt">imagem DICOM</comment> <comment xml:lang="pt_BR">Imagem DICOM</comment> <comment xml:lang="ro">Imagine DICOM</comment> - <comment xml:lang="ru">изображение DICOM</comment> + <comment xml:lang="ru">Изображение DICOM</comment> <comment xml:lang="sk">Obrázok DICOM</comment> <comment xml:lang="sl">Slikovna datoteka DICOM</comment> <comment xml:lang="sq">Figurë DICOM</comment> @@ -26957,6 +27804,7 @@ <mime-type type="application/x-docbook+xml"> <comment>DocBook document</comment> <comment xml:lang="ar">مستند DocBook</comment> + <comment xml:lang="ast">Documentu DocBook</comment> <comment xml:lang="be@latin">Dakument DocBook</comment> <comment xml:lang="bg">Документ — DocBook</comment> <comment xml:lang="ca">document DocBook</comment> @@ -26993,7 +27841,7 @@ <comment xml:lang="pt">documento DocBook</comment> <comment xml:lang="pt_BR">Documento DocBook</comment> <comment xml:lang="ro">Document DocBook</comment> - <comment xml:lang="ru">документ DocBook</comment> + <comment xml:lang="ru">Документ DocBook</comment> <comment xml:lang="sk">Dokument DocBook</comment> <comment xml:lang="sl">Dokument DocBook</comment> <comment xml:lang="sq">Dokument DocBook</comment> @@ -27056,7 +27904,7 @@ <comment xml:lang="pt">imagem DIB</comment> <comment xml:lang="pt_BR">Imagem DIB</comment> <comment xml:lang="ro">Imagine DIB</comment> - <comment xml:lang="ru">изображение DIB</comment> + <comment xml:lang="ru">Изображение DIB</comment> <comment xml:lang="sk">Obrázok DIB</comment> <comment xml:lang="sl">Slikovna datoteka DIB</comment> <comment xml:lang="sq">Figurë DIB</comment> @@ -27113,7 +27961,7 @@ <comment xml:lang="pt">imagem DjVu</comment> <comment xml:lang="pt_BR">Imagem DjVu</comment> <comment xml:lang="ro">Imagine DjVu</comment> - <comment xml:lang="ru">изображение DjVu</comment> + <comment xml:lang="ru">Изображение DjVu</comment> <comment xml:lang="sk">Obrázok DjVu</comment> <comment xml:lang="sl">Slikovna datoteka DjVu</comment> <comment xml:lang="sq">Figurë DjVu</comment> @@ -27126,7 +27974,7 @@ <comment xml:lang="zh_TW">DjVu 影像</comment> <alias type="image/x-djvu"/> <alias type="image/x.djvu"/> - <magic priority="50"> + <magic priority="80"> <match value="AT&TFORM" type="string" offset="0"> <match value="DJVU" type="string" offset="12"/> </match> @@ -27139,6 +27987,7 @@ </mime-type> <mime-type type="image/vnd.djvu+multipage"> <comment>DjVu document</comment> + <comment xml:lang="ast">Documentu DjVu</comment> <comment xml:lang="ca">document DjVu</comment> <comment xml:lang="cs">dokument DjVu</comment> <comment xml:lang="da">DjVu-dokument</comment> @@ -27149,6 +27998,7 @@ <comment xml:lang="eu">DjVu dokumentua</comment> <comment xml:lang="fi">DjVu-asiakirja</comment> <comment xml:lang="fr">document DjVu</comment> + <comment xml:lang="ga">cáipéis DjVu</comment> <comment xml:lang="he">מסמך DjVu</comment> <comment xml:lang="hr">DjVu dokument</comment> <comment xml:lang="hu">DjVu dokumentum</comment> @@ -27161,7 +28011,7 @@ <comment xml:lang="pl">Dokument DjVu</comment> <comment xml:lang="pt">documento DjVu</comment> <comment xml:lang="pt_BR">Documento DjVu</comment> - <comment xml:lang="ru">документ DjVu</comment> + <comment xml:lang="ru">Документ DjVu</comment> <comment xml:lang="sk">Dokument DjVu</comment> <comment xml:lang="sr">ДјВу документ</comment> <comment xml:lang="sv">DjVu-dokument</comment> @@ -27170,7 +28020,7 @@ <comment xml:lang="zh_CN">DjVu 文档</comment> <comment xml:lang="zh_TW">DjVu 文件</comment> <generic-icon name="x-office-document"/> - <magic priority="50"> + <magic priority="80"> <match value="AT&TFORM" type="string" offset="0"> <match value="DJVM" type="string" offset="12"/> </match> @@ -27221,7 +28071,7 @@ <comment xml:lang="pt">imagem DPX</comment> <comment xml:lang="pt_BR">Imagem DPX</comment> <comment xml:lang="ro">Imagine DPX</comment> - <comment xml:lang="ru">изображение DPX</comment> + <comment xml:lang="ru">Изображение DPX</comment> <comment xml:lang="sk">Obrázok DPX</comment> <comment xml:lang="sl">Slikovna datoteka DPX</comment> <comment xml:lang="sq">Figurë DPX</comment> @@ -27277,7 +28127,7 @@ <comment xml:lang="pt">imagem EPS</comment> <comment xml:lang="pt_BR">Imagem EPS</comment> <comment xml:lang="ro">Imagine EPS</comment> - <comment xml:lang="ru">изображение EPS</comment> + <comment xml:lang="ru">Изображение EPS</comment> <comment xml:lang="sk">Obrázok EPS</comment> <comment xml:lang="sl">Slikovna datoteka EPS</comment> <comment xml:lang="sq">Figurë EPS</comment> @@ -27307,6 +28157,7 @@ <mime-type type="image/fits"> <comment>FITS document</comment> <comment xml:lang="ar">مستند FITS</comment> + <comment xml:lang="ast">Documentu FITS</comment> <comment xml:lang="be@latin">Dakument FITS</comment> <comment xml:lang="bg">Документ — FITS</comment> <comment xml:lang="ca">document FITS</comment> @@ -27343,7 +28194,7 @@ <comment xml:lang="pt">documento FITS</comment> <comment xml:lang="pt_BR">Documento FITS</comment> <comment xml:lang="ro">Document FITS</comment> - <comment xml:lang="ru">документ FITS</comment> + <comment xml:lang="ru">Документ FITS</comment> <comment xml:lang="sk">Dokument FITS</comment> <comment xml:lang="sl">Dokument FITS</comment> <comment xml:lang="sq">Dokument FITS</comment> @@ -27401,7 +28252,7 @@ <comment xml:lang="pt">imagem FPX</comment> <comment xml:lang="pt_BR">Imagem FPX</comment> <comment xml:lang="ro">Imagine FPX</comment> - <comment xml:lang="ru">изображение FPX</comment> + <comment xml:lang="ru">Изображение FPX</comment> <comment xml:lang="sk">Obrázok FPX</comment> <comment xml:lang="sl">Slikovna datoteka FPX</comment> <comment xml:lang="sq">Figurë FPX</comment> @@ -27437,7 +28288,7 @@ <comment xml:lang="ga">íomhá EPS (comhbhrúite le gzip)</comment> <comment xml:lang="gl">imaxe EPS (comprimida con gzip)</comment> <comment xml:lang="he">תמונת EPS (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">EPS slika (komprimirana gzip-om)</comment> + <comment xml:lang="hr">EPS slika (gzip sažeta)</comment> <comment xml:lang="hu">EPS kép (gzip-tömörítésű)</comment> <comment xml:lang="ia">Imagine EPS (comprimite con gzip)</comment> <comment xml:lang="id">Citra EPS (terkompresi gzip)</comment> @@ -27456,7 +28307,7 @@ <comment xml:lang="pt">imagem EPS (compressão gzip)</comment> <comment xml:lang="pt_BR">Imagem EPS (compactada com gzip)</comment> <comment xml:lang="ro">Imagine EPS (compresie gzip)</comment> - <comment xml:lang="ru">изображение EPS (сжатое gzip)</comment> + <comment xml:lang="ru">Изображение EPS (сжатое gzip)</comment> <comment xml:lang="sk">Obrázok EPS (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Slikovna datoteka EPS (stisnjena z gzip)</comment> <comment xml:lang="sq">Figurë EPS (e kompresuar me gzip)</comment> @@ -27465,7 +28316,7 @@ <comment xml:lang="tr">EPS görüntüsü (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">зображення EPS (стиснене gzip)</comment> <comment xml:lang="vi">Ảnh EPS (đã nén gzip)</comment> - <comment xml:lang="zh_CN">EPS 图像(gzip 压缩)</comment> + <comment xml:lang="zh_CN">EPS 图像（gzip 压缩）</comment> <comment xml:lang="zh_TW">EPS 影像 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <glob pattern="*.eps.gz"/> @@ -27484,6 +28335,7 @@ <comment xml:lang="eu">Windows ikonoa</comment> <comment xml:lang="fi">Windows-kuvake</comment> <comment xml:lang="fr">icône Windows</comment> + <comment xml:lang="ga">deilbhín Windows</comment> <comment xml:lang="he">סמל של Windows</comment> <comment xml:lang="hr">Windows ikona</comment> <comment xml:lang="hu">Windows ikon</comment> @@ -27496,7 +28348,7 @@ <comment xml:lang="pl">Ikona Windows</comment> <comment xml:lang="pt">ícone Windows</comment> <comment xml:lang="pt_BR">Ícone do Windows</comment> - <comment xml:lang="ru">значок Windows</comment> + <comment xml:lang="ru">Значок Windows</comment> <comment xml:lang="sk">Ikona Windows</comment> <comment xml:lang="sl">Ikona Windows</comment> <comment xml:lang="sr">Иконица Виндоуза</comment> @@ -27557,7 +28409,7 @@ <comment xml:lang="pt">ćone MacOS X</comment> <comment xml:lang="pt_BR">Ícone do MacOS X</comment> <comment xml:lang="ro">Iconiță MacOS X</comment> - <comment xml:lang="ru">значок MacOS X</comment> + <comment xml:lang="ru">Значок MacOS X</comment> <comment xml:lang="sk">Ikona MacOS X</comment> <comment xml:lang="sl">Datoteka ikone MacOS X</comment> <comment xml:lang="sq">Ikonë MacOS X</comment> @@ -27614,7 +28466,7 @@ <comment xml:lang="pt">imagem ILBM</comment> <comment xml:lang="pt_BR">Imagem ILBM</comment> <comment xml:lang="ro">Imagine ILBM</comment> - <comment xml:lang="ru">изображение ILBM</comment> + <comment xml:lang="ru">Изображение ILBM</comment> <comment xml:lang="sk">Obrázok ILMB</comment> <comment xml:lang="sl">Slikovna datoteka ILBM</comment> <comment xml:lang="sq">Figurë ILBM</comment> @@ -27678,7 +28530,7 @@ <comment xml:lang="pt">imagem JNG</comment> <comment xml:lang="pt_BR">Imagem JNG</comment> <comment xml:lang="ro">Imagine JNG</comment> - <comment xml:lang="ru">изображение JNG</comment> + <comment xml:lang="ru">Изображение JNG</comment> <comment xml:lang="sk">Obrázok JNG</comment> <comment xml:lang="sl">Slikovna datoteka JNG</comment> <comment xml:lang="sq">Figurë JNG</comment> @@ -27734,7 +28586,7 @@ <comment xml:lang="pt">Objecto LightWave</comment> <comment xml:lang="pt_BR">Objeto LightWave</comment> <comment xml:lang="ro">Obiect LightWave</comment> - <comment xml:lang="ru">объект LightWave</comment> + <comment xml:lang="ru">Объект LightWave</comment> <comment xml:lang="sk">Objekt LightWave</comment> <comment xml:lang="sl">Datoteka predmeta LightWave</comment> <comment xml:lang="sq">Objekt LightWave</comment> @@ -27789,7 +28641,7 @@ <comment xml:lang="pt">cenário LightWave</comment> <comment xml:lang="pt_BR">Cena LightWave</comment> <comment xml:lang="ro">Scenă LightWave</comment> - <comment xml:lang="ru">сцена LightWave</comment> + <comment xml:lang="ru">Сцена LightWave</comment> <comment xml:lang="sk">Scéna LightWave</comment> <comment xml:lang="sl">Datoteka scene LightWave</comment> <comment xml:lang="sq">Skenë LightWave</comment> @@ -27818,7 +28670,7 @@ <comment xml:lang="fi">MacPaint-bittikartta</comment> <comment xml:lang="fo">MacPaint Bitmap mynd</comment> <comment xml:lang="fr">image matricielle MacPaint</comment> - <comment xml:lang="ga">íomhá MacPaint Bitmap</comment> + <comment xml:lang="ga">íomhá ghiotánmhapach MacPaint</comment> <comment xml:lang="gl">imaxe de mapa de bits MacPaint</comment> <comment xml:lang="he">תמונת מפת-סיביות של MacPaint</comment> <comment xml:lang="hr">MacPaint Bitmap slika</comment> @@ -27839,7 +28691,7 @@ <comment xml:lang="pt">imagem MacPaint Bitmap</comment> <comment xml:lang="pt_BR">Imagem de bitmap do MacPaint</comment> <comment xml:lang="ro">Imagine MacPaint Bitmap</comment> - <comment xml:lang="ru">растровое изображение MacPaint</comment> + <comment xml:lang="ru">Растровое изображение MacPaint</comment> <comment xml:lang="sk">Obrázok MacPaint Bitmap</comment> <comment xml:lang="sl">Slikovna bitna datoteka MacPaint</comment> <comment xml:lang="sq">Figurë BitMap MacPaint</comment> @@ -27889,7 +28741,7 @@ <comment xml:lang="pt">desenho Office</comment> <comment xml:lang="pt_BR">Desenho do Office</comment> <comment xml:lang="ro">Desen Office</comment> - <comment xml:lang="ru">изображение Office</comment> + <comment xml:lang="ru">Рисунок Office</comment> <comment xml:lang="sk">Kresba Office</comment> <comment xml:lang="sl">Datoteka risbe Office</comment> <comment xml:lang="sq">Vizatim Office</comment> @@ -27898,7 +28750,7 @@ <comment xml:lang="tr">Ofis çizimi</comment> <comment xml:lang="uk">малюнок Office</comment> <comment xml:lang="vi">Bản vẽ Office</comment> - <comment xml:lang="zh_CN">Microsoft Office 绘图</comment> + <comment xml:lang="zh_CN">Office 绘图</comment> <comment xml:lang="zh_TW">Office 繪圖</comment> <glob pattern="*.msod"/> </mime-type> @@ -27940,7 +28792,7 @@ <comment xml:lang="pt">imagem NIFF</comment> <comment xml:lang="pt_BR">Imagem NIFF</comment> <comment xml:lang="ro">Imagine NIF</comment> - <comment xml:lang="ru">изображение NIFF</comment> + <comment xml:lang="ru">Изображение NIFF</comment> <comment xml:lang="sk">Obrázok NIFF</comment> <comment xml:lang="sl">Slikovna datoteka NIFF</comment> <comment xml:lang="sq">Figurë NIFF</comment> @@ -27993,7 +28845,7 @@ <comment xml:lang="pt">imagem PCX</comment> <comment xml:lang="pt_BR">Imagem PCX</comment> <comment xml:lang="ro">Imagine PCX</comment> - <comment xml:lang="ru">изображение PCX</comment> + <comment xml:lang="ru">Изображение PCX</comment> <comment xml:lang="sk">Obrázok PCX</comment> <comment xml:lang="sl">Slikovna datoteka PCX</comment> <comment xml:lang="sq">Figurë PCX</comment> @@ -28056,7 +28908,7 @@ <comment xml:lang="pt">imagem PCD</comment> <comment xml:lang="pt_BR">Imagem PCD</comment> <comment xml:lang="ro">Imagine PCD</comment> - <comment xml:lang="ru">изображение PCD</comment> + <comment xml:lang="ru">Изображение PCD</comment> <comment xml:lang="sk">Obrázok PCD</comment> <comment xml:lang="sl">Slikovna datoteka PCD</comment> <comment xml:lang="sq">Figurë PCD</comment> @@ -28112,7 +28964,7 @@ <comment xml:lang="pt">imagem PNM</comment> <comment xml:lang="pt_BR">Imagem PNM</comment> <comment xml:lang="ro">Imagine PNM</comment> - <comment xml:lang="ru">изображение PNM</comment> + <comment xml:lang="ru">Изображение PNM</comment> <comment xml:lang="sk">Obrázok PNM</comment> <comment xml:lang="sl">Slikovna datoteka PNM</comment> <comment xml:lang="sq">Figurë PNM</comment> @@ -28165,7 +29017,7 @@ <comment xml:lang="pt">imagem PBM</comment> <comment xml:lang="pt_BR">Imagem PBM</comment> <comment xml:lang="ro">Imagine PBM</comment> - <comment xml:lang="ru">изображение PBM</comment> + <comment xml:lang="ru">Изображение PBM</comment> <comment xml:lang="sk">Obrázok PBM</comment> <comment xml:lang="sl">Slikovna datoteka PBM</comment> <comment xml:lang="sq">Figurë PBM</comment> @@ -28234,7 +29086,7 @@ <comment xml:lang="pt">imagem PGM</comment> <comment xml:lang="pt_BR">Imagem PGM</comment> <comment xml:lang="ro">Imagine PGM</comment> - <comment xml:lang="ru">изображение PGM</comment> + <comment xml:lang="ru">Изображение PGM</comment> <comment xml:lang="sk">Obrázok PGM</comment> <comment xml:lang="sl">Slikovna datoteka PGM</comment> <comment xml:lang="sq">Figurë PGM</comment> @@ -28303,7 +29155,7 @@ <comment xml:lang="pt">imagem PPM</comment> <comment xml:lang="pt_BR">Imagem PPM</comment> <comment xml:lang="ro">Imagine PPM</comment> - <comment xml:lang="ru">изображение PPM</comment> + <comment xml:lang="ru">Изображение PPM</comment> <comment xml:lang="sk">Obrázok PPM</comment> <comment xml:lang="sl">Slikovna datoteka PPM</comment> <comment xml:lang="sq">Figurë PPM</comment> @@ -28369,7 +29221,7 @@ <comment xml:lang="pt">imagem Photoshop</comment> <comment xml:lang="pt_BR">Imagem do Photoshop</comment> <comment xml:lang="ro">Imagine Photoshop</comment> - <comment xml:lang="ru">изображение Photoshop</comment> + <comment xml:lang="ru">Изображение Photoshop</comment> <comment xml:lang="sk">Obrázok Photoshop</comment> <comment xml:lang="sl">Slikovna datoteka Photoshop</comment> <comment xml:lang="sr">Фотошоп слика</comment> @@ -28431,7 +29283,7 @@ <comment xml:lang="pt">imagem RGB</comment> <comment xml:lang="pt_BR">Imagem RGB</comment> <comment xml:lang="ro">Imagine RGB</comment> - <comment xml:lang="ru">изображение RGB</comment> + <comment xml:lang="ru">Изображение RGB</comment> <comment xml:lang="sk">Obrázok RGB</comment> <comment xml:lang="sl">Slikovna datoteka RGB</comment> <comment xml:lang="sq">Figurë RGB</comment> @@ -28482,7 +29334,7 @@ <comment xml:lang="pt">imagem SGI</comment> <comment xml:lang="pt_BR">Imagem SGI</comment> <comment xml:lang="ro">Imagine SGI</comment> - <comment xml:lang="ru">изображение SGI</comment> + <comment xml:lang="ru">Изображение SGI</comment> <comment xml:lang="sk">Obrázok SGI</comment> <comment xml:lang="sl">Slikovna datoteka SGI</comment> <comment xml:lang="sq">Figurë SGI</comment> @@ -28532,7 +29384,7 @@ <comment xml:lang="pt">imagem raster Sun</comment> <comment xml:lang="pt_BR">Imagem raster da Sun</comment> <comment xml:lang="ro">Imagine rasterizată Sun</comment> - <comment xml:lang="ru">растровое изображение Sun</comment> + <comment xml:lang="ru">Растровое изображение Sun</comment> <comment xml:lang="sk">Rastrový obrázok Sun</comment> <comment xml:lang="sl">Slikovna rastrska datoteka Sun</comment> <comment xml:lang="sq">Figurë raster Sun</comment> @@ -28586,7 +29438,7 @@ <comment xml:lang="pt">imagem TGA</comment> <comment xml:lang="pt_BR">Imagem TGA</comment> <comment xml:lang="ro">Imagine TGA</comment> - <comment xml:lang="ru">изображение TGA</comment> + <comment xml:lang="ru">Изображение TGA</comment> <comment xml:lang="sk">Obrázok TGA</comment> <comment xml:lang="sl">Slikovna datoteka TGA</comment> <comment xml:lang="sq">Figurë TGA</comment> @@ -28614,8 +29466,8 @@ <match value="0x20" type="byte" offset="16"/> </match> </magic> - <glob pattern="*.icb"/> <glob pattern="*.tga"/> + <glob pattern="*.icb"/> <glob pattern="*.tpic"/> <glob pattern="*.vda"/> <glob pattern="*.vst"/> @@ -28641,7 +29493,7 @@ <comment xml:lang="ga">cúrsóir Windows</comment> <comment xml:lang="gl">Cursor de Windows</comment> <comment xml:lang="he">סמן של Windows</comment> - <comment xml:lang="hr">Windows kursor</comment> + <comment xml:lang="hr">Windows pokazivač</comment> <comment xml:lang="hu">Windows-kurzor</comment> <comment xml:lang="ia">Cursor pro Windows</comment> <comment xml:lang="id">Kursor Windows</comment> @@ -28660,7 +29512,7 @@ <comment xml:lang="pt">cursor Windows</comment> <comment xml:lang="pt_BR">Cursor do Windows</comment> <comment xml:lang="ro">Cursor Windows</comment> - <comment xml:lang="ru">курсор Windows</comment> + <comment xml:lang="ru">Курсор Windows</comment> <comment xml:lang="sk">Kurzor Windows</comment> <comment xml:lang="sl">Datoteka kazalke Windows</comment> <comment xml:lang="sq">Kursor Windows</comment> @@ -28694,10 +29546,10 @@ <comment xml:lang="fi">animoitu Windows-osoitin</comment> <comment xml:lang="fo">Windows livindaigjørdur vísi</comment> <comment xml:lang="fr">curseur animé Windows</comment> - <comment xml:lang="ga">cúrsóir beo Windows</comment> + <comment xml:lang="ga">cúrsóir beoite Windows</comment> <comment xml:lang="gl">Cursor animado de Windows</comment> <comment xml:lang="he">סמן מונפש של Windows</comment> - <comment xml:lang="hr">Windows animirani kursor</comment> + <comment xml:lang="hr">Windows animirani pokazivač</comment> <comment xml:lang="hu">Windows animált kurzor</comment> <comment xml:lang="ia">Cursor animate pro Windows</comment> <comment xml:lang="id">Kursor animasi Windows</comment> @@ -28714,7 +29566,7 @@ <comment xml:lang="pt">cursor animado Windows</comment> <comment xml:lang="pt_BR">Cursor animado do Windows</comment> <comment xml:lang="ro">Cursor animat Windows</comment> - <comment xml:lang="ru">анимированный курсор Windows</comment> + <comment xml:lang="ru">Анимированный курсор Windows</comment> <comment xml:lang="sk">Animovaný kurzor Windows</comment> <comment xml:lang="sl">Datoteka animirane kazalke Windows</comment> <comment xml:lang="sq">Kursor i animuar Windows</comment> @@ -28723,7 +29575,7 @@ <comment xml:lang="tr">Windows canlandırmalı imleci</comment> <comment xml:lang="uk">анімований курсор Windows</comment> <comment xml:lang="vi">Con chạy hoạt họa Windows</comment> - <comment xml:lang="zh_CN">Windows 动画光标</comment> + <comment xml:lang="zh_CN">Windows 动态光标</comment> <comment xml:lang="zh_TW">Windows 滑鼠動畫游標</comment> <magic priority="50"> <match value="RIFF" type="string" offset="0"> @@ -28771,7 +29623,7 @@ <comment xml:lang="pt">imagem EMF</comment> <comment xml:lang="pt_BR">Imagem EMF</comment> <comment xml:lang="ro">Imagine EMF</comment> - <comment xml:lang="ru">изображение EMF</comment> + <comment xml:lang="ru">Изображение EMF</comment> <comment xml:lang="sk">Obrázok EMF</comment> <comment xml:lang="sl">Slikovna datoteka EMF</comment> <comment xml:lang="sq">Figurë EMF</comment> @@ -28836,7 +29688,7 @@ <comment xml:lang="pt">imagem WMF</comment> <comment xml:lang="pt_BR">Imagem WMF</comment> <comment xml:lang="ro">Imagine WMF</comment> - <comment xml:lang="ru">изображение WMF</comment> + <comment xml:lang="ru">Изображение WMF</comment> <comment xml:lang="sk">Obrázok WMF</comment> <comment xml:lang="sl">Slikovna datoteka WMF</comment> <comment xml:lang="sq">Figurë WMF</comment> @@ -28907,7 +29759,7 @@ <comment xml:lang="pt">imagem XBM</comment> <comment xml:lang="pt_BR">Imagem XBM</comment> <comment xml:lang="ro">Imagine XBM</comment> - <comment xml:lang="ru">изображение XBM</comment> + <comment xml:lang="ru">Изображение XBM</comment> <comment xml:lang="sk">Obrázok XBM</comment> <comment xml:lang="sl">Slikovna datoteka XBM</comment> <comment xml:lang="sq">Figurë XBM</comment> @@ -28962,7 +29814,7 @@ <comment xml:lang="pt">imagem GIMP</comment> <comment xml:lang="pt_BR">Imagem do GIMP</comment> <comment xml:lang="ro">Imagine GIMP</comment> - <comment xml:lang="ru">изображение GIMP</comment> + <comment xml:lang="ru">Изображение GIMP</comment> <comment xml:lang="sk">Obrázok GIMP</comment> <comment xml:lang="sl">Slikovna datoteka GIMP</comment> <comment xml:lang="sq">Figurë GIMP</comment> @@ -28979,6 +29831,80 @@ <match value="gimp xcf v" type="string" offset="0"/> </magic> </mime-type> + <mime-type type="image/x-gimp-gbr"> + <comment>GIMP brush</comment> + <comment xml:lang="ca">pinzell de GIMP</comment> + <comment xml:lang="cs">štětec GIMP</comment> + <comment xml:lang="de">GIMP-Pinsel</comment> + <comment xml:lang="en_GB">GIMP brush</comment> + <comment xml:lang="es">pincel del GIMP</comment> + <comment xml:lang="hr">GIMP kist</comment> + <comment xml:lang="hu">GIMP ecset</comment> + <comment xml:lang="id">Kuas GIMP</comment> + <comment xml:lang="it">Pennello GIMP</comment> + <comment xml:lang="kk">GIMP бояу жаққышы</comment> + <comment xml:lang="ko">GIMP 붓</comment> + <comment xml:lang="pl">Pędzel programu GIMP</comment> + <comment xml:lang="pt_BR">Pincel do GIMP</comment> + <comment xml:lang="ru">Кисть GIMP</comment> + <comment xml:lang="sk">Štetec aplikácie GIMP</comment> + <comment xml:lang="sv">GIMP-pensel</comment> + <comment xml:lang="uk">пензель GIMP</comment> + <comment xml:lang="zh_CN">GIMP 笔刷</comment> + <comment xml:lang="zh_TW">GIMP 筆刷</comment> + <glob pattern="*.gbr"/> + <magic priority="50"> + <match value="GIMP" type="string" offset="20"/> + </magic> + </mime-type> + <mime-type type="image/x-gimp-gih"> + <comment>GIMP brush pipe</comment> + <comment xml:lang="ca">conducte del pinzell de GIMP</comment> + <comment xml:lang="cs">zřetězení štětců GIMP</comment> + <comment xml:lang="de">GIMP-Pinselanimation</comment> + <comment xml:lang="en_GB">GIMP brush pipe</comment> + <comment xml:lang="es">pincel animado del GIMP</comment> + <comment xml:lang="hr">GIMP valjkasti kist</comment> + <comment xml:lang="hu">GIMP ecsetcsatorna</comment> + <comment xml:lang="id">Pipa kuas GIMP</comment> + <comment xml:lang="it">Pipe pennello GIMP</comment> + <comment xml:lang="kk">GIMP бояу жаққыш түтігі</comment> + <comment xml:lang="ko">GIMP 붓 파이프</comment> + <comment xml:lang="pl">Potok pędzla programu GIMP</comment> + <comment xml:lang="pt_BR">Tubo de pincel do GIMP</comment> + <comment xml:lang="ru">Анимированная кисть GIMP</comment> + <comment xml:lang="sv">GIMP-penselrör</comment> + <comment xml:lang="uk">канал пензлів GIMP</comment> + <comment xml:lang="zh_CN">GIMP 管刷</comment> + <comment xml:lang="zh_TW">GIMP 筆刷導管</comment> + <glob pattern="*.gih"/> + </mime-type> + <mime-type type="image/x-gimp-pat"> + <comment>GIMP pattern</comment> + <comment xml:lang="ca">patró de GIMP</comment> + <comment xml:lang="cs">vzorek GIMP</comment> + <comment xml:lang="de">GIMP-Muster</comment> + <comment xml:lang="en_GB">GIMP pattern</comment> + <comment xml:lang="es">patrón del GIMP</comment> + <comment xml:lang="hr">GIMP uzorak</comment> + <comment xml:lang="hu">GIMP minta</comment> + <comment xml:lang="id">Pola GIMP</comment> + <comment xml:lang="it">Motivo GIMP</comment> + <comment xml:lang="kk">GIMP оюы</comment> + <comment xml:lang="ko">GIMP 패턴</comment> + <comment xml:lang="pl">Deseń programu GIMP</comment> + <comment xml:lang="pt_BR">Textura do GIMP</comment> + <comment xml:lang="ru">Шаблон GIMP</comment> + <comment xml:lang="sk">Vzor aplikácie GIMP</comment> + <comment xml:lang="sv">GIMP-mönster</comment> + <comment xml:lang="uk">візерунок GIMP</comment> + <comment xml:lang="zh_CN">GIMP 图案</comment> + <comment xml:lang="zh_TW">GIMP 樣式</comment> + <glob pattern="*.pat"/> + <magic priority="50"> + <match value="GPAT" type="string" offset="20"/> + </magic> + </mime-type> <mime-type type="image/x-xfig"> <comment>XFig image</comment> <comment xml:lang="ar">صورة XFig</comment> @@ -29018,7 +29944,7 @@ <comment xml:lang="pt">imagem XFig</comment> <comment xml:lang="pt_BR">Imagem do XFig</comment> <comment xml:lang="ro">Imagine XFig</comment> - <comment xml:lang="ru">изображение XFig</comment> + <comment xml:lang="ru">Изображение XFig</comment> <comment xml:lang="sk">Obrázok XFig</comment> <comment xml:lang="sl">Slikovna datoteka XFig</comment> <comment xml:lang="sq">Figurë XFig</comment> @@ -29073,7 +29999,7 @@ <comment xml:lang="pt">imagem XPM</comment> <comment xml:lang="pt_BR">Imagem XPM</comment> <comment xml:lang="ro">Imagine XPM</comment> - <comment xml:lang="ru">изображение XPM</comment> + <comment xml:lang="ru">Изображение XPM</comment> <comment xml:lang="sk">Obrázok XPM</comment> <comment xml:lang="sl">Slikovna datoteka XPM</comment> <comment xml:lang="sq">Figurë XPM</comment> @@ -29111,7 +30037,7 @@ <comment xml:lang="fi">X-ikkunakuva</comment> <comment xml:lang="fo">X vindeyga mynd</comment> <comment xml:lang="fr">image X window</comment> - <comment xml:lang="ga">íomhá fhuinneog X</comment> + <comment xml:lang="ga">íomhá X-windows</comment> <comment xml:lang="gl">imaxe de X Window</comment> <comment xml:lang="he">תמונת חלון של X</comment> <comment xml:lang="hr">X window slika</comment> @@ -29133,7 +30059,7 @@ <comment xml:lang="pt">imagem de janela X</comment> <comment xml:lang="pt_BR">Imagem de janela do X</comment> <comment xml:lang="ro">Imagine X window</comment> - <comment xml:lang="ru">изображение X window</comment> + <comment xml:lang="ru">Изображение X window</comment> <comment xml:lang="sk">Obrázok X window</comment> <comment xml:lang="sl">slika X oken</comment> <comment xml:lang="sq">Figurë X window</comment> @@ -29142,13 +30068,14 @@ <comment xml:lang="tr">X pencere görüntüsü</comment> <comment xml:lang="uk">зображення X window</comment> <comment xml:lang="vi">Ảnh cửa sổ X</comment> - <comment xml:lang="zh_CN">X window 图像</comment> + <comment xml:lang="zh_CN">X Window 图像</comment> <comment xml:lang="zh_TW">X window 影像</comment> <glob pattern="*.xwd"/> </mime-type> <mime-type type="inode/blockdevice"> <comment>block device</comment> <comment xml:lang="ar">جهاز كتلي</comment> + <comment xml:lang="ast">preséu de bloques</comment> <comment xml:lang="be@latin">blokavaja pryłada</comment> <comment xml:lang="bg">Блоково устройство</comment> <comment xml:lang="ca">dispositiu de blocs</comment> @@ -29169,7 +30096,7 @@ <comment xml:lang="hr">Blokovski uređaj</comment> <comment xml:lang="hu">blokkos eszköz</comment> <comment xml:lang="ia">Dispositivo de blocos</comment> - <comment xml:lang="id">blok divais</comment> + <comment xml:lang="id">peranti blok</comment> <comment xml:lang="it">Device a blocchi</comment> <comment xml:lang="ja">ブロックデバイス</comment> <comment xml:lang="kk">блоктық құрылғысы</comment> @@ -29185,7 +30112,7 @@ <comment xml:lang="pt">dispositivo de bloco</comment> <comment xml:lang="pt_BR">Dispositivo de bloco</comment> <comment xml:lang="ro">dispozitiv bloc</comment> - <comment xml:lang="ru">блочное устройство</comment> + <comment xml:lang="ru">Блочное устройство</comment> <comment xml:lang="sk">Blokové zariadenie</comment> <comment xml:lang="sl">bločna naprava</comment> <comment xml:lang="sq">device me blloqe</comment> @@ -29200,6 +30127,7 @@ <mime-type type="inode/chardevice"> <comment>character device</comment> <comment xml:lang="ar">جهاز حرفي</comment> + <comment xml:lang="ast">preséu de caráuteres</comment> <comment xml:lang="be@latin">znakavaja pryłada</comment> <comment xml:lang="bg">Символно устройство</comment> <comment xml:lang="ca">dispositiu de caràcters</comment> @@ -29220,7 +30148,7 @@ <comment xml:lang="hr">Znakovni uređaj</comment> <comment xml:lang="hu">karakteres eszköz</comment> <comment xml:lang="ia">Dispositivo de characteres</comment> - <comment xml:lang="id">karakter divais</comment> + <comment xml:lang="id">peranti karakter</comment> <comment xml:lang="it">Device a caratteri</comment> <comment xml:lang="ja">キャラクタデバイス</comment> <comment xml:lang="kk">символдық құрылғысы</comment> @@ -29236,7 +30164,7 @@ <comment xml:lang="pt">dispositivo de caracteres</comment> <comment xml:lang="pt_BR">Dispositivo de caractere</comment> <comment xml:lang="ro">dispozitiv caracter</comment> - <comment xml:lang="ru">символьное устройство</comment> + <comment xml:lang="ru">Символьное устройство</comment> <comment xml:lang="sk">Znakové zariadenie</comment> <comment xml:lang="sl">znakovna naprava</comment> <comment xml:lang="sq">device me karaktere</comment> @@ -29251,6 +30179,7 @@ <mime-type type="inode/directory"> <comment>folder</comment> <comment xml:lang="ar">مجلّد</comment> + <comment xml:lang="ast">carpeta</comment> <comment xml:lang="be@latin">kataloh</comment> <comment xml:lang="bg">Папка</comment> <comment xml:lang="ca">carpeta</comment> @@ -29268,7 +30197,7 @@ <comment xml:lang="ga">fillteán</comment> <comment xml:lang="gl">cartafol</comment> <comment xml:lang="he">תיקייה</comment> - <comment xml:lang="hr">direktorij</comment> + <comment xml:lang="hr">Mapa</comment> <comment xml:lang="hu">mappa</comment> <comment xml:lang="ia">Dossier</comment> <comment xml:lang="id">folder</comment> @@ -29287,7 +30216,7 @@ <comment xml:lang="pt">pasta</comment> <comment xml:lang="pt_BR">Pasta</comment> <comment xml:lang="ro">dosar</comment> - <comment xml:lang="ru">папка</comment> + <comment xml:lang="ru">Папка</comment> <comment xml:lang="sk">Priečinok</comment> <comment xml:lang="sl">mapa</comment> <comment xml:lang="sq">Kartelë</comment> @@ -29340,7 +30269,7 @@ <comment xml:lang="pt">canal</comment> <comment xml:lang="pt_BR">Pipe</comment> <comment xml:lang="ro">canal pipe</comment> - <comment xml:lang="ru">канал</comment> + <comment xml:lang="ru">Канал</comment> <comment xml:lang="sk">Rúra</comment> <comment xml:lang="sl">cev</comment> <comment xml:lang="sq">Pipe</comment> @@ -29355,6 +30284,7 @@ <mime-type type="inode/mount-point"> <comment>mount point</comment> <comment xml:lang="ar">نقطة الوصْل</comment> + <comment xml:lang="ast">puntu de montaxe</comment> <comment xml:lang="be@latin">punkt mantavańnia</comment> <comment xml:lang="bg">Точка на монтиране</comment> <comment xml:lang="ca">punt de muntatge</comment> @@ -29372,7 +30302,7 @@ <comment xml:lang="ga">pointe feistithe</comment> <comment xml:lang="gl">punto de montaxe</comment> <comment xml:lang="he">נקודת עיגון</comment> - <comment xml:lang="hr">točka montiranja</comment> + <comment xml:lang="hr">Točka montiranja</comment> <comment xml:lang="hu">csatolási pont</comment> <comment xml:lang="ia">Puncto de montage</comment> <comment xml:lang="id">titik mount</comment> @@ -29391,7 +30321,7 @@ <comment xml:lang="pt">ponto de montagem</comment> <comment xml:lang="pt_BR">Ponto de montagem</comment> <comment xml:lang="ro">loc montare</comment> - <comment xml:lang="ru">точка монтирования</comment> + <comment xml:lang="ru">Точка монтирования</comment> <comment xml:lang="sk">Miesto pripojenia</comment> <comment xml:lang="sl">priklopna točka</comment> <comment xml:lang="sq">Pikë montimi</comment> @@ -29424,7 +30354,7 @@ <comment xml:lang="ga">soicéad</comment> <comment xml:lang="gl">socket</comment> <comment xml:lang="he">נקודת חיבור</comment> - <comment xml:lang="hr">utičnica</comment> + <comment xml:lang="hr">Priključnica</comment> <comment xml:lang="hu">illesztőpont</comment> <comment xml:lang="ia">Socket</comment> <comment xml:lang="id">soket</comment> @@ -29443,7 +30373,7 @@ <comment xml:lang="pt">tomada</comment> <comment xml:lang="pt_BR">Socket</comment> <comment xml:lang="ro">socket</comment> - <comment xml:lang="ru">сокет</comment> + <comment xml:lang="ru">Сокет</comment> <comment xml:lang="sk">Soket</comment> <comment xml:lang="sl">vtič</comment> <comment xml:lang="sq">Socket</comment> @@ -29458,6 +30388,7 @@ <mime-type type="inode/symlink"> <comment>symbolic link</comment> <comment xml:lang="ar">وصلة رمزية</comment> + <comment xml:lang="ast">enllaz simbólicu</comment> <comment xml:lang="az">simvolik körpü</comment> <comment xml:lang="be@latin">symbalnaja spasyłka</comment> <comment xml:lang="bg">Символна връзка</comment> @@ -29477,7 +30408,7 @@ <comment xml:lang="ga">nasc siombalach</comment> <comment xml:lang="gl">ligazón simbólica</comment> <comment xml:lang="he">קישור סימבולי</comment> - <comment xml:lang="hr">simbolička veza</comment> + <comment xml:lang="hr">Simbolička poveznica</comment> <comment xml:lang="hu">szimbolikus link</comment> <comment xml:lang="ia">Ligamine symbolic</comment> <comment xml:lang="id">taut simbolik</comment> @@ -29497,7 +30428,7 @@ <comment xml:lang="pt">ligação simbólica</comment> <comment xml:lang="pt_BR">Ligação simbólica</comment> <comment xml:lang="ro">legătură simbolică</comment> - <comment xml:lang="ru">символьная ссылка</comment> + <comment xml:lang="ru">Символьная ссылка</comment> <comment xml:lang="sk">Symbolický odkaz</comment> <comment xml:lang="sl">simbolna povezava</comment> <comment xml:lang="sq">Lidhje simbolike</comment> @@ -29528,10 +30459,10 @@ <comment xml:lang="fi">viestin jakeluilmoitus</comment> <comment xml:lang="fo">post útberingarfrásøgn</comment> <comment xml:lang="fr">rapport de livraison de courriels</comment> - <comment xml:lang="ga">tuairisc sheachadadh poist</comment> + <comment xml:lang="ga">tuairisc sheachadta r-phoist</comment> <comment xml:lang="gl">informe de entrega de correo</comment> <comment xml:lang="he">דוח העברת דואר</comment> - <comment xml:lang="hr">izvještaj dostave pošte</comment> + <comment xml:lang="hr">Izvještaj dostave pošte</comment> <comment xml:lang="hu">jelentés levélkézbesítésről</comment> <comment xml:lang="ia">Reporto de livration de e-mail</comment> <comment xml:lang="id">laporan pengantaran surat</comment> @@ -29550,7 +30481,7 @@ <comment xml:lang="pt">relatório de entrega de email</comment> <comment xml:lang="pt_BR">Relatório de entrega de correspondência</comment> <comment xml:lang="ro">raport de trimitere email</comment> - <comment xml:lang="ru">отчёт о доставке сообщения</comment> + <comment xml:lang="ru">Отчёт о доставке сообщения</comment> <comment xml:lang="sk">Správa o doručení pošty</comment> <comment xml:lang="sl">poročilo dostave pošte</comment> <comment xml:lang="sq">Raport mbi dorëzimin e mesazhit</comment> @@ -29583,7 +30514,7 @@ <comment xml:lang="fi">viestin kuittausilmoitus</comment> <comment xml:lang="fo">post avhendingarfrásøgn</comment> <comment xml:lang="fr">rapport de disposition de courriels</comment> - <comment xml:lang="ga">tuairisc chóiriú poist</comment> + <comment xml:lang="ga">tuairisc chóirithe r-phoist</comment> <comment xml:lang="gl">informe de disposición de correo</comment> <comment xml:lang="he">דוח אספקת דואר</comment> <comment xml:lang="hr">Izvještaj smještaja e-pošte</comment> @@ -29605,7 +30536,7 @@ <comment xml:lang="pt">relatório de disposição de email</comment> <comment xml:lang="pt_BR">Relatório de disposição de correspondência</comment> <comment xml:lang="ro">confirmare primire email</comment> - <comment xml:lang="ru">отчёт о перемещении почты</comment> + <comment xml:lang="ru">Отчёт о перемещении почты</comment> <comment xml:lang="sk">Správa o odovzdaní pošty</comment> <comment xml:lang="sl">poročilo razporeditve pošte</comment> <comment xml:lang="sq">Raport mbi njoftimin e mesazhit</comment> @@ -29641,7 +30572,7 @@ <comment xml:lang="ga">tagairt do chomhad cianda</comment> <comment xml:lang="gl">referencia a un ficheiro remoto</comment> <comment xml:lang="he">התיחסות לקובץ מרוחק</comment> - <comment xml:lang="hr">referenca na udaljenu datoteku</comment> + <comment xml:lang="hr">Preporuka na udaljenu datoteku</comment> <comment xml:lang="hu">hivatkozás távoli fájlra</comment> <comment xml:lang="ia">Referentia a un file remote</comment> <comment xml:lang="id">referensi ke berkas jarak jauh</comment> @@ -29660,7 +30591,7 @@ <comment xml:lang="pt">referência a um ficheiro remoto</comment> <comment xml:lang="pt_BR">Referência para arquivo remoto</comment> <comment xml:lang="ro">referință fișier la distanță</comment> - <comment xml:lang="ru">ссылка на удалённый файл</comment> + <comment xml:lang="ru">Ссылка на удалённый файл</comment> <comment xml:lang="sk">Odkaz na vzdialený súbor</comment> <comment xml:lang="sl">sklic do oddaljene datoteke</comment> <comment xml:lang="sq">Referim për tek file në distancë</comment> @@ -29692,7 +30623,7 @@ <comment xml:lang="fi">nyyssiviesti</comment> <comment xml:lang="fo">Usenet news boð</comment> <comment xml:lang="fr">message de groupe d'échange Usenet</comment> - <comment xml:lang="ga">teachtaireacht nuacht Usenet</comment> + <comment xml:lang="ga">teachtaireacht nuachta Usenet</comment> <comment xml:lang="gl">mensaxes de noticias de Usenet</comment> <comment xml:lang="he">הודעת חדשות של Usenet</comment> <comment xml:lang="hr">Usenet poruka novosti</comment> @@ -29714,7 +30645,7 @@ <comment xml:lang="pt">mensagem de notícias Usenet</comment> <comment xml:lang="pt_BR">Mensagem de notícias da Usenet</comment> <comment xml:lang="ro">Mesaj Usenet de știri </comment> - <comment xml:lang="ru">новостное сообщение Usenet</comment> + <comment xml:lang="ru">Новостное сообщение Usenet</comment> <comment xml:lang="sk">Príspevok do diskusných skupín Usenet</comment> <comment xml:lang="sl">novičarsko sporočilo Usenet</comment> <comment xml:lang="sq">Mesazh lajmesh Usenet</comment> @@ -29754,14 +30685,14 @@ <comment xml:lang="ga">teachtaireacht ríomhphoist neamhiomlán</comment> <comment xml:lang="gl">mensaxe de correo electrónico parcial</comment> <comment xml:lang="he">מסר דוא״ל חלקי</comment> - <comment xml:lang="hr">djelomična poruka e-pošte</comment> + <comment xml:lang="hr">Nepotpuna poruka e-pošte</comment> <comment xml:lang="hu">részleges elektronikus levél</comment> <comment xml:lang="ia">Message de e-mail partial</comment> <comment xml:lang="id">pesan email sebagian</comment> <comment xml:lang="it">Messaggio email parziale</comment> <comment xml:lang="ja">部分メールメッセージ</comment> <comment xml:lang="kk">электронды поштаның үзінді мәлімдемесі</comment> - <comment xml:lang="ko">부분적 전자 우편 메시지</comment> + <comment xml:lang="ko">전자 우편 메시지 일부</comment> <comment xml:lang="lt">nepilnas el. laiškas</comment> <comment xml:lang="lv">daļēja e-pasta vēstule</comment> <comment xml:lang="ms">Bahagian mesej emel</comment> @@ -29773,7 +30704,7 @@ <comment xml:lang="pt">mensagem parcial de email</comment> <comment xml:lang="pt_BR">Mensagem de e-mail parcial</comment> <comment xml:lang="ro">mesaj de email parțial</comment> - <comment xml:lang="ru">фрагмент сообщения электронной почты</comment> + <comment xml:lang="ru">Фрагмент сообщения электронной почты</comment> <comment xml:lang="sk">Čiastočná e-mailová správa</comment> <comment xml:lang="sl">delno elektronsko sporočilo</comment> <comment xml:lang="sq">Mesazh poste i pjesëshëm</comment> @@ -29807,7 +30738,7 @@ <comment xml:lang="ga">teachtaireacht ríomhphoist</comment> <comment xml:lang="gl">mensaxe de correo electrónico</comment> <comment xml:lang="he">הודעת דואר אלקטרוני</comment> - <comment xml:lang="hr">poruka e-pošte</comment> + <comment xml:lang="hr">Poruka e-pošte</comment> <comment xml:lang="hu">elektronikus levél</comment> <comment xml:lang="ia">Message de e-mail</comment> <comment xml:lang="id">pesan email</comment> @@ -29826,7 +30757,7 @@ <comment xml:lang="pt">mensagem de email</comment> <comment xml:lang="pt_BR">Mensagem de e-mail</comment> <comment xml:lang="ro">mesaj email</comment> - <comment xml:lang="ru">почтовое сообщение</comment> + <comment xml:lang="ru">Почтовое сообщение</comment> <comment xml:lang="sk">E-mailová správa</comment> <comment xml:lang="sl">sporočilo elektronske pošte</comment> <comment xml:lang="sq">Mesazh poste</comment> @@ -29872,7 +30803,7 @@ <comment xml:lang="fi">GNU-postiviesti</comment> <comment xml:lang="fo">GNU mail boð</comment> <comment xml:lang="fr">message de courriel GNU</comment> - <comment xml:lang="ga">teachtaireacht phost GNU</comment> + <comment xml:lang="ga">teachtaireacht r-phoist GNU</comment> <comment xml:lang="gl">mensaxe de correo electrónico de GNU</comment> <comment xml:lang="he">הודעת דואר של GNU</comment> <comment xml:lang="hr">GNU poruka pošte</comment> @@ -29895,7 +30826,7 @@ <comment xml:lang="pt">mensagem de email GNU</comment> <comment xml:lang="pt_BR">Mensagem de e-mail GNU</comment> <comment xml:lang="ro">Mesaj GNU mail</comment> - <comment xml:lang="ru">почтовое сообщение GNU</comment> + <comment xml:lang="ru">Почтовое сообщение GNU</comment> <comment xml:lang="sk">Správa GNU mail</comment> <comment xml:lang="sl">Sporočilo pošte GNU</comment> <comment xml:lang="sq">Mesazh GNU mail</comment> @@ -29911,20 +30842,31 @@ </mime-type> <mime-type type="model/iges"> <comment>IGES document</comment> + <comment xml:lang="ast">Documentu IGES</comment> <comment xml:lang="ca">document IGES</comment> + <comment xml:lang="cs">dokument IGES</comment> <comment xml:lang="da">IGES-dokument</comment> <comment xml:lang="de">IGES-Dokument</comment> + <comment xml:lang="en_GB">IGES document</comment> <comment xml:lang="es">documento IGES</comment> + <comment xml:lang="eu">IGES dokumentua</comment> <comment xml:lang="fi">IGES-asiakirja</comment> <comment xml:lang="fr">document IGES</comment> + <comment xml:lang="ga">cáipéis IGES</comment> <comment xml:lang="he">מסמך IGES</comment> + <comment xml:lang="hr">IGES dokument</comment> <comment xml:lang="hu">IGES dokumentum</comment> + <comment xml:lang="id">dokumen IGES</comment> + <comment xml:lang="it">Documento IGES</comment> <comment xml:lang="kk">IGES құжаты</comment> <comment xml:lang="ko">IGES 문서</comment> <comment xml:lang="pl">Dokument IGES</comment> <comment xml:lang="pt_BR">Documento IGES</comment> - <comment xml:lang="ru">документ IGES</comment> + <comment xml:lang="ru">Документ IGES</comment> <comment xml:lang="sk">Dokument IGES</comment> + <comment xml:lang="sr">ИГЕС документ</comment> + <comment xml:lang="sv">IGES-dokument</comment> + <comment xml:lang="tr">IGES belgesi</comment> <comment xml:lang="uk">документ IGES</comment> <comment xml:lang="zh_CN">IGES 文档</comment> <comment xml:lang="zh_TW">IGES 文件</comment> @@ -29942,6 +30884,7 @@ <mime-type type="model/vrml"> <comment>VRML document</comment> <comment xml:lang="ar">مستند VRML</comment> + <comment xml:lang="ast">Documentu VRML</comment> <comment xml:lang="az">VRML sənədi</comment> <comment xml:lang="be@latin">Dakument VRML</comment> <comment xml:lang="bg">Документ — VRML</comment> @@ -29980,7 +30923,7 @@ <comment xml:lang="pt">documento VRML</comment> <comment xml:lang="pt_BR">Documento VRML</comment> <comment xml:lang="ro">Document VRML</comment> - <comment xml:lang="ru">документ VRML</comment> + <comment xml:lang="ru">Документ VRML</comment> <comment xml:lang="sk">Dokument VRML</comment> <comment xml:lang="sl">Dokument VRML</comment> <comment xml:lang="sq">Dokument VRML</comment> @@ -30021,10 +30964,10 @@ <comment xml:lang="fi">viesti useissa muodoissa</comment> <comment xml:lang="fo">boð í fleiri sniðum</comment> <comment xml:lang="fr">message en formats divers</comment> - <comment xml:lang="ga">teachtaireacht i roinnt fhormáidí</comment> + <comment xml:lang="ga">teachtaireacht i bhformáidí éagsúla</comment> <comment xml:lang="gl">mensaxe en varios formatos</comment> <comment xml:lang="he">הודעה במספר תבניות</comment> - <comment xml:lang="hr">poruka u nekoliko oblika</comment> + <comment xml:lang="hr">Poruka u nekoliko oblika</comment> <comment xml:lang="hu">többféle formátumú üzenet</comment> <comment xml:lang="ia">Message in plure formatos</comment> <comment xml:lang="id">pesan dalam beberapa format</comment> @@ -30043,7 +30986,7 @@ <comment xml:lang="pt">mensagem em vários formatos</comment> <comment xml:lang="pt_BR">Mensagem em vários formatos</comment> <comment xml:lang="ro">mesaj în diferite formate</comment> - <comment xml:lang="ru">сообщение в нескольких форматах</comment> + <comment xml:lang="ru">Сообщение в нескольких форматах</comment> <comment xml:lang="sk">Správa v niekoľkých formátoch</comment> <comment xml:lang="sl">sporočilo v več zapisih</comment> <comment xml:lang="sq">Mesazh në formate të ndryshëm</comment> @@ -30052,7 +30995,7 @@ <comment xml:lang="tr">farklı biçimlerde ileti</comment> <comment xml:lang="uk">повідомлення у кількох форматах</comment> <comment xml:lang="vi">thông điệp có vài định dạng</comment> - <comment xml:lang="zh_CN">各种格式的消息</comment> + <comment xml:lang="zh_CN">各种格式的信件</comment> <comment xml:lang="zh_TW">多種格式的訊息</comment> </mime-type> <mime-type type="multipart/appledouble"> @@ -30096,7 +31039,7 @@ <comment xml:lang="pt">ficheiro codificado em AppleDouble de Macintosh</comment> <comment xml:lang="pt_BR">Arquivo do Macintosh codificado com AppleDouble</comment> <comment xml:lang="ro">Fișier codat Macintosh AppleDouble</comment> - <comment xml:lang="ru">файл (закодированный Macintosh AppleDouble)</comment> + <comment xml:lang="ru">Файл, закодированный Macintosh AppleDouble</comment> <comment xml:lang="sk">Súbor kódovaný pomocou Macintosh AppleDouble</comment> <comment xml:lang="sl">Kodirana datoteka Macintosh (AppleDouble)</comment> <comment xml:lang="sq">File Macintosh i kodifikuar AppleDouble</comment> @@ -30133,7 +31076,7 @@ <comment xml:lang="hr">Poruka kratkg sadržaja</comment> <comment xml:lang="hu">ömlesztett üzenet</comment> <comment xml:lang="ia">Digesto de messages</comment> - <comment xml:lang="id">pesan digest</comment> + <comment xml:lang="id">digest pesan</comment> <comment xml:lang="it">Digest di messaggi</comment> <comment xml:lang="ja">メッセージダイジェスト</comment> <comment xml:lang="kk">мәлімдеме профилі</comment> @@ -30149,7 +31092,7 @@ <comment xml:lang="pt">grupo de mensagens</comment> <comment xml:lang="pt_BR">Resumo de mensagem</comment> <comment xml:lang="ro">colecție mesaje email</comment> - <comment xml:lang="ru">профиль сообщения</comment> + <comment xml:lang="ru">Дайджест сообщения</comment> <comment xml:lang="sk">Prehľad správ</comment> <comment xml:lang="sl">povzetek sporočila</comment> <comment xml:lang="sq">Shpërndarje mesazhesh</comment> @@ -30158,7 +31101,7 @@ <comment xml:lang="tr">mesaj özeti</comment> <comment xml:lang="uk">збірка повідомлень</comment> <comment xml:lang="vi">bản tóm tắt thông điệp</comment> - <comment xml:lang="zh_CN">消息摘要</comment> + <comment xml:lang="zh_CN">信件摘要</comment> <comment xml:lang="zh_TW">訊息摘要</comment> </mime-type> <mime-type type="multipart/encrypted"> @@ -30183,7 +31126,7 @@ <comment xml:lang="ga">teachtaireacht chriptithe</comment> <comment xml:lang="gl">mensaxe cifrado</comment> <comment xml:lang="he">הודעה מוצפנת</comment> - <comment xml:lang="hr">šifrirana poruka</comment> + <comment xml:lang="hr">Šifrirana poruka</comment> <comment xml:lang="hu">titkosított üzenet</comment> <comment xml:lang="ia">Message cryptate</comment> <comment xml:lang="id">pesan terenkripsi</comment> @@ -30202,7 +31145,7 @@ <comment xml:lang="pt">mensagem encriptada</comment> <comment xml:lang="pt_BR">Mensagem criptografada</comment> <comment xml:lang="ro">mesaj criptat</comment> - <comment xml:lang="ru">зашифрованное сообщение</comment> + <comment xml:lang="ru">Зашифрованное сообщение</comment> <comment xml:lang="sk">Zašifrovaná správa</comment> <comment xml:lang="sl">šifrirano sporočilo</comment> <comment xml:lang="sq">Mesazh i kriptuar</comment> @@ -30217,6 +31160,7 @@ <mime-type type="multipart/mixed"> <comment>compound documents</comment> <comment xml:lang="ar">مستندات مركبة</comment> + <comment xml:lang="ast">documentos compuestos</comment> <comment xml:lang="be@latin">składanyja dakumenty</comment> <comment xml:lang="bg">Съставни документи</comment> <comment xml:lang="ca">documents compostos</comment> @@ -30253,7 +31197,7 @@ <comment xml:lang="pt">documentos compostos</comment> <comment xml:lang="pt_BR">Documentos compostos</comment> <comment xml:lang="ro">documente compuse</comment> - <comment xml:lang="ru">составные документы</comment> + <comment xml:lang="ru">Составные документы</comment> <comment xml:lang="sk">Zložené dokumenty</comment> <comment xml:lang="sl">združeni dokumenti</comment> <comment xml:lang="sq">dokumente të përbërë</comment> @@ -30268,6 +31212,7 @@ <mime-type type="multipart/related"> <comment>compound document</comment> <comment xml:lang="ar">مستند مركب</comment> + <comment xml:lang="ast">documentu compuestu</comment> <comment xml:lang="az">birləşik sənəd</comment> <comment xml:lang="be@latin">składany dakument</comment> <comment xml:lang="bg">Съставен документ</comment> @@ -30306,7 +31251,7 @@ <comment xml:lang="pt">documento composto</comment> <comment xml:lang="pt_BR">Documento composto</comment> <comment xml:lang="ro">document compus</comment> - <comment xml:lang="ru">составной документ</comment> + <comment xml:lang="ru">Составной документ</comment> <comment xml:lang="sk">Zložený dokument</comment> <comment xml:lang="sl">združeni dokument</comment> <comment xml:lang="sq">dokumet i përbërë</comment> @@ -30337,7 +31282,7 @@ <comment xml:lang="fi">viestijärjestelmän ilmoitus</comment> <comment xml:lang="fo">postkervisfrásøgn</comment> <comment xml:lang="fr">rapport système de courriels</comment> - <comment xml:lang="ga">tuairisc chóras poist</comment> + <comment xml:lang="ga">tuairisc chórais r-phoist</comment> <comment xml:lang="gl">informe do sistema de correo</comment> <comment xml:lang="he">דו״ח של מערכת הדואר</comment> <comment xml:lang="hr">Izvještaj sustava pošte</comment> @@ -30359,7 +31304,7 @@ <comment xml:lang="pt">relatório de sistema de email</comment> <comment xml:lang="pt_BR">Relatório do sistema de correspondência</comment> <comment xml:lang="ro">raport sistem email</comment> - <comment xml:lang="ru">отчёт почтовой системы</comment> + <comment xml:lang="ru">Отчёт почтовой системы</comment> <comment xml:lang="sk">Správa poštového systému</comment> <comment xml:lang="sl">poročilo poštnega sistema</comment> <comment xml:lang="sq">Raport i sistemit të postës</comment> @@ -30393,7 +31338,7 @@ <comment xml:lang="ga">teachtaireacht sínithe</comment> <comment xml:lang="gl">mensaxe firmado</comment> <comment xml:lang="he">הודעה חתומה</comment> - <comment xml:lang="hr">potpisana poruka</comment> + <comment xml:lang="hr">Potpisana poruka</comment> <comment xml:lang="hu">aláírt üzenet</comment> <comment xml:lang="ia">Message signate</comment> <comment xml:lang="id">pesan ditandatangani</comment> @@ -30412,7 +31357,7 @@ <comment xml:lang="pt">mensagem assinada</comment> <comment xml:lang="pt_BR">Mensagem assinada</comment> <comment xml:lang="ro">mesaj semnat</comment> - <comment xml:lang="ru">подписанное сообщение</comment> + <comment xml:lang="ru">Подписанное сообщение</comment> <comment xml:lang="sk">Podpísaná správa</comment> <comment xml:lang="sl">podpisano sporočilo</comment> <comment xml:lang="sq">Mesazh i firmosur</comment> @@ -30444,7 +31389,7 @@ <comment xml:lang="ga">sruth sonraí (brú freastalaí)</comment> <comment xml:lang="gl">fluxo de datos (por iniciativa do servidor)</comment> <comment xml:lang="he">מידע בזרימה (דחיפה ע״י השרת)</comment> - <comment xml:lang="hr">Tok podataka (poslužiteljem pogurano)</comment> + <comment xml:lang="hr">Strujanje podataka (poslužiteljem pogurano)</comment> <comment xml:lang="hu">sugárzott adatfolyam (kiszolgálóról)</comment> <comment xml:lang="ia">Fluxo de datos (pulsate per servitor)</comment> <comment xml:lang="id">arus data (dorongan server)</comment> @@ -30463,7 +31408,7 @@ <comment xml:lang="pt">fluxo de dados (empurrados pelo servidor)</comment> <comment xml:lang="pt_BR">Fluxo de dados (por iniciativa do servidor)</comment> <comment xml:lang="ro">flux de date (de la server)</comment> - <comment xml:lang="ru">поток данных (server push)</comment> + <comment xml:lang="ru">Поток данных (server push)</comment> <comment xml:lang="sk">Prúd dát (posielaný serverom)</comment> <comment xml:lang="sl">pretok podatkov (strežniški)</comment> <comment xml:lang="sq">Fluks me të dhëna (server push)</comment> @@ -30472,7 +31417,7 @@ <comment xml:lang="tr">veri akışı (sunucudan gönderilen)</comment> <comment xml:lang="uk">потік даних (від сервера)</comment> <comment xml:lang="vi">luồng dữ liệu (trình phục vụ đẩy)</comment> - <comment xml:lang="zh_CN">数据流(服务器推送)</comment> + <comment xml:lang="zh_CN">数据流（服务器推送）</comment> <comment xml:lang="zh_TW">資料串流 (server push)</comment> </mime-type> <mime-type type="text/calendar"> @@ -30513,7 +31458,7 @@ <comment xml:lang="pt">calendário VCS/ICS</comment> <comment xml:lang="pt_BR">Calendário VCS/ICS</comment> <comment xml:lang="ro">Calendar VCS/ICS</comment> - <comment xml:lang="ru">календарь VCS/ICS</comment> + <comment xml:lang="ru">Календарь VCS/ICS</comment> <comment xml:lang="sk">Kalendár VCS/ICS</comment> <comment xml:lang="sl">Datoteka koledarja VCS/ICS</comment> <comment xml:lang="sq">Kalendar VCS/ICS</comment> @@ -30575,7 +31520,7 @@ <comment xml:lang="pt">folha de estilos CSS</comment> <comment xml:lang="pt_BR">Folha de estilo CSS</comment> <comment xml:lang="ro">Pagină de stil CSS</comment> - <comment xml:lang="ru">таблица стилей CSS</comment> + <comment xml:lang="ru">Таблица стилей CSS</comment> <comment xml:lang="sk">Štýly CSS</comment> <comment xml:lang="sl">Slogovna predloga CSS</comment> <comment xml:lang="sq">Fletë stili CSS</comment> @@ -30611,7 +31556,7 @@ <comment xml:lang="ga">cárta gnó leictreonach</comment> <comment xml:lang="gl">tarxeta de negocio electrónica</comment> <comment xml:lang="he">כרטיס ביקור אלקטרוני</comment> - <comment xml:lang="hr">elektronička posjetnica</comment> + <comment xml:lang="hr">Elektronička posjetnica</comment> <comment xml:lang="hu">elektronikus névjegykártya</comment> <comment xml:lang="ia">Carta de visita electronic</comment> <comment xml:lang="id">kartu bisnis elektronik</comment> @@ -30628,7 +31573,7 @@ <comment xml:lang="pt">cartão de visita eletrónico</comment> <comment xml:lang="pt_BR">Cartão de visitas eletrônico</comment> <comment xml:lang="ro">carte de vizită electronică</comment> - <comment xml:lang="ru">электронная визитная карточка</comment> + <comment xml:lang="ru">Электронная визитная карточка</comment> <comment xml:lang="sk">Elektronická vizitka</comment> <comment xml:lang="sl">elektronska poslovna vizitka</comment> <comment xml:lang="sq">Skedë elektronike biznesi</comment> @@ -30653,6 +31598,7 @@ </mime-type> <mime-type type="text/turtle"> <comment>Turtle document</comment> + <comment xml:lang="ast">Documentu Turtle</comment> <comment xml:lang="ca">document Turtle</comment> <comment xml:lang="cs">dokument Turtle</comment> <comment xml:lang="da">Turtle-dokument</comment> @@ -30663,6 +31609,7 @@ <comment xml:lang="eu">Turtle dokumentua</comment> <comment xml:lang="fi">Turtle-asiakirja</comment> <comment xml:lang="fr">document Turtle</comment> + <comment xml:lang="ga">cáipéis Turtle</comment> <comment xml:lang="he">מסמך Turtle</comment> <comment xml:lang="hr">Turtle dokument</comment> <comment xml:lang="hu">Turtle dokumentum</comment> @@ -30675,7 +31622,7 @@ <comment xml:lang="pl">Dokument Turtle</comment> <comment xml:lang="pt">documento Turtle</comment> <comment xml:lang="pt_BR">Documento Turtle</comment> - <comment xml:lang="ru">документ Turtle</comment> + <comment xml:lang="ru">Документ Turtle</comment> <comment xml:lang="sk">Dokument Turtle</comment> <comment xml:lang="sr">Тартл документ</comment> <comment xml:lang="sv">Turtle-dokument</comment> @@ -30689,6 +31636,7 @@ <mime-type type="text/x-txt2tags"> <comment>txt2tags document</comment> <comment xml:lang="ar">مستند txt2tags</comment> + <comment xml:lang="ast">Documentu txt2tags</comment> <comment xml:lang="be@latin">dakument txt2tags</comment> <comment xml:lang="bg">Документ — txt2tags</comment> <comment xml:lang="ca">document txt2tags</comment> @@ -30709,7 +31657,7 @@ <comment xml:lang="hr">txt2tags dokument</comment> <comment xml:lang="hu">txt2tags dokumentum</comment> <comment xml:lang="ia">Documento txt2tags</comment> - <comment xml:lang="id">dokumen txt2tags</comment> + <comment xml:lang="id">Dokumen txt2tags</comment> <comment xml:lang="it">Documento txt2tags</comment> <comment xml:lang="ja">txt2tags ドキュメント</comment> <comment xml:lang="ka">txt2tags დოკუმენტი</comment> @@ -30725,7 +31673,7 @@ <comment xml:lang="pt">documento txt2tags</comment> <comment xml:lang="pt_BR">Documento do txt2tags</comment> <comment xml:lang="ro">document txt2tags</comment> - <comment xml:lang="ru">документ txt2tags</comment> + <comment xml:lang="ru">Документ txt2tags</comment> <comment xml:lang="sk">Dokument txt2tags</comment> <comment xml:lang="sl">Dokument txt2tags</comment> <comment xml:lang="sq">Dokument txt2tags</comment> @@ -30747,7 +31695,7 @@ <comment>Verilog source code</comment> <comment xml:lang="bg">Изходен код — Verilog</comment> <comment xml:lang="ca">codi font en Verilog</comment> - <comment xml:lang="cs">zdrojový kód Verilog</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Verilog</comment> <comment xml:lang="da">Verilog-kildekode</comment> <comment xml:lang="de">Verilog-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Verilog</comment> @@ -30757,9 +31705,10 @@ <comment xml:lang="eu">Verilog iturburu-kodea</comment> <comment xml:lang="fi">Verilog-lähdekoodi</comment> <comment xml:lang="fr">code source Verilog</comment> + <comment xml:lang="ga">cód foinseach Verilog</comment> <comment xml:lang="gl">código fonte en Verilog</comment> <comment xml:lang="he">קוד מקור של </comment> - <comment xml:lang="hr">Verilog izvorni kod</comment> + <comment xml:lang="hr">Verilog izvorni kôd</comment> <comment xml:lang="hu">Verilog-forráskód</comment> <comment xml:lang="ia">Codice-fonte Verilog</comment> <comment xml:lang="id">Kode sumber Verilog</comment> @@ -30773,7 +31722,7 @@ <comment xml:lang="pl">Kod źródłowy Verilog</comment> <comment xml:lang="pt">código origem Verilog</comment> <comment xml:lang="pt_BR">Código-fonte Verilog</comment> - <comment xml:lang="ru">исходный код Verilog</comment> + <comment xml:lang="ru">Исходный код Verilog</comment> <comment xml:lang="sk">Zdrojový kód Verilog</comment> <comment xml:lang="sl">Datoteka izvorne kode Verilog</comment> <comment xml:lang="sr">изворни код Верилога</comment> @@ -30798,6 +31747,7 @@ <comment xml:lang="eu">SystemVerilog goiburua</comment> <comment xml:lang="fi">SystemVerilog-otsake</comment> <comment xml:lang="fr">en-tête </comment> + <comment xml:lang="ga">ceanntásc SystemVerilog</comment> <comment xml:lang="gl">Cabeceiras de SystemVerilog</comment> <comment xml:lang="he">כותרת SystemVerilog</comment> <comment xml:lang="hr">SystemVerilog zaglavlje</comment> @@ -30814,14 +31764,14 @@ <comment xml:lang="pl">Nagłówek SystemVerilog</comment> <comment xml:lang="pt">cabeçalho SystemVerilog</comment> <comment xml:lang="pt_BR">Cabeçalho de SystemVerilog</comment> - <comment xml:lang="ru">заголовочный файл SystemVerilog</comment> + <comment xml:lang="ru">Заголовочный файл SystemVerilog</comment> <comment xml:lang="sk">Hlavičky SystemVerilog</comment> <comment xml:lang="sl">Datoteka glave SystemVerilog</comment> <comment xml:lang="sr">заглавље Система Верилога</comment> <comment xml:lang="sv">SystemVerilog-headerfil</comment> <comment xml:lang="tr">SystemVerilog başlığı</comment> <comment xml:lang="uk">заголовки SystemVerilog</comment> - <comment xml:lang="zh_CN">SystemVerilog 头</comment> + <comment xml:lang="zh_CN">SystemVerilog 头文件</comment> <comment xml:lang="zh_TW">SystemVerilog 標頭</comment> <sub-class-of type="text/x-verilog"/> <glob pattern="*.svh"/> @@ -30839,9 +31789,10 @@ <comment xml:lang="eu">SystemVerilog iturburu-kodea</comment> <comment xml:lang="fi">SystemVerilog-lähdekoodi</comment> <comment xml:lang="fr">code source </comment> + <comment xml:lang="ga">cód foinseach SystemVerilog</comment> <comment xml:lang="gl">código fonte en SystemVerilog</comment> <comment xml:lang="he">קוד מקור של SystemVerilog</comment> - <comment xml:lang="hr">SystemVerilog izvorni kod</comment> + <comment xml:lang="hr">SystemVerilog izvorni kôd</comment> <comment xml:lang="hu">SystemVerilog-forráskód</comment> <comment xml:lang="ia">Codice-fonte SystemVerilog</comment> <comment xml:lang="id">Kode sumber SystemVerilog</comment> @@ -30855,7 +31806,7 @@ <comment xml:lang="pl">Kod źródłowy SystemVerilog</comment> <comment xml:lang="pt">código origem SystemVerilog</comment> <comment xml:lang="pt_BR">Código-fonte de SystemVerilog</comment> - <comment xml:lang="ru">исходный код SystemVerilog</comment> + <comment xml:lang="ru">Исходный код SystemVerilog</comment> <comment xml:lang="sk">Zdrojový kód SystemVerilog</comment> <comment xml:lang="sl">Datoteka izvorne kode SystemVerilog</comment> <comment xml:lang="sr">изворни код Система Верилога</comment> @@ -30871,7 +31822,7 @@ <comment>VHDL source code</comment> <comment xml:lang="bg">Изходен код — VHDL</comment> <comment xml:lang="ca">codi font en VHDL</comment> - <comment xml:lang="cs">zdrojový kód VHDL</comment> + <comment xml:lang="cs">zdrojový kód v jazyce VHDL</comment> <comment xml:lang="da">VHDL-kildekode</comment> <comment xml:lang="de">VHDL-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας VHDL</comment> @@ -30881,9 +31832,10 @@ <comment xml:lang="eu">VHDL iturburu-kodea</comment> <comment xml:lang="fi">VHDL-lähdekoodi</comment> <comment xml:lang="fr">code source VHDL</comment> + <comment xml:lang="ga">cód foinseach VHDL</comment> <comment xml:lang="gl">código fonte en VHDL</comment> <comment xml:lang="he">קוד מקור של VHDL</comment> - <comment xml:lang="hr">VHDL izvorni kod</comment> + <comment xml:lang="hr">VHDL izvorni kôd</comment> <comment xml:lang="hu">VHDL-forráskód</comment> <comment xml:lang="ia">Codice-fonte VHDL</comment> <comment xml:lang="id">Kode sumber VHDL</comment> @@ -30897,7 +31849,7 @@ <comment xml:lang="pl">Kod źródłowy VHDL</comment> <comment xml:lang="pt">código origem VHDL</comment> <comment xml:lang="pt_BR">Código-fonte VHDL</comment> - <comment xml:lang="ru">исходный код VHDL</comment> + <comment xml:lang="ru">Исходный код VHDL</comment> <comment xml:lang="sk">Zdrojový kód VHDL</comment> <comment xml:lang="sl">Datoteka izvorne kode VHDL</comment> <comment xml:lang="sr">ВХДЛ изворни код</comment> @@ -30915,6 +31867,7 @@ <mime-type type="text/enriched"> <comment>enriched text document</comment> <comment xml:lang="ar">مستند نصي مغنى</comment> + <comment xml:lang="ast">documentu de testu arriquecíu</comment> <comment xml:lang="az">zəngin mətn sənədi</comment> <comment xml:lang="be@latin">azdobleny tekstavy dakument</comment> <comment xml:lang="bg">Документ с обогатен текст</comment> @@ -30934,7 +31887,7 @@ <comment xml:lang="ga">cáipéis téacs saibhrithe</comment> <comment xml:lang="gl">documento de texto enriquecido</comment> <comment xml:lang="he">מסמך טקסט מועשר</comment> - <comment xml:lang="hr">obogaćeni tekstualni dokument</comment> + <comment xml:lang="hr">Obogaćeni tekstovni dokument</comment> <comment xml:lang="hu">enriched text dokumentum</comment> <comment xml:lang="ia">Documento de texto inricchite</comment> <comment xml:lang="id">dokumen teks diperkaya</comment> @@ -30953,7 +31906,7 @@ <comment xml:lang="pt">documento de texto rico</comment> <comment xml:lang="pt_BR">Documento de texto enriquecido</comment> <comment xml:lang="ro">document text îmbogățit</comment> - <comment xml:lang="ru">форматированный текстовый документ</comment> + <comment xml:lang="ru">Форматированный текстовый документ</comment> <comment xml:lang="sk">Rozšírený textový dokument</comment> <comment xml:lang="sl">dokument z obogatenim besedilom</comment> <comment xml:lang="sq">Dokument teksti i pasuruar</comment> @@ -30962,7 +31915,7 @@ <comment xml:lang="tr">zenginleştirilmiş metin belgesi</comment> <comment xml:lang="uk">форматований текстовий документ</comment> <comment xml:lang="vi">tài liệu văn bản có kiểu dáng</comment> - <comment xml:lang="zh_CN">富文本文档</comment> + <comment xml:lang="zh_CN">浓缩文本文档 (ETF)</comment> <comment xml:lang="zh_TW">豐富化文字文件</comment> <sub-class-of type="text/plain"/> </mime-type> @@ -30988,7 +31941,7 @@ <comment xml:lang="ga">leathanach cabhrach</comment> <comment xml:lang="gl">páxina de axuda</comment> <comment xml:lang="he">דף עזרה</comment> - <comment xml:lang="hr">stranica pomoći</comment> + <comment xml:lang="hr">Stranica pomoći</comment> <comment xml:lang="hu">súgóoldal</comment> <comment xml:lang="ia">Pagina de adjuta</comment> <comment xml:lang="id">halaman bantuan</comment> @@ -31007,7 +31960,7 @@ <comment xml:lang="pt">página de ajuda</comment> <comment xml:lang="pt_BR">Página de ajuda</comment> <comment xml:lang="ro">pagină de ajutor</comment> - <comment xml:lang="ru">страница справки</comment> + <comment xml:lang="ru">Страница справки</comment> <comment xml:lang="sk">Stránka Pomocníka</comment> <comment xml:lang="sl">stran pomoči</comment> <comment xml:lang="sq">Faqe ndihme</comment> @@ -31023,6 +31976,7 @@ <mime-type type="text/plain"> <comment>plain text document</comment> <comment xml:lang="ar">مستند نصي مجرد</comment> + <comment xml:lang="ast">documentu de testu planu</comment> <comment xml:lang="be@latin">prosty tekstavy dakument</comment> <comment xml:lang="bg">Документ с неформатиран текст</comment> <comment xml:lang="ca">document de text pla</comment> @@ -31039,10 +31993,10 @@ <comment xml:lang="ga">cáipéis ghnáth-théacs</comment> <comment xml:lang="gl">documento de texto sinxelo</comment> <comment xml:lang="he">מסמך טקסט פשוט</comment> - <comment xml:lang="hr">običan tekstualni dokument</comment> + <comment xml:lang="hr">Običan tekstovni dokument</comment> <comment xml:lang="hu">egyszerű szöveg</comment> <comment xml:lang="ia">Documento de texto simple</comment> - <comment xml:lang="id">dokumen teks biasa</comment> + <comment xml:lang="id">dokumen teks polos</comment> <comment xml:lang="it">Documento in testo semplice</comment> <comment xml:lang="ja">平文テキストドキュメント</comment> <comment xml:lang="kk">мәтіндік құжаты</comment> @@ -31058,7 +32012,7 @@ <comment xml:lang="pt">documento em texto simples</comment> <comment xml:lang="pt_BR">Documento de Texto</comment> <comment xml:lang="ro">document text simplu</comment> - <comment xml:lang="ru">текстовый документ</comment> + <comment xml:lang="ru">Текстовый документ</comment> <comment xml:lang="sk">Obyčajný textový dokument</comment> <comment xml:lang="sl">običajna besedilna datoteka</comment> <comment xml:lang="sq">Dokument në tekst të thjeshtë</comment> @@ -31115,7 +32069,7 @@ <comment xml:lang="pt">ficheiro RDF</comment> <comment xml:lang="pt_BR">Arquivo RDF</comment> <comment xml:lang="ro">Fișier RDF</comment> - <comment xml:lang="ru">файл RDF</comment> + <comment xml:lang="ru">Файл RDF</comment> <comment xml:lang="sk">Súbor RDF</comment> <comment xml:lang="sl">Datoteka RDF</comment> <comment xml:lang="sq">File RDF</comment> @@ -31146,6 +32100,7 @@ <comment xml:lang="es">archivo en XML OWL</comment> <comment xml:lang="eu">OWL XML fitxategia</comment> <comment xml:lang="fr">fichier XML OWL</comment> + <comment xml:lang="ga">comhad XML OWL</comment> <comment xml:lang="hr">OWL XML datoteka</comment> <comment xml:lang="hu">OWL XML-fájl</comment> <comment xml:lang="ia">File XML OWL</comment> @@ -31157,7 +32112,7 @@ <comment xml:lang="pl">Plik XML OWL</comment> <comment xml:lang="pt">ficheiro OWL XML</comment> <comment xml:lang="pt_BR">Arquivo OWL XML</comment> - <comment xml:lang="ru">файл XML OWL</comment> + <comment xml:lang="ru">Файл XML OWL</comment> <comment xml:lang="sk">Súbor XML OWL</comment> <comment xml:lang="sr">ОВЛ ИксМЛ датотека</comment> <comment xml:lang="sv">OWL XML-fil</comment> @@ -31196,14 +32151,14 @@ <comment xml:lang="ga">ceanntásca ríomhphoist</comment> <comment xml:lang="gl">cabeceiras de correo electrónico</comment> <comment xml:lang="he">כותרת דוא״ל</comment> - <comment xml:lang="hr">zaglavlja e-pošte</comment> + <comment xml:lang="hr">Zaglavlja e-pošte</comment> <comment xml:lang="hu">levélfejléc</comment> <comment xml:lang="ia">Capites de e-mail</comment> - <comment xml:lang="id">tajuk email</comment> + <comment xml:lang="id">header email</comment> <comment xml:lang="it">Intestazioni email</comment> <comment xml:lang="ja">メールヘッダー</comment> <comment xml:lang="kk">пошталық тақырыптамалары</comment> - <comment xml:lang="ko">전자 우편 헤더</comment> + <comment xml:lang="ko">전자메일 헤더</comment> <comment xml:lang="lt">el. laiško antraštės</comment> <comment xml:lang="lv">e-pasta galvene</comment> <comment xml:lang="ms">Pengepala emel</comment> @@ -31215,7 +32170,7 @@ <comment xml:lang="pt">cabeçalhos de email</comment> <comment xml:lang="pt_BR">Cabeçalhos de e-mail</comment> <comment xml:lang="ro">antete email</comment> - <comment xml:lang="ru">почтовые заголовки</comment> + <comment xml:lang="ru">Почтовые заголовки</comment> <comment xml:lang="sk">Hlavičky e-mailu</comment> <comment xml:lang="sl">glava elektronske pošte</comment> <comment xml:lang="sq">Header email</comment> @@ -31231,6 +32186,7 @@ <mime-type type="text/richtext"> <comment>rich text document</comment> <comment xml:lang="ar">مستند نصي غني</comment> + <comment xml:lang="ast">documentu de testu ricu</comment> <comment xml:lang="az">zəngin mətn sənədi</comment> <comment xml:lang="be@latin">azdobleny tekstavy dakument</comment> <comment xml:lang="bg">Документ — rich text</comment> @@ -31249,7 +32205,7 @@ <comment xml:lang="ga">cáipéis mhéith-théacs</comment> <comment xml:lang="gl">documento do texto enriquecido</comment> <comment xml:lang="he">מסמך טקסט עשיר</comment> - <comment xml:lang="hr">obogaćeni tekstualni dokument</comment> + <comment xml:lang="hr">Obogaćeni tekstovni dokument</comment> <comment xml:lang="hu">rich text-dokumentum</comment> <comment xml:lang="ia">Documento de texto inricchite</comment> <comment xml:lang="id">dokumen teks kaya</comment> @@ -31268,7 +32224,7 @@ <comment xml:lang="pt">documento em texto rico</comment> <comment xml:lang="pt_BR">Documento rich text</comment> <comment xml:lang="ro">document text îmbogățit</comment> - <comment xml:lang="ru">документ с форматированным текстом</comment> + <comment xml:lang="ru">Документ с форматированным текстом</comment> <comment xml:lang="sk">Textový dokument RTF</comment> <comment xml:lang="sl">dokument z oblikovanim besedilom</comment> <comment xml:lang="sq">Dokument rich text</comment> @@ -31277,7 +32233,7 @@ <comment xml:lang="tr">zengin metin belgesi</comment> <comment xml:lang="uk">форматований текстовий документ</comment> <comment xml:lang="vi">tài liệu văn bản có kiểu dáng (RTF)</comment> - <comment xml:lang="zh_CN">RTF 丰富文本文档</comment> + <comment xml:lang="zh_CN">富文本文档 (RTF)</comment> <comment xml:lang="zh_TW">豐富文字文件</comment> <sub-class-of type="text/plain"/> <glob pattern="*.rtx"/> @@ -31319,7 +32275,7 @@ <comment xml:lang="pt">resumo RSS</comment> <comment xml:lang="pt_BR">Resumo RSS</comment> <comment xml:lang="ro">Rezumat RSS</comment> - <comment xml:lang="ru">сводка RSS</comment> + <comment xml:lang="ru">Сводка RSS</comment> <comment xml:lang="sk">Súhrn RSS</comment> <comment xml:lang="sl">Datoteka povzetek RSS</comment> <comment xml:lang="sq">Përmbledhje RSS</comment> @@ -31366,7 +32322,7 @@ <comment xml:lang="it">Feed di distribuzione Atom</comment> <comment xml:lang="ja">Atom 配信フィード</comment> <comment xml:lang="kk">Atom жаңалықтар таспасы</comment> - <comment xml:lang="ko">Atom 동기화 피드</comment> + <comment xml:lang="ko">Atom 묶음 피드</comment> <comment xml:lang="lt">Atom sindikacijos kanalas</comment> <comment xml:lang="lv">Atom sindikāta barotne</comment> <comment xml:lang="nb">Atom syndikeringsstrøm</comment> @@ -31377,7 +32333,7 @@ <comment xml:lang="pt">feed Atom</comment> <comment xml:lang="pt_BR">Fonte de notícias Atom</comment> <comment xml:lang="ro">Flux agregare Atom</comment> - <comment xml:lang="ru">лента новостей Atom</comment> + <comment xml:lang="ru">Лента новостей Atom</comment> <comment xml:lang="sk">Kanál Atom</comment> <comment xml:lang="sl">Sindikalni vir Atom</comment> <comment xml:lang="sq">Feed për përhapje Atom</comment> @@ -31386,7 +32342,7 @@ <comment xml:lang="tr">Atom besleme kaynağı</comment> <comment xml:lang="uk">трансляція подач Atom</comment> <comment xml:lang="vi">Nguồn tin tức Atom</comment> - <comment xml:lang="zh_CN">Atom 更新种子</comment> + <comment xml:lang="zh_CN">Atom 聚合种子</comment> <comment xml:lang="zh_TW">Atom 聯合供稿饋流</comment> <sub-class-of type="application/xml"/> <generic-icon name="text-html"/> @@ -31432,7 +32388,7 @@ <comment xml:lang="pt">feed OPML</comment> <comment xml:lang="pt_BR">Fonte de notícias OPML</comment> <comment xml:lang="ro">Flux OPML syndication</comment> - <comment xml:lang="ru">лента новостей OPML</comment> + <comment xml:lang="ru">Лента новостей OPML</comment> <comment xml:lang="sk">Kanál OPML</comment> <comment xml:lang="sl">Sindikalni vir OPML</comment> <comment xml:lang="sq">Feed për përhapje OPML</comment> @@ -31454,6 +32410,7 @@ <mime-type type="text/sgml"> <comment>SGML document</comment> <comment xml:lang="ar">مستند SGML</comment> + <comment xml:lang="ast">Documentu SGML</comment> <comment xml:lang="be@latin">Dakument SGML</comment> <comment xml:lang="bg">Документ — SGML</comment> <comment xml:lang="ca">document SGML</comment> @@ -31491,7 +32448,7 @@ <comment xml:lang="pt">documento SGML</comment> <comment xml:lang="pt_BR">Documento SGML</comment> <comment xml:lang="ro">Document SGML</comment> - <comment xml:lang="ru">документ SGML</comment> + <comment xml:lang="ru">Документ SGML</comment> <comment xml:lang="sk">Dokument SGML</comment> <comment xml:lang="sl">Dokument SGML</comment> <comment xml:lang="sq">Dokument SGML</comment> @@ -31511,6 +32468,7 @@ <mime-type type="text/spreadsheet"> <comment>spreadsheet interchange document</comment> <comment xml:lang="ar">مستند تبادل الجدول</comment> + <comment xml:lang="ast">documentu d'intercambéu de fueyes de cálculu</comment> <comment xml:lang="be@latin">dakument dla abmienu raźlikovymi arkušami</comment> <comment xml:lang="bg">Документ за обмяна между програми за електронни таблици</comment> <comment xml:lang="ca">document d'intercanvi de full de càlcul</comment> @@ -31545,7 +32503,7 @@ <comment xml:lang="pt">documento de troca interna de folhas de cálculo</comment> <comment xml:lang="pt_BR">Documento de intercâmbio de planilhas</comment> <comment xml:lang="ro">document schimb filă de calcul</comment> - <comment xml:lang="ru">документ Spreadsheet Interchange</comment> + <comment xml:lang="ru">Документ Spreadsheet Interchange</comment> <comment xml:lang="sk">Zošitový prenosový dokument</comment> <comment xml:lang="sl">dokument izmenjeve preglednic</comment> <comment xml:lang="sq">Dokument shkëmbimi për fletë llogaritje</comment> @@ -31566,6 +32524,7 @@ <mime-type type="text/tab-separated-values"> <comment>TSV document</comment> <comment xml:lang="ar">مستند TSV</comment> + <comment xml:lang="ast">Documentu TSV</comment> <comment xml:lang="be@latin">Dakument TSV</comment> <comment xml:lang="bg">Документ — TSV</comment> <comment xml:lang="ca">document TSV</comment> @@ -31600,7 +32559,7 @@ <comment xml:lang="pt">documento TSV</comment> <comment xml:lang="pt_BR">Documento TSV</comment> <comment xml:lang="ro">Document TSV</comment> - <comment xml:lang="ru">документ TSV</comment> + <comment xml:lang="ru">Документ TSV</comment> <comment xml:lang="sk">Dokument TSV</comment> <comment xml:lang="sl">Dokument TSV</comment> <comment xml:lang="sq">Dokument TSV</comment> @@ -31658,7 +32617,7 @@ <comment xml:lang="tr">Graphviz DOT grafiği</comment> <comment xml:lang="uk">граф DOT Graphviz</comment> <comment xml:lang="vi">Biểu đồ DOT Graphviz</comment> - <comment xml:lang="zh_CN">Graphviz DOT 科学图形</comment> + <comment xml:lang="zh_CN">Graphviz DOT 图形</comment> <comment xml:lang="zh_TW">Graphviz DOT 圖</comment> <generic-icon name="x-office-document"/> <magic priority="50"> @@ -31673,6 +32632,7 @@ <mime-type type="text/vnd.sun.j2me.app-descriptor"> <comment>JAD document</comment> <comment xml:lang="ar">مستند JAD</comment> + <comment xml:lang="ast">Documentu JAD</comment> <comment xml:lang="be@latin">Dakument JAD</comment> <comment xml:lang="bg">Документ — JAD</comment> <comment xml:lang="ca">document JAD</comment> @@ -31708,7 +32668,7 @@ <comment xml:lang="pt">documento JAD</comment> <comment xml:lang="pt_BR">Documento JAD</comment> <comment xml:lang="ro">Document JAD</comment> - <comment xml:lang="ru">документ JAD</comment> + <comment xml:lang="ru">Документ JAD</comment> <comment xml:lang="sk">Dokument JAD</comment> <comment xml:lang="sl">Dokument JAD</comment> <comment xml:lang="sq">Dokument JAD</comment> @@ -31729,6 +32689,7 @@ <mime-type type="text/vnd.wap.wml"> <comment>WML document</comment> <comment xml:lang="ar">مستند WML</comment> + <comment xml:lang="ast">Documentu WML</comment> <comment xml:lang="az">WML sənədi</comment> <comment xml:lang="be@latin">Dakument WML</comment> <comment xml:lang="bg">Документ — WML</comment> @@ -31767,7 +32728,7 @@ <comment xml:lang="pt">documento WML</comment> <comment xml:lang="pt_BR">Documento WML</comment> <comment xml:lang="ro">Document WML</comment> - <comment xml:lang="ru">документ WML</comment> + <comment xml:lang="ru">Документ WML</comment> <comment xml:lang="sk">Dokument WML</comment> <comment xml:lang="sl">Dokument WML</comment> <comment xml:lang="sq">Dokument WML</comment> @@ -31820,7 +32781,7 @@ <comment xml:lang="pt">programa WMLScript</comment> <comment xml:lang="pt_BR">Programa WMLScript</comment> <comment xml:lang="ro">Program WMLScript</comment> - <comment xml:lang="ru">сценарий WMLScript</comment> + <comment xml:lang="ru">Программа WMLScript</comment> <comment xml:lang="sk">Program WMLScript</comment> <comment xml:lang="sl">Programska datoteka WMLScript</comment> <comment xml:lang="sq">Program WMLScript</comment> @@ -31872,7 +32833,7 @@ <comment xml:lang="pt">arquivo ACE</comment> <comment xml:lang="pt_BR">Pacote ACE</comment> <comment xml:lang="ro">Arhivă ACE</comment> - <comment xml:lang="ru">архив ACE</comment> + <comment xml:lang="ru">Архив ACE</comment> <comment xml:lang="sk">Archív ACE</comment> <comment xml:lang="sl">Datoteka arhiva ACE</comment> <comment xml:lang="sq">Arkiv ACE</comment> @@ -31909,10 +32870,10 @@ <comment xml:lang="ga">cód foinseach Ada</comment> <comment xml:lang="gl">código fonte en Ada</comment> <comment xml:lang="he">קוד מקור Ada</comment> - <comment xml:lang="hr">Ada izvorni kod</comment> + <comment xml:lang="hr">Ada izvorni kôd</comment> <comment xml:lang="hu">Ada-forráskód</comment> <comment xml:lang="ia">Codice-fonte Ada</comment> - <comment xml:lang="id">Kode program Ada</comment> + <comment xml:lang="id">Kode sumber Ada</comment> <comment xml:lang="it">Codice sorgente Ada</comment> <comment xml:lang="ja">Ada ソースコード</comment> <comment xml:lang="ka">Ada-ის საწყისი კოდი</comment> @@ -31929,7 +32890,7 @@ <comment xml:lang="pt">código origem Ada</comment> <comment xml:lang="pt_BR">Código-fonte Ada</comment> <comment xml:lang="ro">Cod sursă Ada</comment> - <comment xml:lang="ru">исходный код Ada</comment> + <comment xml:lang="ru">Исходный код Ada</comment> <comment xml:lang="sk">Zdrojový kód jazyka Ada</comment> <comment xml:lang="sl">Datoteka izvorne kode Ada</comment> <comment xml:lang="sq">Kod burues Ada</comment> @@ -31983,7 +32944,7 @@ <comment xml:lang="pt">lista de autores</comment> <comment xml:lang="pt_BR">Lista de autores</comment> <comment xml:lang="ro">listă autori</comment> - <comment xml:lang="ru">список авторов</comment> + <comment xml:lang="ru">Список авторов</comment> <comment xml:lang="sk">Zoznam autorov</comment> <comment xml:lang="sl">seznam avtorjev</comment> <comment xml:lang="sq">Lista e autorëve</comment> @@ -32000,6 +32961,7 @@ <mime-type type="text/x-bibtex"> <comment>BibTeX document</comment> <comment xml:lang="ar">مستند BibTeX</comment> + <comment xml:lang="ast">Documentu de BibTeX</comment> <comment xml:lang="be@latin">Dakument BibTeX</comment> <comment xml:lang="bg">Документ — BibTeX</comment> <comment xml:lang="ca">document BibTeX</comment> @@ -32036,7 +32998,7 @@ <comment xml:lang="pt">documento BibTeX</comment> <comment xml:lang="pt_BR">Documento BibTeX</comment> <comment xml:lang="ro">Document BibTeX</comment> - <comment xml:lang="ru">документ BibTeX</comment> + <comment xml:lang="ru">Документ BibTeX</comment> <comment xml:lang="sk">Dokument BibTeX</comment> <comment xml:lang="sl">Dokument BibTeX</comment> <comment xml:lang="sq">Dokument BibTeX</comment> @@ -32075,7 +33037,7 @@ <comment xml:lang="hr">C++ zaglavlje</comment> <comment xml:lang="hu">C++ fejléc</comment> <comment xml:lang="ia">Capite C++</comment> - <comment xml:lang="id">Tajuk C++</comment> + <comment xml:lang="id">Header C++</comment> <comment xml:lang="it">Header C++</comment> <comment xml:lang="ja">C++ ヘッダー</comment> <comment xml:lang="ka">C++-ის თავსართი</comment> @@ -32091,7 +33053,7 @@ <comment xml:lang="pt">cabeçalho C++</comment> <comment xml:lang="pt_BR">Cabeçalho C++</comment> <comment xml:lang="ro">Antet C++</comment> - <comment xml:lang="ru">заголовочный файл C++</comment> + <comment xml:lang="ru">Заголовочный файл C++</comment> <comment xml:lang="sk">Hlavičky jazyka C++</comment> <comment xml:lang="sl">Datoteka glave C++</comment> <comment xml:lang="sq">Header C++</comment> @@ -32100,7 +33062,7 @@ <comment xml:lang="tr">C++ başlığı</comment> <comment xml:lang="uk">файл заголовків мовою C++</comment> <comment xml:lang="vi">Phần đầu mã nguồn C++</comment> - <comment xml:lang="zh_CN">C++ 源代码头文件</comment> + <comment xml:lang="zh_CN">C++ 头文件</comment> <comment xml:lang="zh_TW">C++ 標頭檔</comment> <sub-class-of type="text/x-chdr"/> <glob pattern="*.hh"/> @@ -32115,7 +33077,7 @@ <comment xml:lang="be@latin">Kryničny kod C++</comment> <comment xml:lang="bg">Изходен код — C++</comment> <comment xml:lang="ca">codi font en C++</comment> - <comment xml:lang="cs">zdrojový kód C++</comment> + <comment xml:lang="cs">zdrojový kód v jazyce C++</comment> <comment xml:lang="da">C++-kildekode</comment> <comment xml:lang="de">C++-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας C++</comment> @@ -32129,10 +33091,10 @@ <comment xml:lang="ga">cód foinseach C++</comment> <comment xml:lang="gl">código fonte de C++</comment> <comment xml:lang="he">קוד מקור של C++</comment> - <comment xml:lang="hr">C++ izvorni kod</comment> + <comment xml:lang="hr">C++ izvorni kôd</comment> <comment xml:lang="hu">C++-forráskód</comment> <comment xml:lang="ia">Codice-fonte C++</comment> - <comment xml:lang="id">Kode program C++</comment> + <comment xml:lang="id">Kode sumber C++</comment> <comment xml:lang="it">Codice sorgente C++</comment> <comment xml:lang="ja">C++ ソースコード</comment> <comment xml:lang="ka">C++-ის საწყისი კოდი</comment> @@ -32149,7 +33111,7 @@ <comment xml:lang="pt">código origem C++</comment> <comment xml:lang="pt_BR">Código-fonte C++</comment> <comment xml:lang="ro">Cod sursă C++</comment> - <comment xml:lang="ru">исходный код C++</comment> + <comment xml:lang="ru">Исходный код C++</comment> <comment xml:lang="sk">Zdrojový kód jazyka C++</comment> <comment xml:lang="sl">Datoteka izvorne kode C++</comment> <comment xml:lang="sq">Kod burues C++</comment> @@ -32170,6 +33132,7 @@ <mime-type type="text/x-changelog"> <comment>ChangeLog document</comment> <comment xml:lang="ar">مستند ChangeLog</comment> + <comment xml:lang="ast">Documentu de rexistru de cambeos</comment> <comment xml:lang="be@latin">Dakument zafiksavanych źmienaŭ ChangeLog</comment> <comment xml:lang="bg">Дневник за промени — ChangeLog</comment> <comment xml:lang="ca">document de registre de canvis</comment> @@ -32186,7 +33149,7 @@ <comment xml:lang="ga">cáipéis ChangeLog</comment> <comment xml:lang="gl">documento Changelog</comment> <comment xml:lang="he">מסמך של ChangeLog</comment> - <comment xml:lang="hr">Dokument zaspisa promjena</comment> + <comment xml:lang="hr">Dokument zapisa promjena</comment> <comment xml:lang="hu">ChangeLog dokumentum</comment> <comment xml:lang="ia">Lista de cambiamentos</comment> <comment xml:lang="id">Dokumen ChangeLog</comment> @@ -32205,11 +33168,11 @@ <comment xml:lang="pt">documento ChangeLog</comment> <comment xml:lang="pt_BR">Documento ChangeLog</comment> <comment xml:lang="ro">Document ChangeLog</comment> - <comment xml:lang="ru">протокол изменений</comment> + <comment xml:lang="ru">Протокол изменений</comment> <comment xml:lang="sk">Dokument ChangeLog</comment> <comment xml:lang="sl">Dokument ChangeLog</comment> <comment xml:lang="sq">Dokument ChangeLog</comment> - <comment xml:lang="sr">Ченџ Лог документ</comment> + <comment xml:lang="sr">документ дневника измена</comment> <comment xml:lang="sv">Ändringsloggsdokument</comment> <comment xml:lang="tr">Değişim Günlüğü belgesi</comment> <comment xml:lang="uk">документ ChangeLog</comment> @@ -32241,7 +33204,7 @@ <comment xml:lang="hr">C zaglavlje</comment> <comment xml:lang="hu">C fejléc</comment> <comment xml:lang="ia">Capite C</comment> - <comment xml:lang="id">Tajuk C</comment> + <comment xml:lang="id">Header C</comment> <comment xml:lang="it">Header C</comment> <comment xml:lang="ja">C ヘッダー</comment> <comment xml:lang="ka">C-ის თავსართი</comment> @@ -32257,7 +33220,7 @@ <comment xml:lang="pt">cabeçalho C</comment> <comment xml:lang="pt_BR">Cabeçalho C</comment> <comment xml:lang="ro">Antet C</comment> - <comment xml:lang="ru">заголовочный файл C</comment> + <comment xml:lang="ru">Заголовочный файл C</comment> <comment xml:lang="sk">Hlavičky jazyka C</comment> <comment xml:lang="sl">Datoteka glave C</comment> <comment xml:lang="sq">Header C</comment> @@ -32291,10 +33254,10 @@ <comment xml:lang="ga">cód foinseach CMake</comment> <comment xml:lang="gl">código fonte de CMake</comment> <comment xml:lang="he">קוד מקור של CMake</comment> - <comment xml:lang="hr">CMake izvorni kod</comment> + <comment xml:lang="hr">CMake izvorni kôd</comment> <comment xml:lang="hu">CMake-forráskód</comment> <comment xml:lang="ia">Codice-fonte CMake</comment> - <comment xml:lang="id">Kode program CMake</comment> + <comment xml:lang="id">Kode sumber CMake</comment> <comment xml:lang="it">Codice sorgente CMake</comment> <comment xml:lang="ja">CMake ソースコード</comment> <comment xml:lang="ka">CMake-ის საწყისი კოდი</comment> @@ -32310,7 +33273,7 @@ <comment xml:lang="pt">código origem CMake</comment> <comment xml:lang="pt_BR">Código-fonte CMake</comment> <comment xml:lang="ro">Cod sursă CMake</comment> - <comment xml:lang="ru">исходный код CMake</comment> + <comment xml:lang="ru">Исходный код CMake</comment> <comment xml:lang="sk">Zdrojový kód CMake</comment> <comment xml:lang="sl">Datoteka izvorne kode CMake</comment> <comment xml:lang="sq">Kod burues CMake</comment> @@ -32328,6 +33291,7 @@ <mime-type type="text/csv"> <comment>CSV document</comment> <comment xml:lang="ar">مستند CSV</comment> + <comment xml:lang="ast">Documentu CVS</comment> <comment xml:lang="be@latin">Dakument CSV</comment> <comment xml:lang="bg">Документ — CSV</comment> <comment xml:lang="ca">document CSV</comment> @@ -32364,7 +33328,7 @@ <comment xml:lang="pt">documento CSV</comment> <comment xml:lang="pt_BR">Documento CSV</comment> <comment xml:lang="ro">Document CSV</comment> - <comment xml:lang="ru">документ CSV</comment> + <comment xml:lang="ru">Документ CSV</comment> <comment xml:lang="sk">Dokument CSV</comment> <comment xml:lang="sl">Dokument CSV</comment> <comment xml:lang="sq">Dokument CSV</comment> @@ -32384,6 +33348,7 @@ </mime-type> <mime-type type="text/csv-schema"> <comment>CSV Schema document</comment> + <comment xml:lang="ast">Documentu d'esquema CSV</comment> <comment xml:lang="ca">document Schema de CSV</comment> <comment xml:lang="cs">dokument schématu CSV</comment> <comment xml:lang="da">CSV Schema-dokument</comment> @@ -32392,6 +33357,8 @@ <comment xml:lang="es">documento esquemático CSV</comment> <comment xml:lang="eu">CSV Schema dokumentua</comment> <comment xml:lang="fr">document schéma CSV</comment> + <comment xml:lang="ga">cáipéis scéimre CSV</comment> + <comment xml:lang="he">מסמך פריסת CSV</comment> <comment xml:lang="hr">CSV Shema dokument</comment> <comment xml:lang="hu">CSV sémadokumentum</comment> <comment xml:lang="ia">Documento CSV Schema</comment> @@ -32402,7 +33369,7 @@ <comment xml:lang="pl">Dokument schematu CSV</comment> <comment xml:lang="pt">documento CSV Schema</comment> <comment xml:lang="pt_BR">Documento CSV Schema</comment> - <comment xml:lang="ru">документ CSV Schema</comment> + <comment xml:lang="ru">Документ CSV Schema</comment> <comment xml:lang="sk">Dokument schémy CSV</comment> <comment xml:lang="sr">документ ЦСВ шеме</comment> <comment xml:lang="sv">CSV Schema-dokument</comment> @@ -32418,6 +33385,7 @@ <mime-type type="text/x-copying"> <comment>license terms</comment> <comment xml:lang="ar">شروط الترخيص</comment> + <comment xml:lang="ast">términos de llicencia</comment> <comment xml:lang="be@latin">licenzijnyja ŭmovy</comment> <comment xml:lang="bg">Лицензни условия</comment> <comment xml:lang="ca">condicions de llicència</comment> @@ -32434,7 +33402,7 @@ <comment xml:lang="ga">téarmaí ceadúnais</comment> <comment xml:lang="gl">termos de licenza</comment> <comment xml:lang="he">תנאי רישיון</comment> - <comment xml:lang="hr">uvjeti licence</comment> + <comment xml:lang="hr">Uvjeti licence</comment> <comment xml:lang="hu">licencfeltételek</comment> <comment xml:lang="ia">Conditiones de licentia</comment> <comment xml:lang="id">persyaratan lisensi</comment> @@ -32452,7 +33420,7 @@ <comment xml:lang="pt">termos de licença</comment> <comment xml:lang="pt_BR">Termos de licença</comment> <comment xml:lang="ro">termeni de licență</comment> - <comment xml:lang="ru">лицензионное соглашение</comment> + <comment xml:lang="ru">Лицензионное соглашение</comment> <comment xml:lang="sk">Licenčné podmienky</comment> <comment xml:lang="sl">pogoji in dovoljenja uporabe</comment> <comment xml:lang="sq">Kushte liçence</comment> @@ -32469,6 +33437,7 @@ <mime-type type="text/x-credits"> <comment>author credits</comment> <comment xml:lang="ar">شكر وتقدير المؤلف</comment> + <comment xml:lang="ast">creitos del autor</comment> <comment xml:lang="be@latin">zasłuhi aŭtara</comment> <comment xml:lang="bg">Благодарности към авторите</comment> <comment xml:lang="ca">atribucions d'autor</comment> @@ -32502,7 +33471,7 @@ <comment xml:lang="pt">créditos de autor</comment> <comment xml:lang="pt_BR">Créditos do autor</comment> <comment xml:lang="ro">mulțumiri autori</comment> - <comment xml:lang="ru">авторы программы</comment> + <comment xml:lang="ru">Авторы программы</comment> <comment xml:lang="sk">Autorské zásluhy</comment> <comment xml:lang="sl">avtorske zasluge</comment> <comment xml:lang="sq">Kreditë e autorëve</comment> @@ -32522,7 +33491,7 @@ <comment xml:lang="be@latin">Kryničny kod C</comment> <comment xml:lang="bg">Изходен код — C</comment> <comment xml:lang="ca">codi font en C</comment> - <comment xml:lang="cs">zdrojový kód C</comment> + <comment xml:lang="cs">zdrojový kód v jazyce C</comment> <comment xml:lang="da">C-kildekode</comment> <comment xml:lang="de">C-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας C</comment> @@ -32536,10 +33505,10 @@ <comment xml:lang="ga">cód foinseach C</comment> <comment xml:lang="gl">código fonte en C</comment> <comment xml:lang="he">קוד מקור של C</comment> - <comment xml:lang="hr">C izvorni kod</comment> + <comment xml:lang="hr">C izvorni kôd</comment> <comment xml:lang="hu">C-forráskód</comment> <comment xml:lang="ia">Codice-fonte C</comment> - <comment xml:lang="id">Kode program C</comment> + <comment xml:lang="id">Kode sumber C</comment> <comment xml:lang="it">Codice sorgente C</comment> <comment xml:lang="ja">C ソースコード</comment> <comment xml:lang="ka">C-ის საწყისი კოდი</comment> @@ -32556,7 +33525,7 @@ <comment xml:lang="pt">código origem C</comment> <comment xml:lang="pt_BR">Código-fonte C</comment> <comment xml:lang="ro">Cod sursă C</comment> - <comment xml:lang="ru">исходный код C</comment> + <comment xml:lang="ru">Исходный код C</comment> <comment xml:lang="sk">Zdrojový kód jazyka C</comment> <comment xml:lang="sl">Datoteka izvorne kode C</comment> <comment xml:lang="sq">Kod burues C</comment> @@ -32582,7 +33551,7 @@ <comment xml:lang="be@latin">Kryničny kod C#</comment> <comment xml:lang="bg">Изходен код — C#</comment> <comment xml:lang="ca">codi font en C#</comment> - <comment xml:lang="cs">zdrojový kód C#</comment> + <comment xml:lang="cs">zdrojový kód v jazyce C#</comment> <comment xml:lang="da">C#-kildekode</comment> <comment xml:lang="de">C#-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας C#</comment> @@ -32596,10 +33565,10 @@ <comment xml:lang="ga">cód foinseach C#</comment> <comment xml:lang="gl">código fonte en C#</comment> <comment xml:lang="he">קוד מקור של C#</comment> - <comment xml:lang="hr">C# izvorni kod</comment> + <comment xml:lang="hr">C# izvorni kôd</comment> <comment xml:lang="hu">C#-forráskód</comment> <comment xml:lang="ia">Codice-fonte C#</comment> - <comment xml:lang="id">Kode program C#</comment> + <comment xml:lang="id">Kode sumber C#</comment> <comment xml:lang="it">Codice sorgente C#</comment> <comment xml:lang="ja">C# ソースコード</comment> <comment xml:lang="ka">C#-ის საწყისი კოდი</comment> @@ -32616,7 +33585,7 @@ <comment xml:lang="pt">código origem C#</comment> <comment xml:lang="pt_BR">Código-fonte C#</comment> <comment xml:lang="ro">Cod sursă C#</comment> - <comment xml:lang="ru">исходный код C#</comment> + <comment xml:lang="ru">Исходный код C#</comment> <comment xml:lang="sk">Zdrojový kód jazyka C#</comment> <comment xml:lang="sl">Datoteka izvorne kode C#</comment> <comment xml:lang="sq">Kod burues C#</comment> @@ -32636,7 +33605,7 @@ <comment xml:lang="be@latin">Kryničny kod Vala</comment> <comment xml:lang="bg">Изходен код — Vala</comment> <comment xml:lang="ca">codi font en Vala</comment> - <comment xml:lang="cs">zdrojový kód Vala</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Vala</comment> <comment xml:lang="da">Valakildekode</comment> <comment xml:lang="de">Vala-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Vala</comment> @@ -32650,10 +33619,10 @@ <comment xml:lang="ga">cód foinseach Vala</comment> <comment xml:lang="gl">código fonte en Vala</comment> <comment xml:lang="he">קוד מקור של Vala</comment> - <comment xml:lang="hr">Vala izvorni kod</comment> + <comment xml:lang="hr">Vala izvorni kôd</comment> <comment xml:lang="hu">Vala forráskód</comment> <comment xml:lang="ia">Codice-fonte Vala</comment> - <comment xml:lang="id">Kode program Vala</comment> + <comment xml:lang="id">Kode sumber Vala</comment> <comment xml:lang="it">Codice sorgente Vala</comment> <comment xml:lang="ja">Vala ソースコード</comment> <comment xml:lang="kk">Vala бастапқы коды</comment> @@ -32668,7 +33637,7 @@ <comment xml:lang="pt">código origem Vala</comment> <comment xml:lang="pt_BR">Código-fonte Vala</comment> <comment xml:lang="ro">Cod sursă Vala</comment> - <comment xml:lang="ru">исходный код Vala</comment> + <comment xml:lang="ru">Исходный код Vala</comment> <comment xml:lang="sk">Zdrojový kód Vala</comment> <comment xml:lang="sl">Datoteka izvorne kode Vala</comment> <comment xml:lang="sq">Kod burues Vala</comment> @@ -32697,9 +33666,10 @@ <comment xml:lang="eu">OOC iturburu-kodea</comment> <comment xml:lang="fi">OOC-lähdekoodi</comment> <comment xml:lang="fr">source code OOC</comment> + <comment xml:lang="ga">cód foinseach OOC</comment> <comment xml:lang="gl">código fonte de OOC</comment> <comment xml:lang="he">קוד מקור של OOC</comment> - <comment xml:lang="hr">OOC izvorni kod</comment> + <comment xml:lang="hr">OOC izvorni kôd</comment> <comment xml:lang="hu">OOC forráskód</comment> <comment xml:lang="ia">Codice-fonte OCC</comment> <comment xml:lang="id">Kode sumber OOC</comment> @@ -32714,14 +33684,14 @@ <comment xml:lang="pl">Kod źródłowy OOC</comment> <comment xml:lang="pt">código origem OOC</comment> <comment xml:lang="pt_BR">Código-fonte OOC</comment> - <comment xml:lang="ru">исходный код OOC</comment> + <comment xml:lang="ru">Исходный код OOC</comment> <comment xml:lang="sk">Zdrojový kód OOC</comment> <comment xml:lang="sl">Izvorna koda OOC</comment> <comment xml:lang="sr">ООЦ изворни ко̂д</comment> <comment xml:lang="sv">OOC-källkod</comment> <comment xml:lang="tr">OOC kaynak kodu</comment> <comment xml:lang="uk">вихідний код мовою OOC</comment> - <comment xml:lang="zh_CN">OOC</comment> + <comment xml:lang="zh_CN">OOC 源代码</comment> <comment xml:lang="zh_TW">OOC 源碼</comment> <acronym>OOC</acronym> <expanded-acronym>Out Of Class</expanded-acronym> @@ -32770,7 +33740,7 @@ <comment xml:lang="pt">script DCL</comment> <comment xml:lang="pt_BR">Script DCL</comment> <comment xml:lang="ro">Script DCL</comment> - <comment xml:lang="ru">сценарий DCL</comment> + <comment xml:lang="ru">Сценарий DCL</comment> <comment xml:lang="sk">Skript DCL</comment> <comment xml:lang="sl">Skriptna datoteka DCL</comment> <comment xml:lang="sq">Script DCL</comment> @@ -32789,6 +33759,7 @@ <mime-type type="text/x-dsl"> <comment>DSSSL document</comment> <comment xml:lang="ar">مستند DSSSL</comment> + <comment xml:lang="ast">Documentu DSSSL</comment> <comment xml:lang="az">DSSSL sənədi</comment> <comment xml:lang="be@latin">Dakument DSSSL</comment> <comment xml:lang="bg">Документ — DSSSL</comment> @@ -32828,7 +33799,7 @@ <comment xml:lang="pt">documento DSSSL</comment> <comment xml:lang="pt_BR">Documento DSSSL</comment> <comment xml:lang="ro">Document DSSSL</comment> - <comment xml:lang="ru">документ DSSSL</comment> + <comment xml:lang="ru">Документ DSSSL</comment> <comment xml:lang="sk">Dokument DSSSL</comment> <comment xml:lang="sl">Dokument DSSSL</comment> <comment xml:lang="sq">Dokument DSSSL</comment> @@ -32850,7 +33821,7 @@ <comment xml:lang="be@latin">Kryničny kod D</comment> <comment xml:lang="bg">Изходен код — D</comment> <comment xml:lang="ca">codi font en D</comment> - <comment xml:lang="cs">zdrojový kód D</comment> + <comment xml:lang="cs">zdrojový kód v jazyce D</comment> <comment xml:lang="da">D-kildekode</comment> <comment xml:lang="de">D-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας D</comment> @@ -32864,10 +33835,10 @@ <comment xml:lang="ga">cód foinseach D</comment> <comment xml:lang="gl">código fonte de D</comment> <comment xml:lang="he">קוד מקור לשפת D</comment> - <comment xml:lang="hr">D izvorni kod</comment> + <comment xml:lang="hr">D izvorni kôd</comment> <comment xml:lang="hu">D-forráskód</comment> <comment xml:lang="ia">Codice-fonte D</comment> - <comment xml:lang="id">Kode program D</comment> + <comment xml:lang="id">Kode sumber D</comment> <comment xml:lang="it">Codice sorgente D</comment> <comment xml:lang="ja">D ソースコード</comment> <comment xml:lang="ka">D-ის საწყისი კოდი</comment> @@ -32883,7 +33854,7 @@ <comment xml:lang="pt">código origem D</comment> <comment xml:lang="pt_BR">Código-fonte D</comment> <comment xml:lang="ro">Cod sursă D</comment> - <comment xml:lang="ru">исходный код D</comment> + <comment xml:lang="ru">Исходный код D</comment> <comment xml:lang="sk">Zdrojový kód jazyka D</comment> <comment xml:lang="sl">Datoteka izvorne kode D</comment> <comment xml:lang="sq">Kod burues D</comment> @@ -32937,7 +33908,7 @@ <comment xml:lang="pt">ficheiro DTD</comment> <comment xml:lang="pt_BR">Arquivo DTD</comment> <comment xml:lang="ro">Fișier DTD</comment> - <comment xml:lang="ru">файл DTD</comment> + <comment xml:lang="ru">Файл DTD</comment> <comment xml:lang="sk">Súbor DTD</comment> <comment xml:lang="sl">Datoteka DTD</comment> <comment xml:lang="sq">File DTD</comment> @@ -32961,7 +33932,7 @@ <comment xml:lang="be@latin">Kryničny kod Eiffel</comment> <comment xml:lang="bg">Изходен код — Eiffel</comment> <comment xml:lang="ca">codi font en Eiffel</comment> - <comment xml:lang="cs">zdrojový kód Eiffel</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Eiffel</comment> <comment xml:lang="da">Eiffelkildekode</comment> <comment xml:lang="de">Eiffel-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Eiffel</comment> @@ -32975,10 +33946,10 @@ <comment xml:lang="ga">cód foinseach Eiffel</comment> <comment xml:lang="gl">código fone de Eiffel</comment> <comment xml:lang="he">קוד מקור של Eiffel</comment> - <comment xml:lang="hr">Eiffel izvorni kod</comment> + <comment xml:lang="hr">Eiffel izvorni kôd</comment> <comment xml:lang="hu">Eiffel forráskód</comment> <comment xml:lang="ia">Codice-fonte Eiffel</comment> - <comment xml:lang="id">Kode program Eiffel</comment> + <comment xml:lang="id">Kode sumber Eiffel</comment> <comment xml:lang="it">Codice sorgente Eiffel</comment> <comment xml:lang="ja">Eiffel ソースコード</comment> <comment xml:lang="ka">Eiffel-ის საწყისი კოდი</comment> @@ -32994,7 +33965,7 @@ <comment xml:lang="pt">código origem Eiffel</comment> <comment xml:lang="pt_BR">Código-fonte Eiffel</comment> <comment xml:lang="ro">Cod sursă Eiffel</comment> - <comment xml:lang="ru">исходный код Eiffel</comment> + <comment xml:lang="ru">Исходный код Eiffel</comment> <comment xml:lang="sk">Zdrojový kód Eiffel</comment> <comment xml:lang="sl">Datoteka izvorne kode Eiffel</comment> <comment xml:lang="sq">Kod burues Eiffel</comment> @@ -33031,7 +34002,7 @@ <comment xml:lang="ga">cód foinseach Emacs Lisp</comment> <comment xml:lang="gl">código fonte de Emacs Lisp</comment> <comment xml:lang="he">קוד מקור של Emcas Lisp</comment> - <comment xml:lang="hr">Emacs Lisp izvorni kod</comment> + <comment xml:lang="hr">Emacs Lisp izvorni kôd</comment> <comment xml:lang="hu">Emacs Lisp-forráskód</comment> <comment xml:lang="ia">Codice-fonte Lisp de Emacs</comment> <comment xml:lang="id">Kode sumber Emacs Lisp</comment> @@ -33051,7 +34022,7 @@ <comment xml:lang="pt">código origem Emacs Lisp</comment> <comment xml:lang="pt_BR">Código-fonte Lisp do Emacs</comment> <comment xml:lang="ro">Cod sursă Emacs Lisp</comment> - <comment xml:lang="ru">исходный код Emacs Lisp</comment> + <comment xml:lang="ru">Исходный код Emacs Lisp</comment> <comment xml:lang="sk">Zdrojový kód Emacs Lisp</comment> <comment xml:lang="sl">Datoteka izvorne kode Emacs Lisp</comment> <comment xml:lang="sq">Kod burues Emacs Lisp</comment> @@ -33075,7 +34046,7 @@ <comment xml:lang="be@latin">Kryničny kod Erlang</comment> <comment xml:lang="bg">Изходен код — Erlang</comment> <comment xml:lang="ca">codi font en Erlang</comment> - <comment xml:lang="cs">zdrojový kód Erlang</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Erlang</comment> <comment xml:lang="da">Erlangkildekode</comment> <comment xml:lang="de">Erlang-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Erlang</comment> @@ -33089,10 +34060,10 @@ <comment xml:lang="ga">cód foinseach Erlang</comment> <comment xml:lang="gl">código fonte de Erlang</comment> <comment xml:lang="he">קוד מקור של Erlang</comment> - <comment xml:lang="hr">Erlang izvorni kod</comment> + <comment xml:lang="hr">Erlang izvorni kôd</comment> <comment xml:lang="hu">Erlang forráskód</comment> <comment xml:lang="ia">Codice-fonte Erlang</comment> - <comment xml:lang="id">Kode program Erlang</comment> + <comment xml:lang="id">Kode sumber Erlang</comment> <comment xml:lang="it">Codice sorgente Erlang</comment> <comment xml:lang="ja">Erlang ソースコード</comment> <comment xml:lang="ka">Erlang-ის საწყისი კოდი</comment> @@ -33108,7 +34079,7 @@ <comment xml:lang="pt">código origem Erlang</comment> <comment xml:lang="pt_BR">Código-fonte Erlang</comment> <comment xml:lang="ro">Cod sursă Erlang</comment> - <comment xml:lang="ru">исходный код Erlang</comment> + <comment xml:lang="ru">Исходный код Erlang</comment> <comment xml:lang="sk">Zdrojový kód Erlang</comment> <comment xml:lang="sl">Datoteka izvorne kode Erlang</comment> <comment xml:lang="sq">Kod burues Erlang</comment> @@ -33129,7 +34100,7 @@ <comment xml:lang="be@latin">Kryničny kod Fortran</comment> <comment xml:lang="bg">Изходен код — Fortran</comment> <comment xml:lang="ca">codi font en Fortran</comment> - <comment xml:lang="cs">zdrojový kód Fortran</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Fortran</comment> <comment xml:lang="cy">Ffynhonnell rhaglen FORTRAN</comment> <comment xml:lang="da">Fortrankildekode</comment> <comment xml:lang="de">Fortran-Quelltext</comment> @@ -33144,10 +34115,10 @@ <comment xml:lang="ga">cód foinseach Fortran</comment> <comment xml:lang="gl">código fonte de Fortran</comment> <comment xml:lang="he">קוד מקור של Fortran</comment> - <comment xml:lang="hr">Fortran izvorni kod</comment> + <comment xml:lang="hr">Fortran izvorni kôd</comment> <comment xml:lang="hu">Fortran-forráskód</comment> <comment xml:lang="ia">Codice-fonte Fortran</comment> - <comment xml:lang="id">Kode program Fortran</comment> + <comment xml:lang="id">Kode sumber Fortran</comment> <comment xml:lang="it">Codice sorgente Fortran</comment> <comment xml:lang="ja">Fortran ソースコード</comment> <comment xml:lang="ka">Fortran-ის საწყისი კოდი</comment> @@ -33164,7 +34135,7 @@ <comment xml:lang="pt">código origem Fortran</comment> <comment xml:lang="pt_BR">Código-fonte Fortran</comment> <comment xml:lang="ro">Cod sursă Fortran</comment> - <comment xml:lang="ru">исходный код Fortran</comment> + <comment xml:lang="ru">Исходный код Fortran</comment> <comment xml:lang="sk">Zdrojový kód Fortran</comment> <comment xml:lang="sl">Datoteka izvorne kode Fortran</comment> <comment xml:lang="sq">Kod burues Fortran</comment> @@ -33193,10 +34164,12 @@ <comment xml:lang="eu">Genie iturburu-kodea</comment> <comment xml:lang="fi">Genie-lähdekoodi</comment> <comment xml:lang="fr">code source Genie</comment> + <comment xml:lang="ga">cód foinseach Genie</comment> + <comment xml:lang="he">קוד מקור של Genie</comment> <comment xml:lang="hr">Genie izvorni kôd</comment> <comment xml:lang="hu">Genie forráskód</comment> <comment xml:lang="ia">Codice-fonte Genie</comment> - <comment xml:lang="id">Kode program Genie</comment> + <comment xml:lang="id">Kode sumber Genie</comment> <comment xml:lang="it">Codice sorgente Genie</comment> <comment xml:lang="kk">Genie бастапқы коды</comment> <comment xml:lang="ko">Genie 소스 코드</comment> @@ -33204,7 +34177,7 @@ <comment xml:lang="pl">Kod źródłowy Genie</comment> <comment xml:lang="pt">código origem Genie</comment> <comment xml:lang="pt_BR">Código-fonte Genie</comment> - <comment xml:lang="ru">исходный код Genie</comment> + <comment xml:lang="ru">Исходный код Genie</comment> <comment xml:lang="sk">Zdrojový kód Genie</comment> <comment xml:lang="sl">Izvorna koda Genie</comment> <comment xml:lang="sr">Гение изворни ко̂д</comment> @@ -33220,6 +34193,7 @@ <mime-type type="text/x-gettext-translation"> <comment>translation file</comment> <comment xml:lang="ar">ملف الترجمة</comment> + <comment xml:lang="ast">ficheru de traducción</comment> <comment xml:lang="be@latin">fajł pierakładu</comment> <comment xml:lang="bg">Превод</comment> <comment xml:lang="ca">fitxer de traducció</comment> @@ -33234,10 +34208,10 @@ <comment xml:lang="fi">käännöstiedosto</comment> <comment xml:lang="fo">týðingarfíla</comment> <comment xml:lang="fr">fichier de traduction</comment> - <comment xml:lang="ga">comhad aistrithe</comment> + <comment xml:lang="ga">comhad aistriúcháin</comment> <comment xml:lang="gl">ficheiro de tradución</comment> <comment xml:lang="he">קובץ תרגום</comment> - <comment xml:lang="hr">datoteka prijevoda</comment> + <comment xml:lang="hr">Datoteka prijevoda</comment> <comment xml:lang="hu">fordítási fájl</comment> <comment xml:lang="ia">File de traduction</comment> <comment xml:lang="id">berkas terjemahan</comment> @@ -33256,7 +34230,7 @@ <comment xml:lang="pt">ficheiro de tradução</comment> <comment xml:lang="pt_BR">Arquivo de tradução</comment> <comment xml:lang="ro">fișier traducere</comment> - <comment xml:lang="ru">файл переводов</comment> + <comment xml:lang="ru">Файл переводов</comment> <comment xml:lang="sk">Súbor prekladu</comment> <comment xml:lang="sl">datoteka prevoda programa</comment> <comment xml:lang="sq">File përkthimesh</comment> @@ -33265,7 +34239,7 @@ <comment xml:lang="tr">çeviri dosyası</comment> <comment xml:lang="uk">файл перекладу</comment> <comment xml:lang="vi">tập tin dịch</comment> - <comment xml:lang="zh_CN">消息翻译文件</comment> + <comment xml:lang="zh_CN">翻译文件</comment> <comment xml:lang="zh_TW">翻譯檔</comment> <sub-class-of type="text/plain"/> <glob pattern="*.po"/> @@ -33275,6 +34249,7 @@ <mime-type type="text/x-gettext-translation-template"> <comment>translation template</comment> <comment xml:lang="ar">قالب الترجمة</comment> + <comment xml:lang="ast">plantía de traducción</comment> <comment xml:lang="be@latin">šablon dla pierakładu</comment> <comment xml:lang="bg">Шаблон за преводи</comment> <comment xml:lang="ca">plantilla de traducció</comment> @@ -33289,10 +34264,10 @@ <comment xml:lang="fi">käännösmalli</comment> <comment xml:lang="fo">týðingarformur</comment> <comment xml:lang="fr">modèle de traduction</comment> - <comment xml:lang="ga">teimpléad aistrithe</comment> + <comment xml:lang="ga">teimpléad aistriúcháin</comment> <comment xml:lang="gl">plantilla de tradución</comment> <comment xml:lang="he">תבנית תרגום</comment> - <comment xml:lang="hr">predložak prijevoda</comment> + <comment xml:lang="hr">Predložak prijevoda</comment> <comment xml:lang="hu">fordítási sablon</comment> <comment xml:lang="ia">Patrono de traduction</comment> <comment xml:lang="id">templat terjemahan</comment> @@ -33311,7 +34286,7 @@ <comment xml:lang="pt">modelo de tradução</comment> <comment xml:lang="pt_BR">Modelo de tradução</comment> <comment xml:lang="ro">șablon de traducere</comment> - <comment xml:lang="ru">шаблон переводов</comment> + <comment xml:lang="ru">Шаблон переводов</comment> <comment xml:lang="sk">Šablóna prekladu</comment> <comment xml:lang="sl">predloga datoteke prevoda programa</comment> <comment xml:lang="sq">Model përkthimesh</comment> @@ -33320,7 +34295,7 @@ <comment xml:lang="tr">çeviri şablonu</comment> <comment xml:lang="uk">шаблон перекладу</comment> <comment xml:lang="vi">mẫu dịch</comment> - <comment xml:lang="zh_CN">消息翻译模板</comment> + <comment xml:lang="zh_CN">翻译模板</comment> <comment xml:lang="zh_TW">翻譯模版</comment> <sub-class-of type="text/plain"/> <glob pattern="*.pot"/> @@ -33332,18 +34307,27 @@ <mime-type type="text/x-gherkin"> <comment>feature specification in Gherkin format</comment> <comment xml:lang="ca">especificació de funcionalitat en format Gherkin</comment> + <comment xml:lang="cs">specifikace vlastností ve formátu Gherkin</comment> <comment xml:lang="da">funktionspecifikation i Gherkin-format</comment> <comment xml:lang="de">Funktionsspezifikation im Gherkin-Format</comment> + <comment xml:lang="en_GB">feature specification in Gherkin format</comment> <comment xml:lang="es">especificación de funcionalidad en formato Gherkin</comment> <comment xml:lang="fr">spécification fonctionnelle au format Gherkin</comment> + <comment xml:lang="ga">sonraíocht gnéithe i bhformáid Gherkin</comment> <comment xml:lang="he">פירוט תכונות בתבנית Gherkin</comment> + <comment xml:lang="hr">opis značajke u Gherkin formatu</comment> <comment xml:lang="hu">funkcióleírás Gherkin formátumban</comment> + <comment xml:lang="id">spesifikasi fitur dalam format Gherkin</comment> + <comment xml:lang="it">Specifica di funzionalità in formato Gherkin</comment> <comment xml:lang="kk">Gherkin пішіміндегі функционалды анықтамалар</comment> <comment xml:lang="ko">Gherkin 형식의 기능 명세</comment> <comment xml:lang="pl">Specyfikacja funkcji w formacie Gherkin</comment> <comment xml:lang="pt_BR">Especificação de recurso no formato Gherkin</comment> - <comment xml:lang="ru">функциональные определения в формате Gherkin</comment> + <comment xml:lang="ru">Функциональные определения в формате Gherkin</comment> <comment xml:lang="sk">Špecifikácia funkcie vo formáte Gherkin</comment> + <comment xml:lang="sr">одредба функције у запису Геркина</comment> + <comment xml:lang="sv">egenskapsspecifikation i Gherkin-format</comment> + <comment xml:lang="tr">Gherkin biçiminde özellik belirtimi</comment> <comment xml:lang="uk">специфікація можливості у форматі Gherkin</comment> <comment xml:lang="zh_CN">Gherkin 格式中的功能规范</comment> <comment xml:lang="zh_TW">Gherkin 格式的特徵規格</comment> @@ -33353,6 +34337,7 @@ <mime-type type="text/html"> <comment>HTML document</comment> <comment xml:lang="ar">مستند HTML</comment> + <comment xml:lang="ast">Documentu HTML</comment> <comment xml:lang="be@latin">Dakument HTML</comment> <comment xml:lang="bg">Документ — HTML</comment> <comment xml:lang="ca">document HTML</comment> @@ -33388,7 +34373,7 @@ <comment xml:lang="pt">documento HTML</comment> <comment xml:lang="pt_BR">Documento HTML</comment> <comment xml:lang="ro">Document HTML</comment> - <comment xml:lang="ru">документ HTML</comment> + <comment xml:lang="ru">Документ HTML</comment> <comment xml:lang="sk">Dokument HTML</comment> <comment xml:lang="sl">Dokument HTML</comment> <comment xml:lang="sq">Dokument HTML</comment> @@ -33434,7 +34419,7 @@ <comment xml:lang="de">Webanwendungscache-Manifest</comment> <comment xml:lang="el">Δηλωτικό λανθάνουσας μνήμης εφαρμογής Ιστού</comment> <comment xml:lang="en_GB">Web application cache manifest</comment> - <comment xml:lang="es">manifiesto de caché de aplicación web</comment> + <comment xml:lang="es">manifiesto de antememoria de aplicación web</comment> <comment xml:lang="eu">Web aplikazioaren cache-aren agiria</comment> <comment xml:lang="fo">Net nýtsluskipanarkova manifest</comment> <comment xml:lang="fr">manifeste de cache d'application Web</comment> @@ -33457,7 +34442,7 @@ <comment xml:lang="pt">manifesto de cache de aplicação web</comment> <comment xml:lang="pt_BR">Manifest de cache de aplicação web</comment> <comment xml:lang="ro">Manifest de cache pentru aplicații web</comment> - <comment xml:lang="ru">манифест кэша веб-приложения</comment> + <comment xml:lang="ru">Манифест кэша веб-приложения</comment> <comment xml:lang="sk">Manifest vyrovnávacej pamäte webovej aplikácie</comment> <comment xml:lang="sl">Predpomnilnik spletnega programa</comment> <comment xml:lang="sr">проглас оставе Веб програма</comment> @@ -33480,6 +34465,7 @@ <mime-type type="text/x-google-video-pointer"> <comment>Google Video Pointer</comment> <comment xml:lang="ar">مؤشر فيديو جوجل</comment> + <comment xml:lang="ast">Google Video Pointer</comment> <comment xml:lang="be@latin">Pakazalnik Google Video</comment> <comment xml:lang="bg">Документ-указател към видео на Google</comment> <comment xml:lang="ca">apuntador a vídeo de Google</comment> @@ -33539,7 +34525,7 @@ <comment xml:lang="be@latin">Kryničny kod Haskell</comment> <comment xml:lang="bg">Изходен код на Haskell</comment> <comment xml:lang="ca">codi font en Haskell</comment> - <comment xml:lang="cs">zdrojový kód Haskell</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Haskell</comment> <comment xml:lang="cy">Ffynhonnell rhaglen Haskell</comment> <comment xml:lang="da">Haskellkildekode</comment> <comment xml:lang="de">Haskell-Quelltext</comment> @@ -33554,10 +34540,10 @@ <comment xml:lang="ga">cód foinseach Haskell</comment> <comment xml:lang="gl">código fonte de Haskell</comment> <comment xml:lang="he">קוד מקור של Haskell</comment> - <comment xml:lang="hr">Haskell izvorni kod</comment> + <comment xml:lang="hr">Haskell izvorni kôd</comment> <comment xml:lang="hu">Haskell-forráskód</comment> <comment xml:lang="ia">Codice-fonte Haskell</comment> - <comment xml:lang="id">Kode program Haskell</comment> + <comment xml:lang="id">Kode sumber Haskell</comment> <comment xml:lang="it">Codice sorgente Haskell</comment> <comment xml:lang="ja">Haskell ソースコード</comment> <comment xml:lang="kk">Haskell бастапқы коды</comment> @@ -33573,7 +34559,7 @@ <comment xml:lang="pt">código origem Haskell</comment> <comment xml:lang="pt_BR">Código-fonte Haskell</comment> <comment xml:lang="ro">Cod sursă Haskell</comment> - <comment xml:lang="ru">исходный код Haskell</comment> + <comment xml:lang="ru">Исходный код Haskell</comment> <comment xml:lang="sk">Zdrojový kód Haskell</comment> <comment xml:lang="sl">Datoteka izvorne kode Haskell</comment> <comment xml:lang="sq">Kod burues Haskell</comment> @@ -33590,6 +34576,7 @@ <mime-type type="text/x-idl"> <comment>IDL document</comment> <comment xml:lang="ar">مستند IDL</comment> + <comment xml:lang="ast">Documentu IDL</comment> <comment xml:lang="az">IDL sənədi</comment> <comment xml:lang="be@latin">Dakument IDL</comment> <comment xml:lang="bg">Документ — IDL</comment> @@ -33628,7 +34615,7 @@ <comment xml:lang="pt">documento IDL</comment> <comment xml:lang="pt_BR">Documento IDL</comment> <comment xml:lang="ro">Document IDL</comment> - <comment xml:lang="ru">документ IDL</comment> + <comment xml:lang="ru">Документ IDL</comment> <comment xml:lang="sk">Dokument IDL</comment> <comment xml:lang="sl">Dokument IDL</comment> <comment xml:lang="sq">Dokument IDL</comment> @@ -33647,6 +34634,7 @@ <mime-type type="text/x-install"> <comment>installation instructions</comment> <comment xml:lang="ar">تعليمات التثبيت</comment> + <comment xml:lang="ast">instrucciones d'instalación</comment> <comment xml:lang="be@latin">instrukcyja dla instalavańnia</comment> <comment xml:lang="bg">Инструкции за инсталация</comment> <comment xml:lang="ca">instruccions d'instal·lació</comment> @@ -33663,7 +34651,7 @@ <comment xml:lang="ga">treoracha suiteála</comment> <comment xml:lang="gl">instrucións de instalación</comment> <comment xml:lang="he">הוראות התקנה</comment> - <comment xml:lang="hr">upute za instalaciju</comment> + <comment xml:lang="hr">Upute za instalaciju</comment> <comment xml:lang="hu">telepítési utasítások</comment> <comment xml:lang="ia">Instructiones de installation</comment> <comment xml:lang="id">instruksi instalasi</comment> @@ -33681,7 +34669,7 @@ <comment xml:lang="pt">instruções de instalação</comment> <comment xml:lang="pt_BR">Instruções de instalação</comment> <comment xml:lang="ro">instrucțiuni de instalare</comment> - <comment xml:lang="ru">инструкции по установке программы</comment> + <comment xml:lang="ru">Инструкции по установке</comment> <comment xml:lang="sk">Návod na inštaláciu</comment> <comment xml:lang="sl">navodila namestitve</comment> <comment xml:lang="sq">Udhëzime instalimi</comment> @@ -33701,7 +34689,7 @@ <comment xml:lang="be@latin">Kryničny kod Java</comment> <comment xml:lang="bg">Изходен код на Java</comment> <comment xml:lang="ca">codi font en Java</comment> - <comment xml:lang="cs">zdrojový kód Java</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Java</comment> <comment xml:lang="da">Javakildekode</comment> <comment xml:lang="de">Java-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Java</comment> @@ -33715,10 +34703,10 @@ <comment xml:lang="ga">cód foinseach Java</comment> <comment xml:lang="gl">código fonte de Java</comment> <comment xml:lang="he">קוד מקור ב־Java</comment> - <comment xml:lang="hr">Java izvorni kod</comment> + <comment xml:lang="hr">Java izvorni kôd</comment> <comment xml:lang="hu">Java-forráskód</comment> <comment xml:lang="ia">Codice-fonte Java</comment> - <comment xml:lang="id">Kode program Java</comment> + <comment xml:lang="id">Kode sumber Java</comment> <comment xml:lang="it">Codice sorgente Java</comment> <comment xml:lang="ja">Java ソースコード</comment> <comment xml:lang="kk">Java бастапқы коды</comment> @@ -33734,7 +34722,7 @@ <comment xml:lang="pt">código origem Java</comment> <comment xml:lang="pt_BR">Código-fonte Java</comment> <comment xml:lang="ro">Cod sursă Java</comment> - <comment xml:lang="ru">исходный код Java</comment> + <comment xml:lang="ru">Исходный код Java</comment> <comment xml:lang="sk">Zdrojový kód Java</comment> <comment xml:lang="sl">Datoteka izvorne kode Java</comment> <comment xml:lang="sq">Kod burues Java</comment> @@ -33765,7 +34753,7 @@ <comment xml:lang="fi">LDIF-osoitekirja</comment> <comment xml:lang="fo">LDIF adressubók</comment> <comment xml:lang="fr">carnet d'adresses LDIF</comment> - <comment xml:lang="ga">leabhar sheoltaí LDIF</comment> + <comment xml:lang="ga">leabhar seoltaí LDIF</comment> <comment xml:lang="gl">lista de enderezos LDIF</comment> <comment xml:lang="he">ספר כתובות של LDIF</comment> <comment xml:lang="hr">LDIF adresar</comment> @@ -33786,7 +34774,7 @@ <comment xml:lang="pt">livro de endereços LDIF</comment> <comment xml:lang="pt_BR">Livro de endereços LDIF</comment> <comment xml:lang="ro">Agendă LDIF</comment> - <comment xml:lang="ru">адресная книга LDIF</comment> + <comment xml:lang="ru">Адресная книга LDIF</comment> <comment xml:lang="sk">Adresár LDIF</comment> <comment xml:lang="sl">Datoteka imenika naslovov LDIF</comment> <comment xml:lang="sq">Rubrikë LDIF</comment> @@ -33842,7 +34830,7 @@ <comment xml:lang="pt">folha de música Lilypond</comment> <comment xml:lang="pt_BR">Partitura do Lilypond</comment> <comment xml:lang="ro">Fișă muzică Lilypond</comment> - <comment xml:lang="ru">список музыки Lilypond</comment> + <comment xml:lang="ru">Список музыки Lilypond</comment> <comment xml:lang="sk">Notový papier Lilypond</comment> <comment xml:lang="sl">Glasbena predloga Lilypond</comment> <comment xml:lang="sq">Partiturë Lilypond</comment> @@ -33876,10 +34864,10 @@ <comment xml:lang="ga">cód foinseach LHS</comment> <comment xml:lang="gl">código fonte en LHS</comment> <comment xml:lang="he">קוד מקור של LHS</comment> - <comment xml:lang="hr">LHS izvorni kod</comment> + <comment xml:lang="hr">LHS izvorni kôd</comment> <comment xml:lang="hu">LHS forráskód</comment> <comment xml:lang="ia">Codice-fonte LHS</comment> - <comment xml:lang="id">Kode program LHS</comment> + <comment xml:lang="id">Kode sumber LHS</comment> <comment xml:lang="it">Codice sorgente LHS</comment> <comment xml:lang="ja">LHS ソースコード</comment> <comment xml:lang="kk">LHS бастапқы коды</comment> @@ -33894,7 +34882,7 @@ <comment xml:lang="pt">código origem LHS</comment> <comment xml:lang="pt_BR">Código-fonte LHS</comment> <comment xml:lang="ro">Cod sursă LHS</comment> - <comment xml:lang="ru">исходный код LHS</comment> + <comment xml:lang="ru">Исходный код LHS</comment> <comment xml:lang="sk">Zdrojový kód LHS</comment> <comment xml:lang="sl">Datoteka izvorne kode LHS</comment> <comment xml:lang="sq">Kod burues LHS</comment> @@ -33913,6 +34901,7 @@ <mime-type type="text/x-log"> <comment>application log</comment> <comment xml:lang="ar">سجل التطبيق</comment> + <comment xml:lang="ast">rexistru d'aplicación</comment> <comment xml:lang="be@latin">časopis aplikacyi</comment> <comment xml:lang="bg">Файл-дневник на приложение</comment> <comment xml:lang="ca">registre d'aplicació</comment> @@ -33949,7 +34938,7 @@ <comment xml:lang="pt">diário de aplicação</comment> <comment xml:lang="pt_BR">Registro de aplicativo</comment> <comment xml:lang="ro">înregistrare aplicație</comment> - <comment xml:lang="ru">журнал сообщений</comment> + <comment xml:lang="ru">Журнал сообщений</comment> <comment xml:lang="sk">Záznam aplikácie</comment> <comment xml:lang="sl">dnevnik programa</comment> <comment xml:lang="sq">log i mesazheve të programit</comment> @@ -34005,7 +34994,7 @@ <comment xml:lang="pt">Makefile</comment> <comment xml:lang="pt_BR">Makefile (arquivo do make)</comment> <comment xml:lang="ro">Makefile</comment> - <comment xml:lang="ru">Makefile (файл сборки)</comment> + <comment xml:lang="ru">Файл Makefile</comment> <comment xml:lang="sk">Makefile</comment> <comment xml:lang="sl">Datoteka Makefile</comment> <comment xml:lang="sq">Makefile</comment> @@ -34029,6 +35018,7 @@ </mime-type> <mime-type type="text/markdown"> <comment>Markdown document</comment> + <comment xml:lang="ast">Documentu Markdown</comment> <comment xml:lang="bg">Документ — Markdown</comment> <comment xml:lang="ca">document Markdown</comment> <comment xml:lang="cs">dokument Markdown</comment> @@ -34040,6 +35030,7 @@ <comment xml:lang="eu">Markdown dokumentua</comment> <comment xml:lang="fi">Markdown-asiakirja</comment> <comment xml:lang="fr">document Markdown</comment> + <comment xml:lang="ga">cáipéis Markdown</comment> <comment xml:lang="gl">documento de Markdown</comment> <comment xml:lang="he">מסמך Markdown</comment> <comment xml:lang="hr">Markdown dokument</comment> @@ -34056,7 +35047,7 @@ <comment xml:lang="pl">Dokument Markdown</comment> <comment xml:lang="pt">documento Markdown</comment> <comment xml:lang="pt_BR">Documento Markdown</comment> - <comment xml:lang="ru">документ Markdown</comment> + <comment xml:lang="ru">Документ Markdown</comment> <comment xml:lang="sk">Dokument Markdown</comment> <comment xml:lang="sl">Dokument Markdown</comment> <comment xml:lang="sr">Маркдаун документ</comment> @@ -34108,7 +35099,7 @@ <comment xml:lang="pt">ficheiro Qt MOC</comment> <comment xml:lang="pt_BR">Arquivo Qt MOC</comment> <comment xml:lang="ro">Fișier Qt MOC</comment> - <comment xml:lang="ru">файл Qt MOC</comment> + <comment xml:lang="ru">Файл Qt MOC</comment> <comment xml:lang="sk">Súbor Qt MOC</comment> <comment xml:lang="sl">Datoteka Qt MOC</comment> <comment xml:lang="sq">File Qt MOC</comment> @@ -34117,7 +35108,7 @@ <comment xml:lang="tr">Qt MOC dosyası</comment> <comment xml:lang="uk">файл-метаоб'єкт Qt</comment> <comment xml:lang="vi">Tập tin MOC của Qt</comment> - <comment xml:lang="zh_CN">Qt 元对象编译文件</comment> + <comment xml:lang="zh_CN">Qt 元对象编译器文件</comment> <comment xml:lang="zh_TW">Qt MOC 檔</comment> <acronym>Qt MOC</acronym> <expanded-acronym>Qt Meta Object Compiler</expanded-acronym> @@ -34161,7 +35152,7 @@ <comment xml:lang="pt">extrato do registo do Windows</comment> <comment xml:lang="pt_BR">Extrator de registro do Windows</comment> <comment xml:lang="ro">Extras al registrului Windows</comment> - <comment xml:lang="ru">фрагмент Windows Registry</comment> + <comment xml:lang="ru">Фрагмент Windows Registry</comment> <comment xml:lang="sk">Časť registrov Windows</comment> <comment xml:lang="sl">izvleček vpisnika Windows</comment> <comment xml:lang="sq">Pjesë Windows Registry</comment> @@ -34170,7 +35161,7 @@ <comment xml:lang="tr">Windows Kayıt Defteri özü</comment> <comment xml:lang="uk">частина реєстру Windows</comment> <comment xml:lang="vi">Bản trích Registry Windows</comment> - <comment xml:lang="zh_CN">Windows 注册表文件</comment> + <comment xml:lang="zh_CN">Windows 注册表提取</comment> <comment xml:lang="zh_TW">Windows Registry 抽出</comment> <sub-class-of type="text/plain"/> <magic priority="50"> @@ -34216,7 +35207,7 @@ <comment xml:lang="pt">formato Managed Object</comment> <comment xml:lang="pt_BR">Formato de objeto gerenciado</comment> <comment xml:lang="ro">Managed Object Format</comment> - <comment xml:lang="ru">формат управляемого объекта</comment> + <comment xml:lang="ru">Формат управляемого объекта</comment> <comment xml:lang="sk">Formát Managed Object</comment> <comment xml:lang="sl">Datoteka Managed Object</comment> <comment xml:lang="sq">Managed Object Format</comment> @@ -34267,7 +35258,7 @@ <comment xml:lang="pt">publicação Mup</comment> <comment xml:lang="pt_BR">Publicação do Mup</comment> <comment xml:lang="ro">Publicație Mup</comment> - <comment xml:lang="ru">публикация Mup</comment> + <comment xml:lang="ru">Публикация Mup</comment> <comment xml:lang="sk">Publikácie Mup</comment> <comment xml:lang="sl">Datoteka objave Mup</comment> <comment xml:lang="sq">Publikim Mup</comment> @@ -34291,7 +35282,7 @@ <comment xml:lang="be@latin">Kryničny kod Objective-C</comment> <comment xml:lang="bg">Изходен код — Objective C</comment> <comment xml:lang="ca">codi font en Objective-C</comment> - <comment xml:lang="cs">zdrojový kód Objective-C</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Objective-C</comment> <comment xml:lang="da">Objektiv C-kildekode</comment> <comment xml:lang="de">Objective-C-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Objective-C</comment> @@ -34308,7 +35299,7 @@ <comment xml:lang="hr">Objective-C izvorni kôd</comment> <comment xml:lang="hu">Objective-C forráskód</comment> <comment xml:lang="ia">Codice-fonte Objective-C</comment> - <comment xml:lang="id">Kode program Objective-C</comment> + <comment xml:lang="id">Kode sumber Objective-C</comment> <comment xml:lang="it">Codice sorgente Objective-C</comment> <comment xml:lang="ja">Objective-C ソースコード</comment> <comment xml:lang="ka">Objective-C-ის საწყისი კოდი</comment> @@ -34325,7 +35316,7 @@ <comment xml:lang="pt">código origem Objective-C</comment> <comment xml:lang="pt_BR">Código-fonte Objective-C</comment> <comment xml:lang="ro">Cod sursă Objective-C</comment> - <comment xml:lang="ru">исходный код Objective-C</comment> + <comment xml:lang="ru">Исходный код Objective-C</comment> <comment xml:lang="sk">Zdrojový kód Objective-C</comment> <comment xml:lang="sl">Datoteka izvorne kode Objective-C</comment> <comment xml:lang="sq">Kod burues C objekt</comment> @@ -34348,7 +35339,7 @@ <comment xml:lang="be@latin">Kryničny kod OCaml</comment> <comment xml:lang="bg">Изходен код — OCaml</comment> <comment xml:lang="ca">codi font en OCaml</comment> - <comment xml:lang="cs">zdrojový kód OCaml</comment> + <comment xml:lang="cs">zdrojový kód v jazyce OCaml</comment> <comment xml:lang="da">OCaml-kildekode</comment> <comment xml:lang="de">OCaml-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας OCaml</comment> @@ -34362,10 +35353,10 @@ <comment xml:lang="ga">cód foinseach OCaml</comment> <comment xml:lang="gl">código fonte de OCaml</comment> <comment xml:lang="he">קוד מקור של OCaml</comment> - <comment xml:lang="hr">OCaml izvorni kod</comment> + <comment xml:lang="hr">OCaml izvorni kôd</comment> <comment xml:lang="hu">OCaml forráskód</comment> <comment xml:lang="ia">Codice-fonte OCaml</comment> - <comment xml:lang="id">Kode program OCaml</comment> + <comment xml:lang="id">Kode sumber OCaml</comment> <comment xml:lang="it">Codice sorgente OCaml</comment> <comment xml:lang="ja">OCaml ソースコード</comment> <comment xml:lang="kk">OCaml бастапқы коды</comment> @@ -34380,7 +35371,7 @@ <comment xml:lang="pt">código origem OCaml</comment> <comment xml:lang="pt_BR">Código-fonte OCaml</comment> <comment xml:lang="ro">Cod sursă OCaml</comment> - <comment xml:lang="ru">исходный код OCaml</comment> + <comment xml:lang="ru">Исходный код OCaml</comment> <comment xml:lang="sk">Zdrojový kód OCaml</comment> <comment xml:lang="sl">Datoteka izvorne kode OCaml</comment> <comment xml:lang="sq">Kod burues OCaml</comment> @@ -34394,6 +35385,33 @@ <glob pattern="*.ml"/> <glob pattern="*.mli"/> </mime-type> + <mime-type type="text/x-opencl-src"> + <comment>OpenCL source code</comment> + <comment xml:lang="ca">codi font en OpenCL</comment> + <comment xml:lang="cs">zdrojový kód v jazyce OpenCL</comment> + <comment xml:lang="de">OpenCL-Quelltext</comment> + <comment xml:lang="en_GB">OpenCL source code</comment> + <comment xml:lang="es">código fuente en OpenCL</comment> + <comment xml:lang="fi">OpenCL-lähdekoodi</comment> + <comment xml:lang="hr">OpenCL izvorni kôd</comment> + <comment xml:lang="hu">OpenCL forráskód</comment> + <comment xml:lang="id">Kode sumber OpenCL</comment> + <comment xml:lang="it">Codice sorgente OpenCL</comment> + <comment xml:lang="kk">OpenCL бастапқы коды</comment> + <comment xml:lang="ko">OpenCL 소스 코드</comment> + <comment xml:lang="pl">Kod źródłowy OpenCL</comment> + <comment xml:lang="pt_BR">Código-fonte do OpenCL</comment> + <comment xml:lang="ru">Исходный код OpenGL</comment> + <comment xml:lang="sk">Zdrojový kód OpenCL</comment> + <comment xml:lang="sv">OpenCL-källkod</comment> + <comment xml:lang="uk">вихідний код мовою OpenCL</comment> + <comment xml:lang="zh_CN">OpenCL 源代码</comment> + <comment xml:lang="zh_TW">OpenCL 源碼</comment> + <acronym>OpenCL</acronym> + <expanded-acronym>Open Computing Language</expanded-acronym> + <sub-class-of type="text/x-csrc"/> + <glob pattern="*.cl"/> + </mime-type> <mime-type type="text/x-matlab"> <comment>MATLAB script/function</comment> <comment xml:lang="ar">سكربت/وظيفة MATLAB</comment> @@ -34431,7 +35449,7 @@ <comment xml:lang="pt">script/função MATLAB</comment> <comment xml:lang="pt_BR">Script/função do MATLAB</comment> <comment xml:lang="ro">Funcție/script MATLAB</comment> - <comment xml:lang="ru">сценарий/функция MATLAB</comment> + <comment xml:lang="ru">Сценарий/функция MATLAB</comment> <comment xml:lang="sk">Skript/funkcia MATLAB</comment> <comment xml:lang="sl">Skriptna datoteka MATLAB</comment> <comment xml:lang="sq">Script/Funksion MATLAB</comment> @@ -34467,11 +35485,12 @@ <comment xml:lang="eu">Meson iturburu-kodea</comment> <comment xml:lang="fi">Meson-lähdekoodi</comment> <comment xml:lang="fr">code source Meson</comment> + <comment xml:lang="ga">cód foinseach Meson</comment> <comment xml:lang="he">קוד מקור Meson</comment> <comment xml:lang="hr">Meson izvorni kôd</comment> <comment xml:lang="hu">Meson forráskód</comment> <comment xml:lang="ia">Codice-fonte Meson</comment> - <comment xml:lang="id">Kode program Meson</comment> + <comment xml:lang="id">Kode sumber Meson</comment> <comment xml:lang="it">Codice sorgente Meson</comment> <comment xml:lang="kk">Meson бастапқы коды</comment> <comment xml:lang="ko">Meson 소스 코드</comment> @@ -34479,7 +35498,7 @@ <comment xml:lang="pl">Kod źródłowy Meson</comment> <comment xml:lang="pt">código origem Meson</comment> <comment xml:lang="pt_BR">Código-fonte Meson</comment> - <comment xml:lang="ru">исходный код Meson</comment> + <comment xml:lang="ru">Исходный код Meson</comment> <comment xml:lang="sk">Zdrojový kód Meson</comment> <comment xml:lang="sr">Месон изворни ко̂д</comment> <comment xml:lang="sv">Meson-källkod</comment> @@ -34503,6 +35522,7 @@ <comment xml:lang="eu">Modelica modeloa</comment> <comment xml:lang="fi">Modelica-malli</comment> <comment xml:lang="fr">modèle Modelica</comment> + <comment xml:lang="ga">samhail Modelica</comment> <comment xml:lang="gl">Modelo de Modelica</comment> <comment xml:lang="he">דגם של Modelica</comment> <comment xml:lang="hr">Modelica model</comment> @@ -34518,7 +35538,7 @@ <comment xml:lang="pl">Model Modelica</comment> <comment xml:lang="pt">modelo Modelica</comment> <comment xml:lang="pt_BR">Modelo da Modelica</comment> - <comment xml:lang="ru">модель Modelica</comment> + <comment xml:lang="ru">Модель Modelica</comment> <comment xml:lang="sk">Model Modelica</comment> <comment xml:lang="sl">Model Modelica</comment> <comment xml:lang="sr">модел Моделике</comment> @@ -34551,7 +35571,7 @@ <comment xml:lang="be@latin">Kryničny kod Pascal</comment> <comment xml:lang="bg">Изходен код — Pascal</comment> <comment xml:lang="ca">codi font en Pascal</comment> - <comment xml:lang="cs">zdrojový kód Pascal</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Pascal</comment> <comment xml:lang="da">Pascalkildekode</comment> <comment xml:lang="de">Pascal-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Pascal</comment> @@ -34568,7 +35588,7 @@ <comment xml:lang="hr">Pascal izvorni kôd</comment> <comment xml:lang="hu">Pascal-forráskód</comment> <comment xml:lang="ia">Codice-fonte Pascal</comment> - <comment xml:lang="id">Kode program Pascal</comment> + <comment xml:lang="id">Kode sumber Pascal</comment> <comment xml:lang="it">Codice sorgente Pascal</comment> <comment xml:lang="ja">Pascal ソースコード</comment> <comment xml:lang="kk">Pascal бастапқы коды</comment> @@ -34584,7 +35604,7 @@ <comment xml:lang="pt">código origem Pascal</comment> <comment xml:lang="pt_BR">Código-fonte Pascal</comment> <comment xml:lang="ro">Cod sursă Pascal</comment> - <comment xml:lang="ru">исходный код Pascal</comment> + <comment xml:lang="ru">Исходный код Pascal</comment> <comment xml:lang="sk">Zdrojový kód Pascal</comment> <comment xml:lang="sl">Datoteka izvorne kode Pascal</comment> <comment xml:lang="sq">Kod burues Pascal</comment> @@ -34619,7 +35639,7 @@ <comment xml:lang="ga">difríochtaí idir chomhaid</comment> <comment xml:lang="gl">diferenzas entre ficheiros</comment> <comment xml:lang="he">הבדל בין קבצים</comment> - <comment xml:lang="hr">razlike između datoteka</comment> + <comment xml:lang="hr">Razlike između datoteka</comment> <comment xml:lang="hu">diff-különbségfájl</comment> <comment xml:lang="ia">Differentias inter files</comment> <comment xml:lang="id">perbedaan diantara berkas</comment> @@ -34638,7 +35658,7 @@ <comment xml:lang="pt">diferenças entre ficheiros</comment> <comment xml:lang="pt_BR">Diferenças entre arquivos</comment> <comment xml:lang="ro">diferențe între fișiere</comment> - <comment xml:lang="ru">различия между файлами</comment> + <comment xml:lang="ru">Различия между файлами</comment> <comment xml:lang="sk">Rozdiely medzi súbormi</comment> <comment xml:lang="sl">razlike med datotekami</comment> <comment xml:lang="sq">Diferencë midis file</comment> @@ -34670,7 +35690,7 @@ <comment>Go source code</comment> <comment xml:lang="bg">Изходен код — Go</comment> <comment xml:lang="ca">codi font en Go</comment> - <comment xml:lang="cs">zdrojový kód Go</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Go</comment> <comment xml:lang="da">Go-kildekode</comment> <comment xml:lang="de">Go-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Go</comment> @@ -34680,9 +35700,10 @@ <comment xml:lang="eu">Go iturburu-kodea</comment> <comment xml:lang="fi">Go-lähdekoodi</comment> <comment xml:lang="fr">code source Go</comment> + <comment xml:lang="ga">cód foinseach Go</comment> <comment xml:lang="gl">código fonte de Go</comment> <comment xml:lang="he">קוד מקור של Go</comment> - <comment xml:lang="hr">Go izvorni kod</comment> + <comment xml:lang="hr">Go izvorni kôd</comment> <comment xml:lang="hu">Go forráskód</comment> <comment xml:lang="ia">Codice-fonte Go</comment> <comment xml:lang="id">Kode sumber Go</comment> @@ -34697,14 +35718,14 @@ <comment xml:lang="pl">Kod źródłowy Go</comment> <comment xml:lang="pt">cigo origem Go</comment> <comment xml:lang="pt_BR">Código-fonte Go</comment> - <comment xml:lang="ru">исходный код Go</comment> + <comment xml:lang="ru">Исходный код Go</comment> <comment xml:lang="sk">Zdrojový kód Go</comment> <comment xml:lang="sl">Izvorna koda Go</comment> <comment xml:lang="sr">Гоу изворни ко̂д</comment> <comment xml:lang="sv">Go-källkod</comment> <comment xml:lang="tr">Go kaynak kodu</comment> <comment xml:lang="uk">вихідний код мовою Go</comment> - <comment xml:lang="zh_CN">Go </comment> + <comment xml:lang="zh_CN">Go 源代码</comment> <comment xml:lang="zh_TW">Go 源碼</comment> <sub-class-of type="text/plain"/> <glob pattern="*.go"/> @@ -34721,6 +35742,7 @@ <comment xml:lang="eu">SCons konfigurazio-fitxategia</comment> <comment xml:lang="fi">SCons-asetustiedosto</comment> <comment xml:lang="fr">fichier de configuration SCons</comment> + <comment xml:lang="ga">comhad cumraíochta SCons</comment> <comment xml:lang="he">קובץ תצורה של SCons</comment> <comment xml:lang="hr">SCons datoteka podešavanja</comment> <comment xml:lang="hu">SCons beállítófájl</comment> @@ -34733,7 +35755,7 @@ <comment xml:lang="pl">Plik konfiguracji SCons</comment> <comment xml:lang="pt">ficheiro de configuração SCons</comment> <comment xml:lang="pt_BR">Arquivo de configuração do SCons</comment> - <comment xml:lang="ru">файл настроек SCons</comment> + <comment xml:lang="ru">Файл настроек SCons</comment> <comment xml:lang="sk">Konfiguračný súbor SCons</comment> <comment xml:lang="sl">Prilagoditvena datoteka SCons</comment> <comment xml:lang="sr">СКонс датотека подешавања</comment> @@ -34747,13 +35769,52 @@ <glob pattern="SConscript"/> <glob pattern="SConscript.*"/> </mime-type> + <mime-type type="text/x-python3"> + <comment>Python 3 script</comment> + <comment xml:lang="ca">script Python 3</comment> + <comment xml:lang="cs">skript v jazyce Python 3</comment> + <comment xml:lang="de">Python-3-Skript</comment> + <comment xml:lang="en_GB">Python 3 script</comment> + <comment xml:lang="es">secuencia de órdenes en Python 3</comment> + <comment xml:lang="fi">Python 3 -skripti</comment> + <comment xml:lang="hr">Python3 skripta</comment> + <comment xml:lang="hu">Python 3 parancsfájl</comment> + <comment xml:lang="id">Skrip Python 3</comment> + <comment xml:lang="it">Script Python 3</comment> + <comment xml:lang="kk">Python 3 скрипті</comment> + <comment xml:lang="ko">파이썬 3 스크립트</comment> + <comment xml:lang="pl">Skrypt Python 3</comment> + <comment xml:lang="pt_BR">Script Python 3</comment> + <comment xml:lang="ru">Сценарий Python 3</comment> + <comment xml:lang="sk">Skript Python 3</comment> + <comment xml:lang="sv">Python 3-skript</comment> + <comment xml:lang="uk">скрипт мовою Python 3</comment> + <comment xml:lang="zh_CN">Python 3 脚本</comment> + <comment xml:lang="zh_TW">Python 3 指令稿</comment> + <sub-class-of type='text/x-python'/> + <magic priority="60"> + <match value="#!/bin/python3" type="string" offset="0"/> + <match value="#! /bin/python3" type="string" offset="0"/> + <match value='eval \"exec /bin/python3' type="string" offset="0"/> + <match value="#!/usr/bin/python3" type="string" offset="0"/> + <match value="#! /usr/bin/python3" type="string" offset="0"/> + <match value='eval \"exec /usr/bin/python3' type="string" offset="0"/> + <match value="#!/usr/local/bin/python3" type="string" offset="0"/> + <match value="#! /usr/local/bin/python3" type="string" offset="0"/> + <match value='eval \"exec /usr/local/bin/python3' type="string" offset="0"/> + <match value='/bin/env python3' type="string" offset="2:16"/> + </magic> + <glob weight="50" pattern="*.py"/> + <glob weight="60" pattern="*.py3"/> + <glob weight="60" pattern="*.py3x"/> + </mime-type> <mime-type type="text/x-python"> <comment>Python script</comment> <comment xml:lang="ar">سكربت بايثون</comment> <comment xml:lang="be@latin">Skrypt Python</comment> <comment xml:lang="bg">Скрипт — Python</comment> <comment xml:lang="ca">script Python</comment> - <comment xml:lang="cs">skript Python</comment> + <comment xml:lang="cs">skript v jazyce Python</comment> <comment xml:lang="da">Pythonprogram</comment> <comment xml:lang="de">Python-Skript</comment> <comment xml:lang="el">Δέσμη ενεργειών Python</comment> @@ -34786,7 +35847,7 @@ <comment xml:lang="pt">script Python</comment> <comment xml:lang="pt_BR">Script Python</comment> <comment xml:lang="ro">Script Python</comment> - <comment xml:lang="ru">сценарий Python</comment> + <comment xml:lang="ru">Сценарий Python</comment> <comment xml:lang="sk">Skript Python</comment> <comment xml:lang="sl">Skriptna datoteka Python</comment> <comment xml:lang="sq">Script Python</comment> @@ -34811,9 +35872,9 @@ <match value='eval \"exec /usr/local/bin/python' type="string" offset="0"/> <match value='/bin/env python' type="string" offset="2:16"/> </magic> - <glob pattern="*.py"/> - <glob pattern="*.pyx"/> - <glob pattern="*.wsgi"/> + <glob weight="60" pattern="*.py"/> + <glob weight="60" pattern="*.pyx"/> + <glob weight="60" pattern="*.wsgi"/> </mime-type> <mime-type type="text/x-lua"> <comment>Lua script</comment> @@ -34821,7 +35882,7 @@ <comment xml:lang="be@latin">Skrypt Lua</comment> <comment xml:lang="bg">Скрипт на Lua</comment> <comment xml:lang="ca">script Lua</comment> - <comment xml:lang="cs">skript Lua</comment> + <comment xml:lang="cs">skript v jazyce Lua</comment> <comment xml:lang="da">Luaprogram</comment> <comment xml:lang="de">Lua-Skript</comment> <comment xml:lang="el">Δέσμη ενεργειών Lua</comment> @@ -34853,7 +35914,7 @@ <comment xml:lang="pt">script Lua</comment> <comment xml:lang="pt_BR">Script Lua</comment> <comment xml:lang="ro">Script Lua</comment> - <comment xml:lang="ru">сценарий Lua</comment> + <comment xml:lang="ru">Сценарий Lua</comment> <comment xml:lang="sk">Skript Lua</comment> <comment xml:lang="sl">Skriptna datoteka Lua</comment> <comment xml:lang="sq">Script Lua</comment> @@ -34877,6 +35938,7 @@ <mime-type type="text/x-readme"> <comment>README document</comment> <comment xml:lang="ar">مستند README</comment> + <comment xml:lang="ast">Documentu LLEIME</comment> <comment xml:lang="az">README sənədi</comment> <comment xml:lang="be@latin">Dakument README</comment> <comment xml:lang="bg">Документ — „Да се прочете“</comment> @@ -34915,7 +35977,7 @@ <comment xml:lang="pt">documento LEIA-ME</comment> <comment xml:lang="pt_BR">Documento README</comment> <comment xml:lang="ro">Document README</comment> - <comment xml:lang="ru">документ README</comment> + <comment xml:lang="ru">Документ README</comment> <comment xml:lang="sk">Dokument README</comment> <comment xml:lang="sl">Dokument README</comment> <comment xml:lang="sq">Dokument README</comment> @@ -34932,6 +35994,7 @@ <mime-type type="text/x-nfo"> <comment>NFO document</comment> <comment xml:lang="ar">مستند NFO</comment> + <comment xml:lang="ast">Documentu NFO</comment> <comment xml:lang="be@latin">Dakument NFO</comment> <comment xml:lang="bg">Документ — NFO</comment> <comment xml:lang="ca">document NFO</comment> @@ -34967,7 +36030,7 @@ <comment xml:lang="pt">documento NFO</comment> <comment xml:lang="pt_BR">Documento NFO</comment> <comment xml:lang="ro">Document NFO</comment> - <comment xml:lang="ru">документ NFO</comment> + <comment xml:lang="ru">Документ NFO</comment> <comment xml:lang="sk">Dokument NFO</comment> <comment xml:lang="sl">Dokument NFO</comment> <comment xml:lang="sq">Dokument NFO</comment> @@ -35018,7 +36081,7 @@ <comment xml:lang="pt">ficheiro de especificações RPM</comment> <comment xml:lang="pt_BR">Arquivo de especificação RPM</comment> <comment xml:lang="ro">Fișier RPM spec</comment> - <comment xml:lang="ru">файл описания RPM</comment> + <comment xml:lang="ru">Файл описания RPM</comment> <comment xml:lang="sk">Súbor RPM spec</comment> <comment xml:lang="sl">Določilna datoteka RPM</comment> <comment xml:lang="sq">File specifikimi RPM</comment> @@ -35041,18 +36104,27 @@ <mime-type type="text/x-sass"> <comment>Sass CSS pre-processor file</comment> <comment xml:lang="ca">fitxer preprocessador CSS Sass</comment> + <comment xml:lang="cs">soubor preprocesoru Sass CSS</comment> <comment xml:lang="da">Sass CSS-forbrænderfil</comment> <comment xml:lang="de">Sass-CSS-Präprozessordatei</comment> + <comment xml:lang="en_GB">Sass CSS pre-processor file</comment> <comment xml:lang="es">archivo de preprocesador de CSS Sass</comment> <comment xml:lang="fr">fichier de prétraitement CSS Sass</comment> + <comment xml:lang="ga">comhad réamhphróiseálaí CSS Sass</comment> <comment xml:lang="he">קובץ קדם עיבוד Sass CSS</comment> + <comment xml:lang="hr">Sass CSS datoteka predobrade</comment> <comment xml:lang="hu">Sass CSS előfeldolgozó fájl</comment> + <comment xml:lang="id">berkas pre-processor Sass CSS</comment> + <comment xml:lang="it">File CSS Sass</comment> <comment xml:lang="kk">Sass CSS препроцессор файлы</comment> <comment xml:lang="ko">Sass CSS 전처리기 파일</comment> <comment xml:lang="pl">Plik preprocesora CSS Sass</comment> <comment xml:lang="pt_BR">Arquivo de pré-processamento Sass CSS</comment> - <comment xml:lang="ru">файл препроцессора Sass CSS</comment> + <comment xml:lang="ru">Файл препроцессора Sass CSS</comment> <comment xml:lang="sk">Súbor Sass CSS pre-procesora</comment> + <comment xml:lang="sr">датотека Сас ЦСС пре-процесора</comment> + <comment xml:lang="sv">Sass CSS-preprocessorfil</comment> + <comment xml:lang="tr">Sass CSS önişlemci dosyası</comment> <comment xml:lang="uk">файл препроцесора CSS Sass</comment> <comment xml:lang="zh_CN">Sass CSS 预处理器文件</comment> <comment xml:lang="zh_TW">Sass CSS 處理器前檔案</comment> @@ -35073,9 +36145,10 @@ <comment xml:lang="eu">Scala iturburu-kodea</comment> <comment xml:lang="fi">Scala-lähdekoodi</comment> <comment xml:lang="fr">code source Scala</comment> + <comment xml:lang="ga">cód foinseach Scala</comment> <comment xml:lang="gl">código fnote en Scala</comment> <comment xml:lang="he">קוד מקור של Scala</comment> - <comment xml:lang="hr">Scala izvorni kod</comment> + <comment xml:lang="hr">Scala izvorni kôd</comment> <comment xml:lang="hu">Scala forráskód</comment> <comment xml:lang="ia">Codice-fonte Scala</comment> <comment xml:lang="id">Kode sumber Scala</comment> @@ -35090,7 +36163,7 @@ <comment xml:lang="pl">Kod źródłowy Scala</comment> <comment xml:lang="pt">código origem Scala</comment> <comment xml:lang="pt_BR">Código-fonte Scala</comment> - <comment xml:lang="ru">исходный код Scala</comment> + <comment xml:lang="ru">Исходный код Scala</comment> <comment xml:lang="sk">Zdrojový kód Scala</comment> <comment xml:lang="sl">Izvorna koda Scala</comment> <comment xml:lang="sr">Скала изворни ко̂д</comment> @@ -35124,7 +36197,7 @@ <comment xml:lang="ga">cód foinseach Scheme</comment> <comment xml:lang="gl">código fonte en Scheme</comment> <comment xml:lang="he">קוד מקור של Scheme</comment> - <comment xml:lang="hr">Scheme izvorni kod</comment> + <comment xml:lang="hr">Scheme izvorni kôd</comment> <comment xml:lang="hu">Scheme-forráskód</comment> <comment xml:lang="ia">Codice-fonte Scheme</comment> <comment xml:lang="id">Kode program Scheme</comment> @@ -35143,7 +36216,7 @@ <comment xml:lang="pt">código origem Scheme</comment> <comment xml:lang="pt_BR">Código-fonte Scheme</comment> <comment xml:lang="ro">Cod sursă Scheme</comment> - <comment xml:lang="ru">исходный код Scheme</comment> + <comment xml:lang="ru">Исходный код Scheme</comment> <comment xml:lang="sk">Zdrojový kód Scheme</comment> <comment xml:lang="sl">Datoteka izvorne kode Scheme</comment> <comment xml:lang="sq">Kod burues Scheme</comment> @@ -35161,18 +36234,27 @@ <mime-type type="text/x-scss"> <comment>Sass CSS pre-processor file</comment> <comment xml:lang="ca">fitxer preprocessador CSS Sass</comment> + <comment xml:lang="cs">soubor preprocesoru Sass CSS</comment> <comment xml:lang="da">Sass CSS-forbrænderfil</comment> <comment xml:lang="de">Sass-CSS-Präprozessordatei</comment> + <comment xml:lang="en_GB">Sass CSS pre-processor file</comment> <comment xml:lang="es">archivo de preprocesador de CSS Sass</comment> <comment xml:lang="fr">fichier de prétraitement CSS Sass</comment> + <comment xml:lang="ga">comhad réamhphróiseálaí CSS Sass</comment> <comment xml:lang="he">קובץ קדם עיבוד Sass CSS</comment> + <comment xml:lang="hr">Sass CSS datoteka predobrade</comment> <comment xml:lang="hu">Sass CSS előfeldolgozó fájl</comment> + <comment xml:lang="id">berkas pre-processor Sass CSS</comment> + <comment xml:lang="it">File CSS Sass</comment> <comment xml:lang="kk">Sass CSS препроцессор файлы</comment> <comment xml:lang="ko">Sass CSS 전처리기 파일</comment> <comment xml:lang="pl">Plik preprocesora CSS Sass</comment> <comment xml:lang="pt_BR">Arquivo de pré-processamento Sass CSS</comment> - <comment xml:lang="ru">файл препроцессора Sass CSS</comment> + <comment xml:lang="ru">Файл препроцессора Sass CSS</comment> <comment xml:lang="sk">Súbor Sass CSS pre-procesora</comment> + <comment xml:lang="sr">датотека Сас ЦСС пре-процесора</comment> + <comment xml:lang="sv">Sass CSS-preprocessorfil</comment> + <comment xml:lang="tr">Sass CSS önişlemci dosyası</comment> <comment xml:lang="uk">файл препроцесора CSS Sass</comment> <comment xml:lang="zh_CN">Sass CSS 预处理器文件</comment> <comment xml:lang="zh_TW">Sass CSS 處理器前檔案</comment> @@ -35183,6 +36265,7 @@ <mime-type type="text/x-setext"> <comment>Setext document</comment> <comment xml:lang="ar">مستند Setext</comment> + <comment xml:lang="ast">Documentu Setext</comment> <comment xml:lang="az">Setext sənədi</comment> <comment xml:lang="be@latin">Dakument Setext</comment> <comment xml:lang="bg">Документ — Setext</comment> @@ -35221,7 +36304,7 @@ <comment xml:lang="pt">documento Setext</comment> <comment xml:lang="pt_BR">Documento Setext</comment> <comment xml:lang="ro">Document Setext</comment> - <comment xml:lang="ru">документ Setext</comment> + <comment xml:lang="ru">Документ Setext</comment> <comment xml:lang="sk">Dokument Setext</comment> <comment xml:lang="sl">Dokument Setext</comment> <comment xml:lang="sq">Dokument Setext</comment> @@ -35257,7 +36340,7 @@ <comment xml:lang="ga">cód SQL</comment> <comment xml:lang="gl">código SQL</comment> <comment xml:lang="he">קוד SQL</comment> - <comment xml:lang="hr">SQL kod</comment> + <comment xml:lang="hr">SQL kôd</comment> <comment xml:lang="hu">SQL-kód</comment> <comment xml:lang="ia">Codice SQL</comment> <comment xml:lang="id">Kode SQL</comment> @@ -35276,7 +36359,7 @@ <comment xml:lang="pt">código SQL</comment> <comment xml:lang="pt_BR">Código SQL</comment> <comment xml:lang="ro">Cod SQL</comment> - <comment xml:lang="ru">код SQL</comment> + <comment xml:lang="ru">Код SQL</comment> <comment xml:lang="sk">Kód SQL</comment> <comment xml:lang="sl">Datoteka kode SQL</comment> <comment xml:lang="sq">Kod SQL</comment> @@ -35330,7 +36413,7 @@ <comment xml:lang="pt">script Tcl</comment> <comment xml:lang="pt_BR">Script Tcl</comment> <comment xml:lang="ro">Script Tcl</comment> - <comment xml:lang="ru">сценарий Tcl</comment> + <comment xml:lang="ru">Сценарий Tcl</comment> <comment xml:lang="sk">Skript Tcl</comment> <comment xml:lang="sl">Skriptna datoteka Tcl</comment> <comment xml:lang="sq">Script Tcl</comment> @@ -35348,6 +36431,7 @@ <mime-type type="text/x-tex"> <comment>TeX document</comment> <comment xml:lang="ar">مستند TeX</comment> + <comment xml:lang="ast">Documentu TeX</comment> <comment xml:lang="be@latin">Dakument TeX</comment> <comment xml:lang="bg">Документ — TeX</comment> <comment xml:lang="ca">document TeX</comment> @@ -35385,7 +36469,7 @@ <comment xml:lang="pt">documento TeX</comment> <comment xml:lang="pt_BR">Documento TeX</comment> <comment xml:lang="ro">Document TeX</comment> - <comment xml:lang="ru">документ TeX</comment> + <comment xml:lang="ru">Документ TeX</comment> <comment xml:lang="sk">Dokument TeX</comment> <comment xml:lang="sl">Dokument TeX</comment> <comment xml:lang="sq">Dokument TeX</comment> @@ -35415,6 +36499,7 @@ <mime-type type="text/x-texinfo"> <comment>TeXInfo document</comment> <comment xml:lang="ar">مستند TeXInfo</comment> + <comment xml:lang="ast">Documentu TeXInfo</comment> <comment xml:lang="az">TeXInfo sənədi</comment> <comment xml:lang="be@latin">Dakument TeXInfo</comment> <comment xml:lang="bg">Документ — TeXInfo</comment> @@ -35453,7 +36538,7 @@ <comment xml:lang="pt">documento TeXInfo</comment> <comment xml:lang="pt_BR">Documento TeXInfo</comment> <comment xml:lang="ro">Document TexInfo</comment> - <comment xml:lang="ru">документ TeXInfo</comment> + <comment xml:lang="ru">Документ TeXInfo</comment> <comment xml:lang="sk">Dokument TeXInfo</comment> <comment xml:lang="sl">Dokument TeXInfo</comment> <comment xml:lang="sq">Dokument TeXInfo</comment> @@ -35471,6 +36556,7 @@ <mime-type type="text/x-troff-me"> <comment>Troff ME input document</comment> <comment xml:lang="ar">مستند Troff ME input</comment> + <comment xml:lang="ast">Documentu d'entrada de Troff ME</comment> <comment xml:lang="be@latin">Uvodny dakument Troff ME</comment> <comment xml:lang="bg">Изходен документ — Troff ME</comment> <comment xml:lang="ca">document d'entrada Troff ME</comment> @@ -35485,7 +36571,7 @@ <comment xml:lang="fi">Troff ME -syöteasiakirja</comment> <comment xml:lang="fo">Troff ME inntaksskjal</comment> <comment xml:lang="fr">document d'entrée Troff ME</comment> - <comment xml:lang="ga">cáipéis ionchur Troff ME</comment> + <comment xml:lang="ga">cáipéis ionchurtha Troff ME</comment> <comment xml:lang="gl">documento de entrada Troff ME</comment> <comment xml:lang="he">מסמך קלט של Troff ME</comment> <comment xml:lang="hr">Troff ME ulazni dokument</comment> @@ -35507,7 +36593,7 @@ <comment xml:lang="pt">documento origem Troff ME</comment> <comment xml:lang="pt_BR">Documento de entrada Troff ME</comment> <comment xml:lang="ro">Document intrare Troff ME</comment> - <comment xml:lang="ru">входной документ Troff ME</comment> + <comment xml:lang="ru">Входной документ Troff ME</comment> <comment xml:lang="sk">Vstupný dokument Troff ME</comment> <comment xml:lang="sl">Vnosni dokument Troff ME</comment> <comment xml:lang="sq">Dokument i input Troff ME</comment> @@ -35524,6 +36610,7 @@ <mime-type type="text/x-troff-mm"> <comment>Troff MM input document</comment> <comment xml:lang="ar">مستند Troff MM input</comment> + <comment xml:lang="ast">Documentu d'entrada de Troff MM</comment> <comment xml:lang="be@latin">Uvodny dakument Troff MM</comment> <comment xml:lang="bg">Изходен документ — Troff MM</comment> <comment xml:lang="ca">document d'entrada Troff MM</comment> @@ -35538,7 +36625,7 @@ <comment xml:lang="fi">Troff MM -syöteasiakirja</comment> <comment xml:lang="fo">Troff MM inntaksskjal</comment> <comment xml:lang="fr">document d'entrée Troff MM</comment> - <comment xml:lang="ga">cáipéis ionchur Troff MM</comment> + <comment xml:lang="ga">cáipéis ionchurtha Troff MM</comment> <comment xml:lang="gl">documento de entrada Troff MM</comment> <comment xml:lang="he">מסמך קלט של Troff MM</comment> <comment xml:lang="hr">Troff MM ulazni dokument</comment> @@ -35560,7 +36647,7 @@ <comment xml:lang="pt">documento origem Troff MM</comment> <comment xml:lang="pt_BR">Documento de entrada Troff MM</comment> <comment xml:lang="ro">Document intrare Troff MM</comment> - <comment xml:lang="ru">входной документ Troff MM</comment> + <comment xml:lang="ru">Входной документ Troff MM</comment> <comment xml:lang="sk">Vstupný dokument Troff MM</comment> <comment xml:lang="sl">Vnosni dokument Troff MM</comment> <comment xml:lang="sq">Dokument i input Troff MM</comment> @@ -35577,6 +36664,7 @@ <mime-type type="text/x-troff-ms"> <comment>Troff MS input document</comment> <comment xml:lang="ar">مستند Troff MS input</comment> + <comment xml:lang="ast">Documentu d'entrada de Troff MS</comment> <comment xml:lang="be@latin">Uvodny dakument Troff MS</comment> <comment xml:lang="bg">Изходен документ — Troff MS</comment> <comment xml:lang="ca">document d'entrada Troff MS</comment> @@ -35591,7 +36679,7 @@ <comment xml:lang="fi">Troff MS -syöteasiakirja</comment> <comment xml:lang="fo">Troff MS inntaksskjal</comment> <comment xml:lang="fr">document d'entrée Troff MS</comment> - <comment xml:lang="ga">cáipéis ionchur Troff MS</comment> + <comment xml:lang="ga">cáipéis ionchurtha Troff MS</comment> <comment xml:lang="gl">documento de entrada Troff MS</comment> <comment xml:lang="he">מסמך קלט של Troff MS</comment> <comment xml:lang="hr">Troff MS ulazni dokument</comment> @@ -35613,7 +36701,7 @@ <comment xml:lang="pt">documento origem Troff MS</comment> <comment xml:lang="pt_BR">Documento de entrada Troff MS</comment> <comment xml:lang="ro">Document intrare Troff MS</comment> - <comment xml:lang="ru">входной документ Troff MS</comment> + <comment xml:lang="ru">Входной документ Troff MS</comment> <comment xml:lang="sk">Vstupný dokument Troff MS</comment> <comment xml:lang="sl">Vnosni dokument Troff MS</comment> <comment xml:lang="sq">Dokument i input Troff MS</comment> @@ -35630,18 +36718,28 @@ <mime-type type="text/x-twig"> <comment>Twig template</comment> <comment xml:lang="ca">plantilla Twig</comment> + <comment xml:lang="cs">šablona Twig</comment> <comment xml:lang="da">Twig-skabelon</comment> <comment xml:lang="de">Twig-Vorlage</comment> + <comment xml:lang="en_GB">Twig template</comment> <comment xml:lang="es">plantilla de Twig</comment> + <comment xml:lang="eu">Twig txantiloia</comment> <comment xml:lang="fr">modèle Twig</comment> + <comment xml:lang="ga">teimpléad Twig</comment> <comment xml:lang="he">תבנית Twig</comment> + <comment xml:lang="hr">Twig predložak</comment> <comment xml:lang="hu">Twig-sablon</comment> + <comment xml:lang="id">templat Twig</comment> + <comment xml:lang="it">Modello twig</comment> <comment xml:lang="kk">Twig үлгісі</comment> <comment xml:lang="ko">Twig 문서 서식</comment> <comment xml:lang="pl">Szablon Twig</comment> <comment xml:lang="pt_BR">Modelo Twig</comment> - <comment xml:lang="ru">шаблон Twig</comment> + <comment xml:lang="ru">Шаблон Twig</comment> <comment xml:lang="sk">Šablóna Twig</comment> + <comment xml:lang="sr">Твиг шаблон</comment> + <comment xml:lang="sv">Twig-mall</comment> + <comment xml:lang="tr">Twig şablonu</comment> <comment xml:lang="uk">шаблон twig</comment> <comment xml:lang="zh_CN">Twig 模板</comment> <comment xml:lang="zh_TW">Twig 範本</comment> @@ -35687,7 +36785,7 @@ <comment xml:lang="pt">tabela UIL do X-Motif</comment> <comment xml:lang="pt_BR">Tabela UIL do X-Motif</comment> <comment xml:lang="ro">Tabel X-Motif UIL</comment> - <comment xml:lang="ru">таблица UIL X-Motif</comment> + <comment xml:lang="ru">Таблица UIL X-Motif</comment> <comment xml:lang="sk">Tabuľka X-Motif UIL</comment> <comment xml:lang="sl">Preglednica X-Motif UIL</comment> <comment xml:lang="sq">Tabelë X-Motif UIL</comment> @@ -35721,7 +36819,7 @@ <comment xml:lang="ga">suíomh acmhainne</comment> <comment xml:lang="gl">localización do recurso</comment> <comment xml:lang="he">מיקום של משאב</comment> - <comment xml:lang="hr">položaj resursa</comment> + <comment xml:lang="hr">Lokacija resursa</comment> <comment xml:lang="hu">erőforrás-hely</comment> <comment xml:lang="ia">Loco de ressources</comment> <comment xml:lang="id">lokasi sumber daya</comment> @@ -35740,7 +36838,7 @@ <comment xml:lang="pt">localização de recurso</comment> <comment xml:lang="pt_BR">Localização de recurso</comment> <comment xml:lang="ro">locație de resursă</comment> - <comment xml:lang="ru">расположение ресурса</comment> + <comment xml:lang="ru">Расположение ресурса</comment> <comment xml:lang="sk">Umiestnenie zdroja</comment> <comment xml:lang="sl">mesto vira</comment> <comment xml:lang="sq">Pozicion rezerve</comment> @@ -35765,6 +36863,7 @@ <comment xml:lang="es">archivo codificado con uuencode</comment> <comment xml:lang="eu">uuencode-aturiko fitxategia</comment> <comment xml:lang="fr">fichier uuencodé</comment> + <comment xml:lang="ga">comhad uuencoded</comment> <comment xml:lang="gl">Ficheiro uuencoded</comment> <comment xml:lang="he">קובץ בקידוד uu</comment> <comment xml:lang="hr">uuencoded datoteka</comment> @@ -35780,14 +36879,14 @@ <comment xml:lang="pl">Plik zakodowany za pomocą uuencode</comment> <comment xml:lang="pt">ficheiro uuencoded</comment> <comment xml:lang="pt_BR">Arquivo codificado UUE</comment> - <comment xml:lang="ru">файл в кодировке uuencode</comment> + <comment xml:lang="ru">Файл, кодированный uuencode</comment> <comment xml:lang="sk">Súbor v kódovaní uuencode</comment> <comment xml:lang="sl">Datoteka uuencode</comment> <comment xml:lang="sr">уукодирана датотека</comment> <comment xml:lang="sv">uuencode-fil</comment> <comment xml:lang="tr">uuencoded dosyası</comment> <comment xml:lang="uk">файл даних у форматі UUE</comment> - <comment xml:lang="zh_CN">未编码的文件</comment> + <comment xml:lang="zh_CN">Uuencode 文件</comment> <comment xml:lang="zh_TW">uuencoded 檔</comment> <sub-class-of type="text/plain"/> <glob pattern="*.uue"/> @@ -35834,7 +36933,7 @@ <comment xml:lang="pt">ficheiro XMI</comment> <comment xml:lang="pt_BR">Arquivo XMI</comment> <comment xml:lang="ro">Fișier XMI</comment> - <comment xml:lang="ru">файл XMI</comment> + <comment xml:lang="ru">Файл XMI</comment> <comment xml:lang="sk">Súbor XMI</comment> <comment xml:lang="sl">Datoteka XMI</comment> <comment xml:lang="sq">File XMI</comment> @@ -35890,7 +36989,7 @@ <comment xml:lang="pt">ficheiro XSL FO</comment> <comment xml:lang="pt_BR">Arquivo XSL FO</comment> <comment xml:lang="ro">Fișier XSL FO</comment> - <comment xml:lang="ru">файл XSL FO</comment> + <comment xml:lang="ru">Файл XSL FO</comment> <comment xml:lang="sk">Súbor XSL FO</comment> <comment xml:lang="sl">Datoteka XSL FO</comment> <comment xml:lang="sq">File XSL FO</comment> @@ -35911,6 +37010,7 @@ <mime-type type="text/x-iptables"> <comment>iptables configuration file</comment> <comment xml:lang="ar">ملف تضبيط iptables</comment> + <comment xml:lang="ast">ficheru de configuración d'iptables</comment> <comment xml:lang="be@latin">kanfihuracyjny fajł iptables</comment> <comment xml:lang="bg">Настройки за iptables</comment> <comment xml:lang="ca">fitxer de configuració d'iptables</comment> @@ -35927,7 +37027,7 @@ <comment xml:lang="ga">comhad cumraíochta iptables</comment> <comment xml:lang="gl">ficheiro de configuración de iptables</comment> <comment xml:lang="he">קובץ הגדרה של iptables</comment> - <comment xml:lang="hr">iptables datoteka s postavkama</comment> + <comment xml:lang="hr">iptables datoteka podešavanja</comment> <comment xml:lang="hu">iptables beállítófájl</comment> <comment xml:lang="ia">File de configuration IPTables</comment> <comment xml:lang="id">berkas konfigurasi iptables</comment> @@ -35945,7 +37045,7 @@ <comment xml:lang="pt">ficheiro de configuração iptables</comment> <comment xml:lang="pt_BR">Arquivo de configuração do iptables</comment> <comment xml:lang="ro">fișier configurare iptables</comment> - <comment xml:lang="ru">файл настроек iptables</comment> + <comment xml:lang="ru">Файл настроек iptables</comment> <comment xml:lang="sk">Súbor nastavení iptables</comment> <comment xml:lang="sl">nastavitvena datoteka iptables</comment> <comment xml:lang="sq">File konfigurimi iptables</comment> @@ -35979,6 +37079,110 @@ </magic> <glob pattern="*.iptables"/> </mime-type> + <mime-type type="text/x-dbus-service"> + <comment>D-Bus service file</comment> + <comment xml:lang="ca">fitxer de servei de D-Bus</comment> + <comment xml:lang="cs">soubor služby D-Bus</comment> + <comment xml:lang="de">D-Bus-Dienstdatei</comment> + <comment xml:lang="en_GB">D-Bus service file</comment> + <comment xml:lang="es">archivo de servicio de D-Bus</comment> + <comment xml:lang="eu">D-Bus zerbitzu fitxategia</comment> + <comment xml:lang="fi">D-Bus-palvelutiedosto</comment> + <comment xml:lang="fr">fichier de service D-Bus</comment> + <comment xml:lang="ga">comhad seirbhíse D-Bus</comment> + <comment xml:lang="hr">Datoteka D-Bus usluge</comment> + <comment xml:lang="hu">D-Bus szolgáltatás fájl</comment> + <comment xml:lang="id">berkas layanan D-Bus</comment> + <comment xml:lang="it">File servizio D-Bus</comment> + <comment xml:lang="kk">D-Bus қызметтік файлы</comment> + <comment xml:lang="ko">D-Bus 서비스 파일</comment> + <comment xml:lang="pl">Plik usługi D-Bus</comment> + <comment xml:lang="pt_BR">Arquivo de serviço do D-Bus</comment> + <comment xml:lang="ru">Файл службы D-Bus</comment> + <comment xml:lang="sk">Súbor služby D-Bus</comment> + <comment xml:lang="sr">датотека услуге Д-сабирнице</comment> + <comment xml:lang="sv">D-BUS-tjänstfil</comment> + <comment xml:lang="tr">D-Bus hizmeti dosyası</comment> + <comment xml:lang="uk">файл служби D-Bus</comment> + <comment xml:lang="zh_CN">D-Bus 服务文件</comment> + <comment xml:lang="zh_TW">D-Bus 服務檔</comment> + <sub-class-of type="text/plain"/> + <magic priority="50"> + <match value="\n[D-BUS Service]\n" type="string" offset="0:256"/> + <match value="[D-BUS Service]\n" type="string" offset="0"/> + </magic> + <glob pattern="*.service"/> + </mime-type> + <mime-type type="text/x-systemd-unit"> + <comment>systemd unit file</comment> + <comment xml:lang="ast">ficheru d'unidaes de systemd</comment> + <comment xml:lang="ca">fitxer d'unitat de systemd</comment> + <comment xml:lang="cs">jednotkový soubor systemd</comment> + <comment xml:lang="de">systemd-Einheitsdatei</comment> + <comment xml:lang="en_GB">systemd unit file</comment> + <comment xml:lang="es">archivo de unidad de systemd</comment> + <comment xml:lang="eu">systemd unitate fitxategia</comment> + <comment xml:lang="fi">systemd-yksikkötiedosto</comment> + <comment xml:lang="fr">fichier d'unité systemd</comment> + <comment xml:lang="ga">comhad aonaid systemd</comment> + <comment xml:lang="hr">Datoteka systemd jedinice</comment> + <comment xml:lang="hu">systemd egység fájl</comment> + <comment xml:lang="id">berkas unit systemd</comment> + <comment xml:lang="it">File unità systemd</comment> + <comment xml:lang="kk">systemd юнит файлы</comment> + <comment xml:lang="ko">systemd 유닛 파일</comment> + <comment xml:lang="pl">Plik jednostki systemd</comment> + <comment xml:lang="pt_BR">Arquivo de unit do systemd</comment> + <comment xml:lang="ru">Модульный файл Systemd</comment> + <comment xml:lang="sk">Súbor jednotky systemd</comment> + <comment xml:lang="sr">датотека јединице системд-а</comment> + <comment xml:lang="sv">systemd-enhetsfil</comment> + <comment xml:lang="tr">systemd birim dosyası</comment> + <comment xml:lang="uk">файл модуля systemd</comment> + <comment xml:lang="zh_CN">systemd 单元文件</comment> + <comment xml:lang="zh_TW">systemd 單位檔</comment> + <sub-class-of type="text/plain"/> + <magic priority="50"> + + <match value="\n[Unit]\n" type="string" offset="0:256"/> + <match value="\n[Install]\n" type="string" offset="0:256"/> + <match value="\n[Automount]\n" type="string" offset="0:256"/> + + <match value="\n[Mount]\n" type="string" offset="0:256"/> + <match value="\n[Path]\n" type="string" offset="0:256"/> + <match value="\n[Scope]\n" type="string" offset="0:256"/> + <match value="\n[Service]\n" type="string" offset="0:256"/> + <match value="\n[Slice]\n" type="string" offset="0:256"/> + <match value="\n[Socket]\n" type="string" offset="0:256"/> + <match value="\n[Swap]\n" type="string" offset="0:256"/> + + <match value="\n[Timer]\n" type="string" offset="0:256"/> + + + <match value="[Unit]\n" type="string" offset="0"/> + <match value="[Install]\n" type="string" offset="0"/> + <match value="[Automount]\n" type="string" offset="0"/> + <match value="[Mount]\n" type="string" offset="0"/> + <match value="[Path]\n" type="string" offset="0"/> + <match value="[Scope]\n" type="string" offset="0"/> + <match value="[Service]\n" type="string" offset="0"/> + <match value="[Slice]\n" type="string" offset="0"/> + <match value="[Socket]\n" type="string" offset="0"/> + <match value="[Swap]\n" type="string" offset="0"/> + <match value="[Timer]\n" type="string" offset="0"/> + </magic> + <glob pattern="*.automount"/> + <glob pattern="*.device"/> + <glob pattern="*.mount"/> + <glob pattern="*.path"/> + <glob pattern="*.scope"/> + <glob pattern="*.service"/> + <glob pattern="*.slice"/> + <glob pattern="*.socket"/> + <glob pattern="*.swap"/> + <glob pattern="*.target"/> + <glob pattern="*.timer"/> + </mime-type> <mime-type type="application/xslt+xml"> <comment>XSLT stylesheet</comment> <comment xml:lang="ar">نمط XSLT</comment> @@ -36018,7 +37222,7 @@ <comment xml:lang="pt">folha de estilos XSLT</comment> <comment xml:lang="pt_BR">Folha de estilo XSLT</comment> <comment xml:lang="ro">Fișă de stil XSLT</comment> - <comment xml:lang="ru">таблица стилей XSLT</comment> + <comment xml:lang="ru">Таблица стилей XSLT</comment> <comment xml:lang="sk">Štýl XSLT</comment> <comment xml:lang="sl">Slogovna predloga XSLT</comment> <comment xml:lang="sq">Fletë stili XSLT</comment> @@ -36077,7 +37281,7 @@ <comment xml:lang="pt">base de dados XMCD CD</comment> <comment xml:lang="pt_BR">Banco de dados de CD XMCD</comment> <comment xml:lang="ro">Bază de date XMCD CD</comment> - <comment xml:lang="ru">база данных компакт-дисков XMCD</comment> + <comment xml:lang="ru">База данных компакт-дисков XMCD</comment> <comment xml:lang="sk">Databáza XMCD CD</comment> <comment xml:lang="sl">Podatkovna zbirka XMCD CD</comment> <comment xml:lang="sq">Bazë me të dhëna XMCD CD</comment> @@ -36096,6 +37300,7 @@ <mime-type type="application/xml"> <comment>XML document</comment> <comment xml:lang="ar">مستند XML</comment> + <comment xml:lang="ast">Documentu XML</comment> <comment xml:lang="be@latin">Dakument XML</comment> <comment xml:lang="bg">Документ — XML</comment> <comment xml:lang="ca">document XML</comment> @@ -36131,7 +37336,7 @@ <comment xml:lang="pt">documento XML</comment> <comment xml:lang="pt_BR">Documento XML</comment> <comment xml:lang="ro">Document XML</comment> - <comment xml:lang="ru">документ XML</comment> + <comment xml:lang="ru">Документ XML</comment> <comment xml:lang="sk">Dokument XML</comment> <comment xml:lang="sl">Dokument XML</comment> <comment xml:lang="sq">Dokument XML</comment> @@ -36159,6 +37364,7 @@ <mime-type type="application/xml-external-parsed-entity"> <comment>XML entities document</comment> <comment xml:lang="ar">مستند كيانات XML</comment> + <comment xml:lang="ast">Documentu d'entidaes XML</comment> <comment xml:lang="be@latin">Dakument elementaŭ XML</comment> <comment xml:lang="bg">Документ — заместващи последователности в XML</comment> <comment xml:lang="ca">document d'entitats XML</comment> @@ -36193,7 +37399,7 @@ <comment xml:lang="pt">documento de entidades XML</comment> <comment xml:lang="pt_BR">Documento de entidades XML</comment> <comment xml:lang="ro">Document entități XML</comment> - <comment xml:lang="ru">файл сущностей XML</comment> + <comment xml:lang="ru">Файл сущностей XML</comment> <comment xml:lang="sk">Dokument entít XML</comment> <comment xml:lang="sl">Dokument XML določil</comment> <comment xml:lang="sq">Dokument njësish XML</comment> @@ -36214,6 +37420,7 @@ <mime-type type="video/dv"> <comment>DV video</comment> <comment xml:lang="ar">DV مرئي</comment> + <comment xml:lang="ast">Videu en DV</comment> <comment xml:lang="be@latin">Videa DV</comment> <comment xml:lang="bg">Видео — DV</comment> <comment xml:lang="ca">vídeo DV</comment> @@ -36231,7 +37438,7 @@ <comment xml:lang="ga">físeán DV</comment> <comment xml:lang="gl">vídeo DV</comment> <comment xml:lang="he">וידאו DV</comment> - <comment xml:lang="hr">DV video</comment> + <comment xml:lang="hr">DV video snimka</comment> <comment xml:lang="hu">DV videó</comment> <comment xml:lang="ia">Video DV</comment> <comment xml:lang="id">Video DV</comment> @@ -36250,7 +37457,7 @@ <comment xml:lang="pt">vídeo DV</comment> <comment xml:lang="pt_BR">Vídeo DV</comment> <comment xml:lang="ro">Video DV</comment> - <comment xml:lang="ru">видео DV</comment> + <comment xml:lang="ru">Видео DV</comment> <comment xml:lang="sk">Video DV</comment> <comment xml:lang="sl">Video datoteka DV</comment> <comment xml:lang="sq">Video DV</comment> @@ -36271,6 +37478,7 @@ <mime-type type="video/isivideo"> <comment>ISI video</comment> <comment xml:lang="ar">مرئي ISI</comment> + <comment xml:lang="ast">Videu n'ISI</comment> <comment xml:lang="az">ISI video faylı</comment> <comment xml:lang="be@latin">Videa ISI</comment> <comment xml:lang="bg">Видео — ISI</comment> @@ -36290,7 +37498,7 @@ <comment xml:lang="ga">físeán ISI</comment> <comment xml:lang="gl">vídeo ISI</comment> <comment xml:lang="he">וידאו ISI</comment> - <comment xml:lang="hr">ISI video</comment> + <comment xml:lang="hr">ISI video snimka</comment> <comment xml:lang="hu">ISI-videó</comment> <comment xml:lang="ia">Video ISI</comment> <comment xml:lang="id">Video ISI</comment> @@ -36309,7 +37517,7 @@ <comment xml:lang="pt">vídeo ISI</comment> <comment xml:lang="pt_BR">Vídeo ISI</comment> <comment xml:lang="ro">Video ISI</comment> - <comment xml:lang="ru">видео ISI</comment> + <comment xml:lang="ru">Видео ISI</comment> <comment xml:lang="sk">Video ISI</comment> <comment xml:lang="sl">Video datoteka ISI</comment> <comment xml:lang="sq">Video ISI</comment> @@ -36336,10 +37544,10 @@ <comment xml:lang="fi">MPEG-2 -siirtobittivirta</comment> <comment xml:lang="fo">MPEG-2 flutningsstreymur</comment> <comment xml:lang="fr">flux de transport MPEG-2</comment> - <comment xml:lang="ga">Sruth aistrithe MPEG-2</comment> + <comment xml:lang="ga">sruth aistrithe MPEG-2</comment> <comment xml:lang="gl">fluxo de transporte MPEG-2</comment> <comment xml:lang="he">העברת זרימה של MPEG-2</comment> - <comment xml:lang="hr">MPEG-2 transportni tok</comment> + <comment xml:lang="hr">MPEG-2 transportno strujanje</comment> <comment xml:lang="hu">MPEG-2 átviteli adatfolyam</comment> <comment xml:lang="ia">Fluxo de transporto MPEG-2</comment> <comment xml:lang="id">Stream transport MPEG-2</comment> @@ -36356,7 +37564,7 @@ <comment xml:lang="pt">fluxo de transporte MPEG-2</comment> <comment xml:lang="pt_BR">Fluxo de transporte de MPEG-2</comment> <comment xml:lang="ro">Flux transport MPEG-2</comment> - <comment xml:lang="ru">транспортный поток MPEG-2</comment> + <comment xml:lang="ru">Транспортный поток MPEG-2</comment> <comment xml:lang="sk">MPEG-2 Transport Stream</comment> <comment xml:lang="sl">Pretočni vir prenosega MPEG</comment> <comment xml:lang="sr">МПЕГ-2 ток преноса</comment> @@ -36401,6 +37609,7 @@ <mime-type type="video/mpeg"> <comment>MPEG video</comment> <comment xml:lang="ar">MPEG مرئي</comment> + <comment xml:lang="ast">Videu en MPEG</comment> <comment xml:lang="be@latin">Videa MPEG</comment> <comment xml:lang="bg">Видео — MPEG</comment> <comment xml:lang="ca">vídeo MPEG</comment> @@ -36418,7 +37627,7 @@ <comment xml:lang="ga">físeán MPEG</comment> <comment xml:lang="gl">vídeo MPEG</comment> <comment xml:lang="he">וידאו MPEG</comment> - <comment xml:lang="hr">MPEG video</comment> + <comment xml:lang="hr">MPEG video snimka</comment> <comment xml:lang="hu">MPEG-videó</comment> <comment xml:lang="ia">Video MPEG</comment> <comment xml:lang="id">Video MPEG</comment> @@ -36438,7 +37647,7 @@ <comment xml:lang="pt">vídeo MPEG</comment> <comment xml:lang="pt_BR">Vídeo MPEG</comment> <comment xml:lang="ro">Video MPEG</comment> - <comment xml:lang="ru">видео MPEG</comment> + <comment xml:lang="ru">Видео MPEG</comment> <comment xml:lang="sk">Video MPEG</comment> <comment xml:lang="sl">Video datoteka MPEG</comment> <comment xml:lang="sq">Video MPEG</comment> @@ -36469,6 +37678,7 @@ </mime-type> <mime-type type="video/vnd.mpegurl"> <comment>MPEG video (streamed)</comment> + <comment xml:lang="ast">Videu en MPEG (tresmitíu)</comment> <comment xml:lang="bg">Видео — MPEG, поточно</comment> <comment xml:lang="ca">vídeo MPEG (flux)</comment> <comment xml:lang="cs">video MPEG (proud)</comment> @@ -36480,6 +37690,7 @@ <comment xml:lang="eu">MPEG bideoa (korronte bidez)</comment> <comment xml:lang="fi">MPEG-video (virtaus)</comment> <comment xml:lang="fr">vidéo MPEG (flux)</comment> + <comment xml:lang="ga">físeán MPEG (sruthaithe)</comment> <comment xml:lang="gl">vídeo MPEG (en stream)</comment> <comment xml:lang="he">קובץ MPEG (בהזרמה)</comment> <comment xml:lang="hr">MPEG video snimka (strujanje)</comment> @@ -36497,7 +37708,7 @@ <comment xml:lang="pl">Plik wideo MPEG (strumień)</comment> <comment xml:lang="pt">vídeo MPEG (em fluxo)</comment> <comment xml:lang="pt_BR">Vídeo MPEG (fluxo)</comment> - <comment xml:lang="ru">видео MPEG (потоковое)</comment> + <comment xml:lang="ru">Видео MPEG (потоковое)</comment> <comment xml:lang="sk">MPEG video (streamované)</comment> <comment xml:lang="sl">MPEG-video (pretočni)</comment> <comment xml:lang="sr">МПЕГ видео (проточни)</comment> @@ -36518,6 +37729,7 @@ <mime-type type="video/quicktime"> <comment>QuickTime video</comment> <comment xml:lang="ar">QuickTime مرئي</comment> + <comment xml:lang="ast">Videu en QuickTime</comment> <comment xml:lang="be@latin">Videa QuickTime</comment> <comment xml:lang="bg">Видео — QuickTime</comment> <comment xml:lang="ca">vídeo QuickTime</comment> @@ -36535,7 +37747,7 @@ <comment xml:lang="ga">físeán QuickTime</comment> <comment xml:lang="gl">vídeo QuickTime</comment> <comment xml:lang="he">וידאו של QuickTime</comment> - <comment xml:lang="hr">QuickTime video</comment> + <comment xml:lang="hr">QuickTime video snimka</comment> <comment xml:lang="hu">QuickTime videó</comment> <comment xml:lang="ia">Video QuickTime</comment> <comment xml:lang="id">Video QuickTime</comment> @@ -36554,7 +37766,7 @@ <comment xml:lang="pt">vídeo QuickTime</comment> <comment xml:lang="pt_BR">Vídeo do QuickTime</comment> <comment xml:lang="ro">Video QuickTime</comment> - <comment xml:lang="ru">видео QuickTime</comment> + <comment xml:lang="ru">Видео QuickTime</comment> <comment xml:lang="sk">Video QuickTime</comment> <comment xml:lang="sl">Video datoteka QuickTime</comment> <comment xml:lang="sq">Video QuickTime</comment> @@ -36614,7 +37826,7 @@ <comment xml:lang="pt">imagem QuickTime</comment> <comment xml:lang="pt_BR">Imagem do QuickTime</comment> <comment xml:lang="ro">Imagine QuickTime</comment> - <comment xml:lang="ru">изображение QuickTime</comment> + <comment xml:lang="ru">Изображение QuickTime</comment> <comment xml:lang="sk">Obrázok QuickTime</comment> <comment xml:lang="sl">Slikovna datoteka QuickTime</comment> <comment xml:lang="sq">Figurë QuickTime</comment> @@ -36631,9 +37843,44 @@ <glob pattern="*.qtif"/> <glob pattern="*.qif"/> </mime-type> + <mime-type type="image/ktx"> + <comment>Khronos texture image</comment> + <comment xml:lang="ca">imatge de textura de Khronos</comment> + <comment xml:lang="cs">obrázek s texturou Khronos</comment> + <comment xml:lang="de">Khronos-Texturbild</comment> + <comment xml:lang="en_GB">Khronos texture image</comment> + <comment xml:lang="es">imagen de textura de Khronos</comment> + <comment xml:lang="fr">image de texture Khronos</comment> + <comment xml:lang="ga">íomhá uigeachta Khronos</comment> + <comment xml:lang="hr">Khronos tekstura slika</comment> + <comment xml:lang="hu">Khronos textúra kép</comment> + <comment xml:lang="id">citra tekstur Khronos</comment> + <comment xml:lang="it">Immagine texture Khronos</comment> + <comment xml:lang="kk">Khronos текстура суреті</comment> + <comment xml:lang="ko">크로노스 텍스처 파일</comment> + <comment xml:lang="pl">Obraz tekstury Khronos</comment> + <comment xml:lang="pt_BR">Imagem de textura do Khronos</comment> + <comment xml:lang="ru">Изображение текстуры Khronos</comment> + <comment xml:lang="sk">Obrázok textúry Khronos</comment> + <comment xml:lang="sr">слика Кронос текстуре</comment> + <comment xml:lang="sv">Khronos-texturbild</comment> + <comment xml:lang="tr">Khronos kaplama görüntüsü</comment> + <comment xml:lang="uk">зображення текстури Khronos</comment> + <comment xml:lang="zh_CN">Khronos 纹理图像</comment> + <comment xml:lang="zh_TW">Khronos 紋理影像</comment> + <magic priority="80"> + <match value="0xAB4B5458" type="big32" offset="0"> + <match value="0x203131BB" type="big32" offset="4"> + <match value="0x0D0A1A0A" type="big32" offset="8"/> + </match> + </match> + </magic> + <glob pattern="*.ktx"/> + </mime-type> <mime-type type="video/vnd.vivo"> <comment>Vivo video</comment> <comment xml:lang="ar">Vivo مرئي</comment> + <comment xml:lang="ast">Videu en Vivo</comment> <comment xml:lang="az">Vivo video faylı</comment> <comment xml:lang="be@latin">Videa Vivo</comment> <comment xml:lang="bg">Видео — Vivo</comment> @@ -36653,7 +37900,7 @@ <comment xml:lang="ga">físeán Vivo</comment> <comment xml:lang="gl">vídeo Vivo</comment> <comment xml:lang="he">וידאו של Vivo</comment> - <comment xml:lang="hr">Vivo video</comment> + <comment xml:lang="hr">Vivo video snimka</comment> <comment xml:lang="hu">Vivo-videó</comment> <comment xml:lang="ia">Video Vivo</comment> <comment xml:lang="id">Video Vivo</comment> @@ -36672,7 +37919,7 @@ <comment xml:lang="pt">vídeo Vivo</comment> <comment xml:lang="pt_BR">Vídeo Vivo</comment> <comment xml:lang="ro">Video Vivo</comment> - <comment xml:lang="ru">видео Vivo</comment> + <comment xml:lang="ru">Видео Vivo</comment> <comment xml:lang="sk">Video Vivo</comment> <comment xml:lang="sl">Video datoteka Vivo</comment> <comment xml:lang="sq">Video Vivo</comment> @@ -36690,6 +37937,7 @@ <mime-type type="video/wavelet"> <comment>Wavelet video</comment> <comment xml:lang="ar">Wavelet مرئي</comment> + <comment xml:lang="ast">Videu en Wavelet</comment> <comment xml:lang="az">Wavelet video faylı</comment> <comment xml:lang="be@latin">Videa Wavelet</comment> <comment xml:lang="bg">Видео — Wavelet</comment> @@ -36709,7 +37957,7 @@ <comment xml:lang="ga">físeán Wavelet</comment> <comment xml:lang="gl">vídeo Wavelet</comment> <comment xml:lang="he">וידאו של Wavelet</comment> - <comment xml:lang="hr">Wavelet video</comment> + <comment xml:lang="hr">Wavelet video snimka</comment> <comment xml:lang="hu">Wavelet-videó</comment> <comment xml:lang="ia">Video Wavelet</comment> <comment xml:lang="id">Video Wavelet</comment> @@ -36728,7 +37976,7 @@ <comment xml:lang="pt">vídeo Wavelet</comment> <comment xml:lang="pt_BR">Vídeo Wavelet</comment> <comment xml:lang="ro">Video Wavelet</comment> - <comment xml:lang="ru">видео Wavelet</comment> + <comment xml:lang="ru">Видео Wavelet</comment> <comment xml:lang="sk">Video Wavelet</comment> <comment xml:lang="sl">Video datoteka Wavelet</comment> <comment xml:lang="sq">Video Wavelet</comment> @@ -36782,7 +38030,7 @@ <comment xml:lang="pt">animação ANIM</comment> <comment xml:lang="pt_BR">Animação ANIM</comment> <comment xml:lang="ro">Animație ANIM</comment> - <comment xml:lang="ru">анимация ANIM</comment> + <comment xml:lang="ru">Анимация ANIM</comment> <comment xml:lang="sk">Animácia ANIM</comment> <comment xml:lang="sl">Datoteka animacije ANIM</comment> <comment xml:lang="sq">Animim ANIM</comment> @@ -36833,7 +38081,7 @@ <comment xml:lang="pt">animação FLIC</comment> <comment xml:lang="pt_BR">Animação FLIC</comment> <comment xml:lang="ro">Animație FLIC</comment> - <comment xml:lang="ru">анимация FLIC</comment> + <comment xml:lang="ru">Анимация FLIC</comment> <comment xml:lang="sk">Animácia FLIC</comment> <comment xml:lang="sl">Datoteka animacije FLIC</comment> <comment xml:lang="sq">Animim FLIC</comment> @@ -36856,6 +38104,7 @@ <mime-type type="application/x-hwp"> <comment>Haansoft Hangul document</comment> <comment xml:lang="ar">مستند Haansoft Hangul</comment> + <comment xml:lang="ast">Documentu de Haansoft Hangul</comment> <comment xml:lang="be@latin">Dakument Haansoft Hangul</comment> <comment xml:lang="bg">Документ — Haansoft Hangul</comment> <comment xml:lang="ca">document d'Haansoft Hangul</comment> @@ -36890,7 +38139,7 @@ <comment xml:lang="pt">documento Haansoft Hangul</comment> <comment xml:lang="pt_BR">Documento do Haansoft Hangul</comment> <comment xml:lang="ro">Document Haansoft Hangul</comment> - <comment xml:lang="ru">документ Haansoft Hangul</comment> + <comment xml:lang="ru">Документ Haansoft Hangul</comment> <comment xml:lang="sk">Dokument Haansoft Hangul</comment> <comment xml:lang="sl">Dokument Haansoft Hangul</comment> <comment xml:lang="sq">Dokument Haansoft Hangul</comment> @@ -36911,6 +38160,7 @@ <mime-type type="application/x-hwt"> <comment>Haansoft Hangul document template</comment> <comment xml:lang="ar">قالب مستند Haansoft Hangul</comment> + <comment xml:lang="ast">Plantía de documentu de Haansoft Hangul</comment> <comment xml:lang="be@latin">Šablon dakumentu Haansoft Hangul</comment> <comment xml:lang="bg">Шаблон за документи — Haansoft Hangul</comment> <comment xml:lang="ca">plantilla de document d'Haansoft Hangul</comment> @@ -36945,7 +38195,7 @@ <comment xml:lang="pt">modelo de documento Haansoft Hangul</comment> <comment xml:lang="pt_BR">Modelo de documento do Haansoft Hangul</comment> <comment xml:lang="ro">Document șablon Haansoft Hangul</comment> - <comment xml:lang="ru">шаблон документа Haansoft Hangul</comment> + <comment xml:lang="ru">Шаблон документа Haansoft Hangul</comment> <comment xml:lang="sk">Šablóna dokumentu Haansoft Hangul</comment> <comment xml:lang="sl">Predloga dokumenta Haansoft Hangul</comment> <comment xml:lang="sq">Model dokumenti Haansoft Hangul</comment> @@ -36999,7 +38249,7 @@ <comment xml:lang="pt">animação MNG</comment> <comment xml:lang="pt_BR">Animação MNG</comment> <comment xml:lang="ro">Animație MNG</comment> - <comment xml:lang="ru">анимация MNG</comment> + <comment xml:lang="ru">Анимация MNG</comment> <comment xml:lang="sk">Animácia MNG</comment> <comment xml:lang="sl">Datoteka animacije MNG</comment> <comment xml:lang="sq">Animim MNG</comment> @@ -37020,6 +38270,7 @@ <mime-type type="application/vnd.ms-asf"> <comment>ASF video</comment> <comment xml:lang="ar">ASF مرئي</comment> + <comment xml:lang="ast">Videu n'ASF</comment> <comment xml:lang="be@latin">Videa ASF</comment> <comment xml:lang="bg">Видео — ASF</comment> <comment xml:lang="ca">vídeo ASF</comment> @@ -37037,7 +38288,7 @@ <comment xml:lang="ga">físeán ASF</comment> <comment xml:lang="gl">vídeo ASF</comment> <comment xml:lang="he">וידאו ASF</comment> - <comment xml:lang="hr">ASF video</comment> + <comment xml:lang="hr">ASF video snimka</comment> <comment xml:lang="hu">ASF videó</comment> <comment xml:lang="ia">Video ASF</comment> <comment xml:lang="id">Video ASF</comment> @@ -37056,7 +38307,7 @@ <comment xml:lang="pt">vídeo ASF</comment> <comment xml:lang="pt_BR">Vídeo ASF</comment> <comment xml:lang="ro">Video ASF</comment> - <comment xml:lang="ru">видео ASF</comment> + <comment xml:lang="ru">Видео ASF</comment> <comment xml:lang="sk">Video ASF</comment> <comment xml:lang="sl">Video datoteka ASF</comment> <comment xml:lang="sq">Video ASF</comment> @@ -37115,7 +38366,7 @@ <comment xml:lang="pt">ficheiro Windows Media Station</comment> <comment xml:lang="pt_BR">Arquivo de estação do Windows Media</comment> <comment xml:lang="ro">Fișier Windows Media Station</comment> - <comment xml:lang="ru">файл Windows Media Station</comment> + <comment xml:lang="ru">Файл Windows Media Station</comment> <comment xml:lang="sk">Súbor Windows Media Station</comment> <comment xml:lang="sl">Datoteka Windows Media Station</comment> <comment xml:lang="sq">File Windows Media Station</comment> @@ -37136,6 +38387,7 @@ <mime-type type="video/x-ms-wmv"> <comment>Windows Media video</comment> <comment xml:lang="ar">Windows Media مرئي</comment> + <comment xml:lang="ast">Videu de Windows Media</comment> <comment xml:lang="be@latin">Videa Windows Media</comment> <comment xml:lang="bg">Видео — Windows Media</comment> <comment xml:lang="ca">vídeo de Windows Media</comment> @@ -37152,7 +38404,7 @@ <comment xml:lang="ga">físeán Windows Media</comment> <comment xml:lang="gl">vídeo de Windows Media</comment> <comment xml:lang="he">וידאו של Windows Media</comment> - <comment xml:lang="hr">Windows Media video</comment> + <comment xml:lang="hr">Windows Media video snimka</comment> <comment xml:lang="hu">Windows Media videó</comment> <comment xml:lang="ia">Video Windows Media</comment> <comment xml:lang="id">Video Windows Media</comment> @@ -37170,7 +38422,7 @@ <comment xml:lang="pt">vídeo Windows Media</comment> <comment xml:lang="pt_BR">Vídeo do Windows Media</comment> <comment xml:lang="ro">Video Windows Media</comment> - <comment xml:lang="ru">видео Windows Media</comment> + <comment xml:lang="ru">Видео Windows Media</comment> <comment xml:lang="sk">Video Windows Media</comment> <comment xml:lang="sl">Video datoteka Windows Media</comment> <comment xml:lang="sq">Video Windows Media</comment> @@ -37187,6 +38439,7 @@ <mime-type type="video/x-msvideo"> <comment>AVI video</comment> <comment xml:lang="ar">AVI مرئي</comment> + <comment xml:lang="ast">Videu n'AVI</comment> <comment xml:lang="az">AVI video faylı</comment> <comment xml:lang="be@latin">Videa AVI</comment> <comment xml:lang="bg">Видео — AVI</comment> @@ -37206,7 +38459,7 @@ <comment xml:lang="ga">físeán AVI</comment> <comment xml:lang="gl">vídeo AVI</comment> <comment xml:lang="he">וידאו AVI</comment> - <comment xml:lang="hr">AVI video</comment> + <comment xml:lang="hr">AVI video snimka</comment> <comment xml:lang="hu">AVI-videó</comment> <comment xml:lang="ia">Video AVI</comment> <comment xml:lang="id">Video AVI</comment> @@ -37226,7 +38479,7 @@ <comment xml:lang="pt">vídeo AVI</comment> <comment xml:lang="pt_BR">Vídeo AVI</comment> <comment xml:lang="ro">Video AVI</comment> - <comment xml:lang="ru">видео AVI</comment> + <comment xml:lang="ru">Видео AVI</comment> <comment xml:lang="sk">Video AVI</comment> <comment xml:lang="sl">Video datoteka AVI</comment> <comment xml:lang="sq">Video AVI</comment> @@ -37259,6 +38512,7 @@ <mime-type type="video/x-nsv"> <comment>NullSoft video</comment> <comment xml:lang="ar">NullSoft مرئي</comment> + <comment xml:lang="ast">Videu de NullSoft</comment> <comment xml:lang="be@latin">Videa NullSoft</comment> <comment xml:lang="bg">Видео — NullSoft</comment> <comment xml:lang="ca">vídeo NullSoft</comment> @@ -37276,7 +38530,7 @@ <comment xml:lang="ga">físeán NullSoft</comment> <comment xml:lang="gl">vídeo de NullSoft</comment> <comment xml:lang="he">וידאו של NullSot</comment> - <comment xml:lang="hr">NullSoft video</comment> + <comment xml:lang="hr">NullSoft video snimka</comment> <comment xml:lang="hu">NullSoft videó</comment> <comment xml:lang="ia">Video NullSoft</comment> <comment xml:lang="id">Video NullSoft</comment> @@ -37294,7 +38548,7 @@ <comment xml:lang="pt">vídeo NullSoft</comment> <comment xml:lang="pt_BR">Vídeo do NullSoft</comment> <comment xml:lang="ro">Video NullSoft</comment> - <comment xml:lang="ru">видео Nullsoft</comment> + <comment xml:lang="ru">Видео Nullsoft</comment> <comment xml:lang="sk">Video NullSoft</comment> <comment xml:lang="sl">Video datoteka NullSoft</comment> <comment xml:lang="sq">Video NullSoft</comment> @@ -37303,7 +38557,7 @@ <comment xml:lang="tr">Nullsoft videosu</comment> <comment xml:lang="uk">відеокліп NullSoft</comment> <comment xml:lang="vi">Ảnh động NullSoft</comment> - <comment xml:lang="zh_CN">Nullsoft 视频</comment> + <comment xml:lang="zh_CN">NullSoft 视频</comment> <comment xml:lang="zh_TW">NullSoft 視訊</comment> <magic priority="50"> <match value="NSVf" type="string" offset="0"/> @@ -37347,7 +38601,7 @@ <comment xml:lang="pt">ficheiro de fluxo SDP multicast</comment> <comment xml:lang="pt_BR">Arquivo de canal multicast SDP</comment> <comment xml:lang="ro">Fișier flux multicast SDP</comment> - <comment xml:lang="ru">файл мультикаст-потока SDP</comment> + <comment xml:lang="ru">Файл мультикаст-потока SDP</comment> <comment xml:lang="sk">Súbor viacsmerového vysielania prúdu SDP</comment> <comment xml:lang="sl">Pretočni vir večsmernega oddajanja</comment> <comment xml:lang="sq">File stream multicast SDP</comment> @@ -37374,6 +38628,7 @@ <mime-type type="video/x-sgi-movie"> <comment>SGI video</comment> <comment xml:lang="ar">SGI مرئي</comment> + <comment xml:lang="ast">Videu en SGI</comment> <comment xml:lang="az">SGI video faylı</comment> <comment xml:lang="be@latin">Videa SGI</comment> <comment xml:lang="bg">Видео — SGI</comment> @@ -37393,7 +38648,7 @@ <comment xml:lang="ga">físeán SGI</comment> <comment xml:lang="gl">vídeo SGI</comment> <comment xml:lang="he">וידאו SGI</comment> - <comment xml:lang="hr">SGI video</comment> + <comment xml:lang="hr">SGI video snimka</comment> <comment xml:lang="hu">SGI-videó</comment> <comment xml:lang="ia">Video SGI</comment> <comment xml:lang="id">Video SGI</comment> @@ -37412,7 +38667,7 @@ <comment xml:lang="pt">vídeo SGI</comment> <comment xml:lang="pt_BR">Vídeo SGI</comment> <comment xml:lang="ro">Video SGI</comment> - <comment xml:lang="ru">видео SGI</comment> + <comment xml:lang="ru">Видео SGI</comment> <comment xml:lang="sk">Video SGI</comment> <comment xml:lang="sl">Video datoteka SGI</comment> <comment xml:lang="sq">Video SGI</comment> @@ -37465,7 +38720,7 @@ <comment xml:lang="pt">pacote transferido eMusic</comment> <comment xml:lang="pt_BR">Pacote de download do eMusic</comment> <comment xml:lang="ro">pachet descărcare eMusic</comment> - <comment xml:lang="ru">пакет загрузок eMusic</comment> + <comment xml:lang="ru">Пакет загрузок eMusic</comment> <comment xml:lang="sk">Balíček sťahovania eMusic</comment> <comment xml:lang="sl">Datoteka paketa eMusic</comment> <comment xml:lang="sq">Paketë shkarkimi eMusic</comment> @@ -37516,7 +38771,7 @@ <comment xml:lang="pt">dados geográficos KML</comment> <comment xml:lang="pt_BR">Dados geográficos KML</comment> <comment xml:lang="ro">Date geografice KML</comment> - <comment xml:lang="ru">географические данные KML</comment> + <comment xml:lang="ru">Географические данные KML</comment> <comment xml:lang="sk">Zemepisné údaje KML</comment> <comment xml:lang="sl">Datoteka geografskih podatkov KML</comment> <comment xml:lang="sr">КМЛ географски подаци</comment> @@ -37549,7 +38804,7 @@ <comment xml:lang="ga">sonraí comhbhrúite geografacha KML</comment> <comment xml:lang="gl">datos xeográficos KML comprimidos </comment> <comment xml:lang="he">מידע גאוגרפי דחוס KML</comment> - <comment xml:lang="hr">KML geografski komprimirani podaci</comment> + <comment xml:lang="hr">KML sažeti geografski podaci</comment> <comment xml:lang="hu">KML tömörített földrajzi adatok</comment> <comment xml:lang="ia">Datos geographic KML comprimite</comment> <comment xml:lang="id">Data geografis KML terkompresi</comment> @@ -37565,14 +38820,14 @@ <comment xml:lang="pt">dados geográficos comprimidos KML</comment> <comment xml:lang="pt_BR">Dados geográficos KML compactados</comment> <comment xml:lang="ro">Date geografice comprimate KML</comment> - <comment xml:lang="ru">сжатые географические данные KML</comment> + <comment xml:lang="ru">Сжатые географические данные KML</comment> <comment xml:lang="sk">Komprimované zemepisné údaje KML</comment> <comment xml:lang="sl">Skrčeni geografski podatki KML</comment> <comment xml:lang="sr">КМЛ географски запаковани подаци</comment> <comment xml:lang="sv">KML geografiskt komprimerat data</comment> <comment xml:lang="tr">KML sıkıştırılmış coğrafi verisi</comment> <comment xml:lang="uk">стиснуті географічні дані KML</comment> - <comment xml:lang="zh_CN">KML 压缩地理数据</comment> + <comment xml:lang="zh_CN">KML 地理压缩数据</comment> <comment xml:lang="zh_TW">KML 地理壓縮資料</comment> <acronym>KML</acronym> <expanded-acronym>Keyhole Markup Language</expanded-acronym> @@ -37588,6 +38843,7 @@ <comment xml:lang="en_GB">GeoJSON geospatial data</comment> <comment xml:lang="es">datos geoespaciales en GeoJSON</comment> <comment xml:lang="fr">données géospatiales GeoJSON</comment> + <comment xml:lang="ga">sonraí geospásúla GeoJSON</comment> <comment xml:lang="hr">GeoJSON geoprostorni podaci</comment> <comment xml:lang="hu">GeoJSON téradatok</comment> <comment xml:lang="id">Data geospasial GeoJSON</comment> @@ -37596,10 +38852,10 @@ <comment xml:lang="ko">GeoJSON 지리 정보 데이터</comment> <comment xml:lang="pl">Dane geoprzestrzenne GeoJSON</comment> <comment xml:lang="pt_BR">Dados geoespaciais GeoJSON</comment> - <comment xml:lang="ru">геопространственные данные GeoJSON</comment> + <comment xml:lang="ru">Геопространственные данные GeoJSON</comment> <comment xml:lang="sk">Geopriestorové údaje GeoJSON</comment> <comment xml:lang="sr">ГеоЈСОН геопросторни подаци</comment> - <comment xml:lang="sv">GeoJSON geospatial data</comment> + <comment xml:lang="sv">Geospatialt GeoJSON-data</comment> <comment xml:lang="tr">GeoJSON coğrafi veriler</comment> <comment xml:lang="uk">геопросторові дані GeoJSON</comment> <comment xml:lang="zh_CN">GeoJSON 地理空间数据</comment> @@ -37620,6 +38876,7 @@ <comment xml:lang="eu">GPX datu geografikoak</comment> <comment xml:lang="fi">GPX-paikkatieto</comment> <comment xml:lang="fr">données géographiques GPX</comment> + <comment xml:lang="ga">sonraí geografacha GPX</comment> <comment xml:lang="he">נתונים גאוגרפיים GPX</comment> <comment xml:lang="hr">GPX geografski podaci</comment> <comment xml:lang="hu">GPX földrajzi adatok</comment> @@ -37630,13 +38887,13 @@ <comment xml:lang="oc">Donadas geograficas GPX</comment> <comment xml:lang="pl">Dane geograficzne GPX</comment> <comment xml:lang="pt_BR">Dados geográficos GPX</comment> - <comment xml:lang="ru">географические данные GPX</comment> + <comment xml:lang="ru">Географические данные GPX</comment> <comment xml:lang="sk">Zemepisné údaje GPX</comment> <comment xml:lang="sr">ГПИкс географски подаци</comment> <comment xml:lang="sv">GPX geografisk data</comment> <comment xml:lang="tr">GPX coğrafi verileri</comment> <comment xml:lang="uk">географічні дані GPX</comment> - <comment xml:lang="zh_CN">GPX 地理空间数据</comment> + <comment xml:lang="zh_CN">GPX 地理数据</comment> <comment xml:lang="zh_TW">GPX 地理資料</comment> <acronym>GPX</acronym> <expanded-acronym>GPS Exchange Format</expanded-acronym> @@ -37686,7 +38943,7 @@ <comment xml:lang="pt">ficheiro de definições Citrix ICA</comment> <comment xml:lang="pt_BR">Arquivo de configuração do Citrix ICA</comment> <comment xml:lang="ro">Fișier de configurări Citrix ICA</comment> - <comment xml:lang="ru">файл настроек Citrix ICA</comment> + <comment xml:lang="ru">Файл настроек Citrix ICA</comment> <comment xml:lang="sk">Súbor nastavení Citrix ICA</comment> <comment xml:lang="sl">Nastavitvena datoteka Citrix ICA</comment> <comment xml:lang="sq">File rregullimesh Citrix ICA</comment> @@ -37706,6 +38963,7 @@ <mime-type type="application/vnd.mozilla.xul+xml"> <comment>XUL interface document</comment> <comment xml:lang="ar">مستند واجهة XUL</comment> + <comment xml:lang="ast">Documentu d'interfaz XUL</comment> <comment xml:lang="be@latin">Interfejsny dakument XUL</comment> <comment xml:lang="bg">Документ — интерфейс за XUL</comment> <comment xml:lang="ca">document d'interfície XUL</comment> @@ -37740,7 +38998,7 @@ <comment xml:lang="pt">documento de ambiente XUL</comment> <comment xml:lang="pt_BR">Documento de interface XUL</comment> <comment xml:lang="ro">Document interfață XUL</comment> - <comment xml:lang="ru">документ интерфейса XUL</comment> + <comment xml:lang="ru">Документ интерфейса XUL</comment> <comment xml:lang="sk">Dokument rozhrania XUL</comment> <comment xml:lang="sl">Dokument vmesnika XUL</comment> <comment xml:lang="sq">Dokument interfaqe XUL</comment> @@ -37792,7 +39050,7 @@ <comment xml:lang="pt">módulo de instalador XPInstall</comment> <comment xml:lang="pt_BR">Módulo de instalador XPInstall</comment> <comment xml:lang="ro">Modul de instalare XPInstall</comment> - <comment xml:lang="ru">модуль установщика XPInstall</comment> + <comment xml:lang="ru">Модуль установщика XPInstall</comment> <comment xml:lang="sk">Modul inštalátora XPInstall</comment> <comment xml:lang="sl">modul namestilnika XPInstall</comment> <comment xml:lang="sr">модул инсталатера Инсталирања ИксПе-а</comment> @@ -37807,6 +39065,7 @@ <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.document"> <comment>Word 2007 document</comment> <comment xml:lang="ar">مستند Word 2007</comment> + <comment xml:lang="ast">Documentu de Word 2007</comment> <comment xml:lang="bg">Документ — Word 2007</comment> <comment xml:lang="ca">document de Word 2007</comment> <comment xml:lang="cs">dokument Word 2007</comment> @@ -37838,7 +39097,7 @@ <comment xml:lang="pt">documento Word 2007</comment> <comment xml:lang="pt_BR">Documento do Word 2007</comment> <comment xml:lang="ro">Document Word 2007</comment> - <comment xml:lang="ru">документ Word 2007</comment> + <comment xml:lang="ru">Документ Word 2007</comment> <comment xml:lang="sk">Dokument Word 2007</comment> <comment xml:lang="sl">Dokument Word 2007</comment> <comment xml:lang="sr">документ Ворда 2007</comment> @@ -37846,7 +39105,7 @@ <comment xml:lang="tr">Word 2007 belgesi</comment> <comment xml:lang="uk">документ Word 2007</comment> <comment xml:lang="vi">Tài liệu Word 2007</comment> - <comment xml:lang="zh_CN">Microsoft Word 2007 文档</comment> + <comment xml:lang="zh_CN">Word 2007 文档</comment> <comment xml:lang="zh_TW">Word 2007 文件</comment> <glob pattern="*.docx"/> <sub-class-of type="application/zip"/> @@ -37854,6 +39113,7 @@ </mime-type> <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.template"> <comment>Word 2007 document template</comment> + <comment xml:lang="ast">Plantía de documentu de Word 2007</comment> <comment xml:lang="bg">Шаблон за документи — Word 2007</comment> <comment xml:lang="ca">plantilla de document de Word 2007</comment> <comment xml:lang="cs">šablona dokumentu Word 2007</comment> @@ -37865,6 +39125,7 @@ <comment xml:lang="eu">Word 2007 dokumentuaren txantiloia</comment> <comment xml:lang="fi">Word 2007 -asiakirjamalli</comment> <comment xml:lang="fr">modèle de document Word 2007</comment> + <comment xml:lang="ga">teimpléad cháipéis Word 2007</comment> <comment xml:lang="gl">Plantilla de documento de Word 2007</comment> <comment xml:lang="he">תבנית מסמך של Word 2007</comment> <comment xml:lang="hr">Word 2007 predložak dokumenta</comment> @@ -37882,7 +39143,7 @@ <comment xml:lang="pl">Szablon dokumentu Word 2007</comment> <comment xml:lang="pt">modelo de documento Word 2007</comment> <comment xml:lang="pt_BR">Modelo de documento do Word 2007</comment> - <comment xml:lang="ru">шаблон документа Word 2007</comment> + <comment xml:lang="ru">Шаблон документа Word 2007</comment> <comment xml:lang="sk">Šablóna dokumentu Word 2007</comment> <comment xml:lang="sl">Predloga dokumenta Word 2007</comment> <comment xml:lang="sr">шаблон документа Ворда 2007</comment> @@ -37929,7 +39190,7 @@ <comment xml:lang="pt">apresentação PowerPoint 2007</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint 2007</comment> <comment xml:lang="ro">Prezentare PowerPoint 2007</comment> - <comment xml:lang="ru">презентация PowerPoint 2007</comment> + <comment xml:lang="ru">Презентация PowerPoint 2007</comment> <comment xml:lang="sk">Prezentácia PowerPoint 2007</comment> <comment xml:lang="sl">Predstavitev Microsoft PowerPoint 2007</comment> <comment xml:lang="sr">презентација Пауер Поинта 2007</comment> @@ -37937,7 +39198,7 @@ <comment xml:lang="tr">PowerPoint 2007 sunumu</comment> <comment xml:lang="uk">презентація PowerPoint 2007</comment> <comment xml:lang="vi">Trình diễn PowerPoint 2007</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 2007 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 2007 演示文稿</comment> <comment xml:lang="zh_TW">PowerPoint 2007 簡報</comment> <glob pattern="*.pptx"/> <sub-class-of type="application/zip"/> @@ -37956,9 +39217,10 @@ <comment xml:lang="eu">PowerPoint 2007 diapositiba</comment> <comment xml:lang="fi">PowerPoint 2007 -dia</comment> <comment xml:lang="fr">diapositive PowerPoint 2007</comment> + <comment xml:lang="ga">sleamhnán PowerPoint 2007</comment> <comment xml:lang="gl">Diaporama de PowerPoint 2007</comment> <comment xml:lang="he">שקופית של PowerPoint 2007</comment> - <comment xml:lang="hr">PowerPoint 2007 slajd</comment> + <comment xml:lang="hr">PowerPoint 2007 slikovna prezentacija</comment> <comment xml:lang="hu">PowerPoint 2007 dia</comment> <comment xml:lang="ia">Diapositiva PowerPoint 2007</comment> <comment xml:lang="id">Slide PowerPoint 2007</comment> @@ -37973,14 +39235,14 @@ <comment xml:lang="pl">Slajd PowerPoint 2007</comment> <comment xml:lang="pt">diapositivo PowerPoint 2007</comment> <comment xml:lang="pt_BR">Slide do PowerPoint 2007</comment> - <comment xml:lang="ru">слайд PowerPoint 2007</comment> + <comment xml:lang="ru">Слайд PowerPoint 2007</comment> <comment xml:lang="sk">Snímka PowerPoint 2007</comment> <comment xml:lang="sl">Prosojnica PowerPoint 2007</comment> <comment xml:lang="sr">слајд Пауер Поинта 2007</comment> <comment xml:lang="sv">PowerPoint 2007-bildspel</comment> <comment xml:lang="tr">PowerPoint 2007 slaytı</comment> <comment xml:lang="uk">слайд PowerPoint 2007</comment> - <comment xml:lang="zh_CN">PowerPoint 2007 文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 2007 幻灯片</comment> <comment xml:lang="zh_TW">PowerPoint 2007 投影片</comment> <glob pattern="*.sldx"/> <sub-class-of type="application/zip"/> @@ -38020,14 +39282,14 @@ <comment xml:lang="pt">espetáculo PowerPoint 2007</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint 2007</comment> <comment xml:lang="ro">Prezentare PowerPoint 2007</comment> - <comment xml:lang="ru">презентация PowerPoint 2007</comment> + <comment xml:lang="ru">Презентация PowerPoint 2007</comment> <comment xml:lang="sk">Ukážka PowerPoint 2007</comment> <comment xml:lang="sl">Zagonska predstavitev PowerPoint 2007</comment> <comment xml:lang="sr">приказ Пауер Поинта 2007</comment> <comment xml:lang="sv">PowerPoint 2007-visning</comment> <comment xml:lang="tr">PowerPoint 2007 gösterisi</comment> <comment xml:lang="uk">показ слайдів PowerPoint 2007</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 2007 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 2007 放映</comment> <comment xml:lang="zh_TW">PowerPoint 2007 展示</comment> <glob pattern="*.ppsx"/> <sub-class-of type="application/zip"/> @@ -38046,6 +39308,7 @@ <comment xml:lang="eu">PowerPoint 2007 aurkezpen txantiloia</comment> <comment xml:lang="fi">PowerPoint 2007 -esitysmalli</comment> <comment xml:lang="fr">modèle de présentation PowerPoint 2007</comment> + <comment xml:lang="ga">teimpléad láithreoireachta PowerPoint 2007</comment> <comment xml:lang="gl">modelo de presentación de PowerPoint 2007</comment> <comment xml:lang="he">תבנית למצגת של PowerPoint 2007</comment> <comment xml:lang="hr">PowerPoint 2007 predložak prezentacije</comment> @@ -38063,7 +39326,7 @@ <comment xml:lang="pl">Szablon prezentacji PowerPoint 2007</comment> <comment xml:lang="pt">modelo de apresentação PowerPoint 2007</comment> <comment xml:lang="pt_BR">Modelo de apresentação do PowerPoint 2007</comment> - <comment xml:lang="ru">шаблон презентации PowerPoint 2007</comment> + <comment xml:lang="ru">Шаблон презентации PowerPoint 2007</comment> <comment xml:lang="sk">Šablóna prezentácie PowerPoint 2007</comment> <comment xml:lang="sl">Predloga predstavitve PowerPoint 2007</comment> <comment xml:lang="sr">шаблон презентације Пауер Поинта 2007</comment> @@ -38111,7 +39374,7 @@ <comment xml:lang="pt">folha de cálculo Excel 2007</comment> <comment xml:lang="pt_BR">Planilha do Excel 2007</comment> <comment xml:lang="ro">Foaie de calcul Excel 2007</comment> - <comment xml:lang="ru">электронная таблица Excel 2007</comment> + <comment xml:lang="ru">Электронная таблица Excel 2007</comment> <comment xml:lang="sk">Zošit Excel 2007</comment> <comment xml:lang="sl">Razpredelnica Microsoft Excel 2007</comment> <comment xml:lang="sr">табела Ексела 2007</comment> @@ -38119,7 +39382,7 @@ <comment xml:lang="tr">Excel 2007 çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Excel 2007</comment> <comment xml:lang="vi">Bảng tính Excel 2007</comment> - <comment xml:lang="zh_CN">Microsoft Excel 2007 工作簿</comment> + <comment xml:lang="zh_CN">Excel 2007 电子表格</comment> <comment xml:lang="zh_TW">Excel 2007 試算表</comment> <glob pattern="*.xlsx"/> <sub-class-of type="application/zip"/> @@ -38138,6 +39401,7 @@ <comment xml:lang="eu">Excel 2007 kalkulu-orri txantiloia</comment> <comment xml:lang="fi">Excel 2007 -taulukkomalli</comment> <comment xml:lang="fr">modèle de feuille de calcul Excel 2007</comment> + <comment xml:lang="ga">teimpléad scarbhileoige Excel 2007</comment> <comment xml:lang="gl">modelo de folla de cálculo Excel 2007</comment> <comment xml:lang="he">תבנית של גיליון נתונים של Excel 2007</comment> <comment xml:lang="hr">Excel 2007 predložak proračunske tablice</comment> @@ -38155,14 +39419,14 @@ <comment xml:lang="pl">Szablon arkusza Excel 2007</comment> <comment xml:lang="pt">modelo de folha de cálculo Excel 2007</comment> <comment xml:lang="pt_BR">Modelo de planilha do Excel 2007</comment> - <comment xml:lang="ru">шаблон электронной таблицы Excel 2007</comment> + <comment xml:lang="ru">Шаблон электронной таблицы Excel 2007</comment> <comment xml:lang="sk">Šablóna zošitu Excel 2007</comment> <comment xml:lang="sl">Predloga razpredelnice Excel 2007</comment> <comment xml:lang="sr">шаблон табеле Ексела 2007</comment> <comment xml:lang="sv">Excel 2007-kalkylarksmall</comment> <comment xml:lang="tr">Excel 2007 çalışma sayfası şablonu</comment> <comment xml:lang="uk">шаблон електронної таблиці Excel 2007</comment> - <comment xml:lang="zh_CN">Excel 2007 工作表模板</comment> + <comment xml:lang="zh_CN">Excel 2007 电子表格模板</comment> <comment xml:lang="zh_TW">Excel 2007 試算表範本</comment> <glob pattern="*.xltx"/> <sub-class-of type="application/zip"/> @@ -38171,6 +39435,7 @@ <mime-type type="application/x-t602"> <comment>T602 document</comment> <comment xml:lang="ar">مستند T602</comment> + <comment xml:lang="ast">Documentu T602</comment> <comment xml:lang="be@latin">Dakument T602</comment> <comment xml:lang="bg">Документ — T602</comment> <comment xml:lang="ca">document T602</comment> @@ -38206,7 +39471,7 @@ <comment xml:lang="pt">documento T602</comment> <comment xml:lang="pt_BR">Documento T602</comment> <comment xml:lang="ro">Document T602</comment> - <comment xml:lang="ru">документ T602</comment> + <comment xml:lang="ru">Документ T602</comment> <comment xml:lang="sk">Dokument T602</comment> <comment xml:lang="sl">Dokument T602</comment> <comment xml:lang="sq">Dokument T602</comment> @@ -38263,7 +39528,7 @@ <comment xml:lang="pt">definições de Cisco VPN</comment> <comment xml:lang="pt_BR">Configurações de VPN da Cisco</comment> <comment xml:lang="ro">Configurări VPN Cisco</comment> - <comment xml:lang="ru">файл настроек Cisco VPN</comment> + <comment xml:lang="ru">Файл настроек Cisco VPN</comment> <comment xml:lang="sk">Nastavenia Cisco VPN</comment> <comment xml:lang="sl">Datoteka nastavitev Cisco VPN</comment> <comment xml:lang="sq">Rregullime VPN Cisco</comment> @@ -38285,6 +39550,7 @@ <mime-type type="application/vnd.iccprofile"> <comment>ICC profile</comment> <comment xml:lang="ar">تشكيلة OCL</comment> + <comment xml:lang="ast">Perfil ICC</comment> <comment xml:lang="bg">Цветови профил — OCL</comment> <comment xml:lang="ca">perfil ICC</comment> <comment xml:lang="cs">profil ICC</comment> @@ -38317,14 +39583,14 @@ <comment xml:lang="pt">perfil ICC</comment> <comment xml:lang="pt_BR">Perfil ICC</comment> <comment xml:lang="ro">Profil ICC</comment> - <comment xml:lang="ru">профиль ICC</comment> + <comment xml:lang="ru">Профиль ICC</comment> <comment xml:lang="sk">Profil farieb ICC</comment> <comment xml:lang="sl">Datoteka profila ICC</comment> <comment xml:lang="sr">ИЦЦ профил</comment> <comment xml:lang="sv">ICC-profil</comment> <comment xml:lang="tr">ICC profili</comment> <comment xml:lang="uk">профіль ICC</comment> - <comment xml:lang="zh_CN">ICC 文件</comment> + <comment xml:lang="zh_CN">ICC 配置文件</comment> <comment xml:lang="zh_TW">ICC 設定檔</comment> <magic priority="50"> <match value="acsp" type="string" offset="36"/> @@ -38366,7 +39632,7 @@ <comment xml:lang="pt">ficheiro de calibração de cor IT 8.7</comment> <comment xml:lang="pt_BR">Arquivo de calibração de cor IT 8.7</comment> <comment xml:lang="ro">Fișier de calibrare a culorii IT 8.7</comment> - <comment xml:lang="ru">файл калибровки цвета IT 8.7</comment> + <comment xml:lang="ru">Файл калибровки цвета IT 8.7</comment> <comment xml:lang="sk">Súbor kalibrácie farieb IT 8.7</comment> <comment xml:lang="sl">Umeritvena datoteka barve IT 8.7</comment> <comment xml:lang="sr">ИТ 8.7 датотека калибрације боје</comment> @@ -38394,6 +39660,7 @@ <comment xml:lang="eu">CCMX kolore-kalibrazioaren fitxategia</comment> <comment xml:lang="fi">CCMX-värikorjaustiedosto</comment> <comment xml:lang="fr">fichier de correction colorimétrique CCMX</comment> + <comment xml:lang="ga">comhad ceartúchán dathanna CCMX</comment> <comment xml:lang="gl">Ficheiro de corrección de cor CCMX</comment> <comment xml:lang="he">קובץ תיקון צבע מסוג CCMX</comment> <comment xml:lang="hr">CCMX datotkea ispravka boja</comment> @@ -38409,7 +39676,7 @@ <comment xml:lang="pl">Plik korekcji kolorów CCMX</comment> <comment xml:lang="pt">ficheiro de correção de cor CCMX</comment> <comment xml:lang="pt_BR">Arquivo de correção de cor CCMX</comment> - <comment xml:lang="ru">файл цветовой коррекции CCMX</comment> + <comment xml:lang="ru">Файл цветовой коррекции CCMX</comment> <comment xml:lang="sk">Súbor korekcie farieb CCMX</comment> <comment xml:lang="sl">Datoteka barvne poprave CCMX</comment> <comment xml:lang="sr">ЦЦМИкс датотека поправке боје</comment> @@ -38437,6 +39704,7 @@ <comment xml:lang="eu">WinHelp laguntza fitxategia</comment> <comment xml:lang="fi">WinHelp-ohjetiedosto</comment> <comment xml:lang="fr">fichier d'aide WinHelp</comment> + <comment xml:lang="ga">comhad cabhrach WinHelp</comment> <comment xml:lang="gl">Ficheiro de axuda WinHelp</comment> <comment xml:lang="he">קובץ עזרה מסוג WinHelp</comment> <comment xml:lang="hr">WinHelp datoteka pomoći</comment> @@ -38452,7 +39720,7 @@ <comment xml:lang="pl">Plik pomocy WinHelp</comment> <comment xml:lang="pt">ficheiro de ajuda WinHelp</comment> <comment xml:lang="pt_BR">Arquivo de ajuda WinHelp</comment> - <comment xml:lang="ru">файл справки WinHelp</comment> + <comment xml:lang="ru">Файл справки WinHelp</comment> <comment xml:lang="sk">Súbor Pomocníka WinHelp</comment> <comment xml:lang="sl">Datoteka pomoči WinHelp</comment> <comment xml:lang="sr">датотека помоћи Вин хелпа</comment> @@ -38470,18 +39738,28 @@ <mime-type type="application/x-bsdiff"> <comment>binary differences between files</comment> <comment xml:lang="ca">diferencies binàries entre fitxers</comment> + <comment xml:lang="cs">binární rozdíl mezi soubory</comment> <comment xml:lang="da">binære forskelle mellem filer</comment> <comment xml:lang="de">binäre Unterschiede zwischen Dateien</comment> + <comment xml:lang="en_GB">binary differences between files</comment> <comment xml:lang="es">diferencias entre archivos binarios</comment> + <comment xml:lang="eu">fitxategi binarioen arteko ezberdinstasunak</comment> <comment xml:lang="fr">différences binaires entre fichiers</comment> + <comment xml:lang="ga">difríochtaí dénártha idir comhaid</comment> <comment xml:lang="he">הבדלים בינריים בין קבצים</comment> + <comment xml:lang="hr">Binarne razlike između datoteka</comment> <comment xml:lang="hu">bináris különbségfájl</comment> + <comment xml:lang="id">perbedaan biner antar berkas</comment> + <comment xml:lang="it">Differenze binarie tra file</comment> <comment xml:lang="kk">файлдар арасындағы бинарлық айырмашылықтар</comment> <comment xml:lang="ko">바이너리 차이 비교 파일</comment> <comment xml:lang="pl">Binarna różnica pomiędzy plikami</comment> <comment xml:lang="pt_BR">Diferenças binárias entre arquivos</comment> - <comment xml:lang="ru">двоичные различия между файлами</comment> + <comment xml:lang="ru">Двоичные различия между файлами</comment> <comment xml:lang="sk">Binárne rozdiely medzi súbormi</comment> + <comment xml:lang="sr">бинарне разлике датотека</comment> + <comment xml:lang="sv">binära skillnader mellan filer</comment> + <comment xml:lang="tr">dosyalar arasındaki ikilik farklar</comment> <comment xml:lang="uk">двійкова різниця між файлами</comment> <comment xml:lang="zh_CN">文件的二进制区别</comment> <comment xml:lang="zh_TW">檔案間的二進位差異</comment> @@ -38513,7 +39791,7 @@ <comment xml:lang="ga">grianghraif dhigiteacha</comment> <comment xml:lang="gl">fotos dixitais</comment> <comment xml:lang="he">תמונות דיגיטליות</comment> - <comment xml:lang="hr">digitalne fotografije</comment> + <comment xml:lang="hr">Digitalne fotografije</comment> <comment xml:lang="hu">digitális fényképek</comment> <comment xml:lang="ia">Photos digital</comment> <comment xml:lang="id">foto digital</comment> @@ -38530,7 +39808,7 @@ <comment xml:lang="pt">fotografias digitais</comment> <comment xml:lang="pt_BR">Fotos digitais</comment> <comment xml:lang="ro">fotografii digitale</comment> - <comment xml:lang="ru">цифровые фотографии</comment> + <comment xml:lang="ru">Цифровые фотографии</comment> <comment xml:lang="sk">Digitálne fotografie</comment> <comment xml:lang="sl">digitalne fotografije</comment> <comment xml:lang="sq">Fotografi dixhitale</comment> @@ -38550,6 +39828,7 @@ <comment>Video CD</comment> <comment xml:lang="ar">Video CD</comment> + <comment xml:lang="ast">CD de videu</comment> <comment xml:lang="be@latin">Videa CD</comment> <comment xml:lang="bg">CD — видео</comment> <comment xml:lang="ca">Video CD</comment> @@ -38564,7 +39843,7 @@ <comment xml:lang="fi">Video CD</comment> <comment xml:lang="fo">Video CD</comment> <comment xml:lang="fr">CD vidéo</comment> - <comment xml:lang="ga">Video CD</comment> + <comment xml:lang="ga">dlúthdhiosca físe</comment> <comment xml:lang="gl">Video CD</comment> <comment xml:lang="he">תקליטור וידאו</comment> <comment xml:lang="hr">Video CD</comment> @@ -38584,7 +39863,7 @@ <comment xml:lang="pt">Video CD</comment> <comment xml:lang="pt_BR">CD de vídeo</comment> <comment xml:lang="ro">CD video</comment> - <comment xml:lang="ru">видеодиск VCD</comment> + <comment xml:lang="ru">Видео CD</comment> <comment xml:lang="sk">Video CD</comment> <comment xml:lang="sl">Video CD</comment> <comment xml:lang="sq">CD Video</comment> @@ -38604,6 +39883,7 @@ <comment>Super Video CD</comment> <comment xml:lang="ar">Super Video CD</comment> + <comment xml:lang="ast">CD de Super Video</comment> <comment xml:lang="be@latin">Super Video CD</comment> <comment xml:lang="bg">CD — супер видео</comment> <comment xml:lang="ca">Super Video CD</comment> @@ -38618,7 +39898,7 @@ <comment xml:lang="fi">Super Video CD</comment> <comment xml:lang="fo">Super Video CD</comment> <comment xml:lang="fr">Super VCD</comment> - <comment xml:lang="ga">Super Video CD</comment> + <comment xml:lang="ga">dlúthdhiosca Super Video</comment> <comment xml:lang="gl">Super vídeo CD</comment> <comment xml:lang="he">Super Video CD</comment> <comment xml:lang="hr">Super Video CD</comment> @@ -38638,7 +39918,7 @@ <comment xml:lang="pt">Super Video CD</comment> <comment xml:lang="pt_BR">CD de Super Vídeo (SVCD)</comment> <comment xml:lang="ro">Super Video CD</comment> - <comment xml:lang="ru">компакт-диск Super Video</comment> + <comment xml:lang="ru">Super Video CD</comment> <comment xml:lang="sk">Super Video CD</comment> <comment xml:lang="sl">Super Video CD</comment> <comment xml:lang="sq">CD Super Video</comment> @@ -38658,6 +39938,7 @@ <comment>video DVD</comment> <comment xml:lang="ar">DVD مرئي</comment> + <comment xml:lang="ast">DVD de videu</comment> <comment xml:lang="be@latin">videa DVD</comment> <comment xml:lang="bg">DVD — видео</comment> <comment xml:lang="ca">DVD-Video</comment> @@ -38675,7 +39956,7 @@ <comment xml:lang="ga">DVD físe</comment> <comment xml:lang="gl">DVD de vídeo</comment> <comment xml:lang="he">DVD וידאו</comment> - <comment xml:lang="hr">video DVD</comment> + <comment xml:lang="hr">Video DVD</comment> <comment xml:lang="hu">video DVD</comment> <comment xml:lang="ia">DVD video</comment> <comment xml:lang="id">DVD video</comment> @@ -38693,7 +39974,7 @@ <comment xml:lang="pt">DVD vídeo</comment> <comment xml:lang="pt_BR">DVD de vídeo</comment> <comment xml:lang="ro">DVD video</comment> - <comment xml:lang="ru">видео-DVD</comment> + <comment xml:lang="ru">Видео DVD</comment> <comment xml:lang="sk">DVD-Video</comment> <comment xml:lang="sl">video DVD</comment> <comment xml:lang="sq">DVD video</comment> @@ -38750,7 +40031,7 @@ <comment xml:lang="pt">CD áudio</comment> <comment xml:lang="pt_BR">CD de áudio</comment> <comment xml:lang="ro">CD audio</comment> - <comment xml:lang="ru">звуковой CD</comment> + <comment xml:lang="ru">Аудио CD</comment> <comment xml:lang="sk">Zvukové CD</comment> <comment xml:lang="sl">zvočni CD</comment> <comment xml:lang="sq">CD audio</comment> @@ -38800,7 +40081,7 @@ <comment xml:lang="pt">CD vazio</comment> <comment xml:lang="pt_BR">Disco CD vazio</comment> <comment xml:lang="ro">disc gol CD</comment> - <comment xml:lang="ru">чистый компакт-диск</comment> + <comment xml:lang="ru">Чистый диск CD</comment> <comment xml:lang="sk">Prázdny disk CD</comment> <comment xml:lang="sl">prazen CD disk</comment> <comment xml:lang="sq">Disk bosh CD</comment> @@ -38850,7 +40131,7 @@ <comment xml:lang="pt">DVD vazio</comment> <comment xml:lang="pt_BR">Disco DVD vazio</comment> <comment xml:lang="ro">disc gol DVD</comment> - <comment xml:lang="ru">чистый диск DVD</comment> + <comment xml:lang="ru">Чистый диск DVD</comment> <comment xml:lang="sk">Prázdny disk DVD</comment> <comment xml:lang="sl">prazen DVD disk</comment> <comment xml:lang="sq">Disk bosh DVD</comment> @@ -38900,7 +40181,7 @@ <comment xml:lang="pt">Blu-Ray vazio</comment> <comment xml:lang="pt_BR">Disco Blu-ray vazio</comment> <comment xml:lang="ro">disc gol Blu-ray</comment> - <comment xml:lang="ru">чистый диск Blu-ray</comment> + <comment xml:lang="ru">Чистый диск Blu-ray</comment> <comment xml:lang="sk">Prázdny disk Blu-ray</comment> <comment xml:lang="sl">prazen Blu-Ray disk</comment> <comment xml:lang="sq">Disk bosh Blu-ray</comment> @@ -38950,7 +40231,7 @@ <comment xml:lang="pt">HD DVD vazio</comment> <comment xml:lang="pt_BR">Disco HD DVD vazio</comment> <comment xml:lang="ro">disc gol HD DVD</comment> - <comment xml:lang="ru">чистый диск HD DVD</comment> + <comment xml:lang="ru">Чистый диск HD DVD</comment> <comment xml:lang="sk">Prázdny disk HD DVD</comment> <comment xml:lang="sl">prazen HD DVD disk</comment> <comment xml:lang="sq">Disk bosh DVD HD</comment> @@ -39001,7 +40282,7 @@ <comment xml:lang="pt">DVD áudio</comment> <comment xml:lang="pt_BR">DVD de áudio</comment> <comment xml:lang="ro">DVD audio</comment> - <comment xml:lang="ru">звуковой DVD</comment> + <comment xml:lang="ru">Аудио DVD</comment> <comment xml:lang="sk">Zvukové DVD</comment> <comment xml:lang="sl">zvočni DVD</comment> <comment xml:lang="sq">DVD audio</comment> @@ -39022,6 +40303,7 @@ <comment>Blu-ray video disc</comment> <comment xml:lang="ar">قرص بلو-راي مرئي</comment> + <comment xml:lang="ast">Discu Blu-ray de videu</comment> <comment xml:lang="be@latin">Videadysk Blu-ray</comment> <comment xml:lang="bg">Blu-ray — видео</comment> <comment xml:lang="ca">disc de vídeo Blu-Ray</comment> @@ -39056,7 +40338,7 @@ <comment xml:lang="pt">Blu-ray de vídeo</comment> <comment xml:lang="pt_BR">Disco de vídeo Blu-ray</comment> <comment xml:lang="ro">Disc video Blu-ray</comment> - <comment xml:lang="ru">видеодиск Blu-ray</comment> + <comment xml:lang="ru">Видеодиск Blu-ray</comment> <comment xml:lang="sk">Videodisk Blu-ray</comment> <comment xml:lang="sl">Blu-ray video disk</comment> <comment xml:lang="sq">Disk video Blu-ray</comment> @@ -39077,6 +40359,7 @@ <comment>HD DVD video disc</comment> <comment xml:lang="ar">قرص HD DVD مرئي</comment> + <comment xml:lang="ast">Discu HD DVD de videu</comment> <comment xml:lang="be@latin">Videadysk HD DVD</comment> <comment xml:lang="bg">HD DVD — видео</comment> <comment xml:lang="ca">disc de vídeo HD-DVD</comment> @@ -39110,7 +40393,7 @@ <comment xml:lang="pt">HD DVD de vídeo</comment> <comment xml:lang="pt_BR">Disco de vídeo HD DVD</comment> <comment xml:lang="ro">Disc video HD DVD</comment> - <comment xml:lang="ru">видеодиск HD DVD</comment> + <comment xml:lang="ru">Видеодиск HD DVD</comment> <comment xml:lang="sk">Videodisk HD DVD</comment> <comment xml:lang="sl">HD DVD video disk</comment> <comment xml:lang="sq">Disk video DVD HD</comment> @@ -39142,9 +40425,10 @@ <comment xml:lang="eu">e-book irakurlea</comment> <comment xml:lang="fi">e-kirjan lukulaite</comment> <comment xml:lang="fr">lecteur de livre numérique</comment> + <comment xml:lang="ga">léitheoir r-leabhair</comment> <comment xml:lang="gl">lector de libros electrónicos</comment> <comment xml:lang="he">קורא ספרים אלקטרוניים</comment> - <comment xml:lang="hr">čitač e-knjiga</comment> + <comment xml:lang="hr">Čitač e-knjiga</comment> <comment xml:lang="hu">e-könyvolvasó</comment> <comment xml:lang="ia">Lector de libro electronic</comment> <comment xml:lang="id">Pembaca e-book</comment> @@ -39158,7 +40442,7 @@ <comment xml:lang="pl">Czytnik e-booków</comment> <comment xml:lang="pt">leitor de ebooks</comment> <comment xml:lang="pt_BR">Leitor de e-book</comment> - <comment xml:lang="ru">устройство для чтения электронных книг</comment> + <comment xml:lang="ru">Устройство для чтения электронных книг</comment> <comment xml:lang="sk">Čítačka e-kníh</comment> <comment xml:lang="sl">Bralnik elektronskih knjig</comment> <comment xml:lang="sr">читач ел. књига</comment> @@ -39190,7 +40474,7 @@ <comment xml:lang="fi">Picture CD</comment> <comment xml:lang="fo">Picture CD</comment> <comment xml:lang="fr">CD Picture</comment> - <comment xml:lang="ga">Picture CD</comment> + <comment xml:lang="ga">dlúthdhiosca grianghraf</comment> <comment xml:lang="gl">Picture CD</comment> <comment xml:lang="he">תקליטור תמונות</comment> <comment xml:lang="hr">Slikovni CD</comment> @@ -39246,7 +40530,7 @@ <comment xml:lang="ga">seinnteoir iniompartha fuaime</comment> <comment xml:lang="gl">dispositivo de son portábel</comment> <comment xml:lang="he">נגן מוזיקה נייד</comment> - <comment xml:lang="hr">prenosivi audio svirač</comment> + <comment xml:lang="hr">Prenosivi glazbeni svirač</comment> <comment xml:lang="hu">hordozható zenelejátszó</comment> <comment xml:lang="ia">Lector audio portabile</comment> <comment xml:lang="id">pemutar audio portable</comment> @@ -39263,7 +40547,7 @@ <comment xml:lang="pt">reprodutor áudio portátil</comment> <comment xml:lang="pt_BR">Reprodutor de áudio portátil</comment> <comment xml:lang="ro">player audio portabil</comment> - <comment xml:lang="ru">портативный аудиопроигрыватель</comment> + <comment xml:lang="ru">Портативный аудиопроигрыватель</comment> <comment xml:lang="sk">Prenosný hudobný prehrávač</comment> <comment xml:lang="sl">prenosni predvajalnik zvoka</comment> <comment xml:lang="sq">Lexues audio portativ</comment> @@ -39296,7 +40580,7 @@ <comment xml:lang="ga">bogearraí</comment> <comment xml:lang="gl">software</comment> <comment xml:lang="he">תכנה</comment> - <comment xml:lang="hr">softver</comment> + <comment xml:lang="hr">Softver</comment> <comment xml:lang="hu">szoftver</comment> <comment xml:lang="ia">Software</comment> <comment xml:lang="id">peranti lunak</comment> @@ -39314,7 +40598,7 @@ <comment xml:lang="pt">programa</comment> <comment xml:lang="pt_BR">Aplicativo</comment> <comment xml:lang="ro">software</comment> - <comment xml:lang="ru">программное обеспечение</comment> + <comment xml:lang="ru">Программное обеспечение</comment> <comment xml:lang="sk">Softvér</comment> <comment xml:lang="sl">programska oprema</comment> <comment xml:lang="sq">Software</comment> @@ -39362,7 +40646,7 @@ <comment xml:lang="pt">programa UNIX</comment> <comment xml:lang="pt_BR">Aplicativo UNIX</comment> <comment xml:lang="ro">Software UNIX</comment> - <comment xml:lang="ru">программа UNIX</comment> + <comment xml:lang="ru">Программа UNIX</comment> <comment xml:lang="sk">Softvér UNIX</comment> <comment xml:lang="sl">Programska datoteka UNIX</comment> <comment xml:lang="sr">ЈУНИКС-ов софтвер</comment> @@ -39414,7 +40698,7 @@ <comment xml:lang="pt">programa Windows</comment> <comment xml:lang="pt_BR">Programa do Windows</comment> <comment xml:lang="ro">Software Windows</comment> - <comment xml:lang="ru">программа Windows</comment> + <comment xml:lang="ru">Программа Windows</comment> <comment xml:lang="sk">Softvér Windows</comment> <comment xml:lang="sl">Programska oprema za okolje Windows</comment> <comment xml:lang="sr">Виндоузов софтвер</comment> @@ -39430,9 +40714,9 @@ </treemagic> </mime-type> - <mime-type type="application/x-trig"> - + <mime-type type="application/trig"> <comment>TriG RDF document</comment> + <comment xml:lang="ast">Documentu RDF TriG</comment> <comment xml:lang="ca">document TriG RDF</comment> <comment xml:lang="cs">dokument Trig RDF</comment> <comment xml:lang="da">TriG RDF-dokument</comment> @@ -39443,6 +40727,7 @@ <comment xml:lang="eu">TriG RDF dokumentua</comment> <comment xml:lang="fi">TriG RDF -asiakirja</comment> <comment xml:lang="fr">document RDF TriG</comment> + <comment xml:lang="ga">cáipéis RDF TriG</comment> <comment xml:lang="gl">Documento RDF TriG</comment> <comment xml:lang="he">מסמך RDF של TriG</comment> <comment xml:lang="hr">TriG RDF dokument</comment> @@ -39469,6 +40754,7 @@ <expanded-acronym>TriG RDF Graph Triple Language</expanded-acronym> <sub-class-of type="text/plain"/> <glob pattern="*.trig"/> + <alias type="application/x-trig"/> </mime-type> <mime-type type="application/x-iwork-keynote-sffkey"> @@ -39483,6 +40769,7 @@ <comment xml:lang="eu">Apple Keynote 5 aurkezpena</comment> <comment xml:lang="fi">Apple Keynote 5 -esitys</comment> <comment xml:lang="fr">présentation Apple Keynote 5</comment> + <comment xml:lang="ga">láithreoireacht Apple Keynote 5</comment> <comment xml:lang="gl">Presentación de Apple Keynote 5</comment> <comment xml:lang="he">מצגת Apple Keynote 5</comment> <comment xml:lang="hr">Apple Keynote 5 prezentacija</comment> @@ -39528,6 +40815,7 @@ <comment xml:lang="eu">Adobe PageMaker</comment> <comment xml:lang="fi">Adobe PageMaker</comment> <comment xml:lang="fr">Adobe PageMaker</comment> + <comment xml:lang="ga">Adobe PageMaker</comment> <comment xml:lang="gl">Adobe PageMaker</comment> <comment xml:lang="he">Adobe PageMaker</comment> <comment xml:lang="hr">Adobe PageMaker</comment> @@ -39568,6 +40856,7 @@ <comment xml:lang="es">WAD de Doom</comment> <comment xml:lang="eu">Doom WAD</comment> <comment xml:lang="fr">WAD Doom</comment> + <comment xml:lang="ga">WAD Doom</comment> <comment xml:lang="hr">Doom WAD</comment> <comment xml:lang="hu">Doom WAD</comment> <comment xml:lang="ia">WAD pro Doom</comment> @@ -39608,6 +40897,7 @@ <comment xml:lang="eu">Amiga disko irudia</comment> <comment xml:lang="fi">Amiga-levytiedosto</comment> <comment xml:lang="fr">image disque Amiga</comment> + <comment xml:lang="ga">íomhá diosca Amiga</comment> <comment xml:lang="he">דמות כונן Amiga</comment> <comment xml:lang="hr">Amiga slika diska</comment> <comment xml:lang="hu">Amiga lemezkép</comment> @@ -39615,18 +40905,18 @@ <comment xml:lang="id">Image disk Amiga</comment> <comment xml:lang="it">Disco immagine Amiga</comment> <comment xml:lang="kk">Amiga диск бейнесі</comment> - <comment xml:lang="ko">아미가 디스크 이미지</comment> + <comment xml:lang="ko">Amiga 디스크 이미지</comment> <comment xml:lang="oc">imatge disc Amiga</comment> <comment xml:lang="pl">Obraz dysku Amiga</comment> <comment xml:lang="pt">imagem de disco Amiga</comment> <comment xml:lang="pt_BR">Imagem de disco Amiga</comment> - <comment xml:lang="ru">образ диска Amiga</comment> + <comment xml:lang="ru">Образ диска Amiga</comment> <comment xml:lang="sk">Obraz disku Amiga</comment> <comment xml:lang="sr">слика диска Амиге</comment> <comment xml:lang="sv">Amiga-diskavbild</comment> <comment xml:lang="tr">Amiga disk kalıbı</comment> <comment xml:lang="uk">образ диска Amiga</comment> - <comment xml:lang="zh_CN">Amiga 磁盘镜像</comment> + <comment xml:lang="zh_CN">Amiga 磁盘映像</comment> <comment xml:lang="zh_TW">Amiga 磁碟映像檔</comment> <magic priority="50"> <match value="DOS\x00" type="string" offset="0"/> @@ -39637,19 +40927,31 @@ <mime-type type="application/vnd.flatpak"> <comment>Flatpak application bundle</comment> <comment xml:lang="ca">paquet d'aplicació Flatpak</comment> + <comment xml:lang="cs">balíček Flatpak s aplikací</comment> <comment xml:lang="da">Flatpak-programsamling</comment> <comment xml:lang="de">Flatpak-Anwendungspaket</comment> + <comment xml:lang="en_GB">Flatpak application bundle</comment> <comment xml:lang="es">paquete de aplicación Flatpak</comment> + <comment xml:lang="eu">Flatpak aplikazio bilduma</comment> + <comment xml:lang="fi">Flatpak-sovelluspaketti</comment> <comment xml:lang="fr">lot applicatif Flatpak</comment> + <comment xml:lang="ga">burla feidhmchláir Flatpak</comment> + <comment xml:lang="he">חבילת יישומי Flatpak</comment> + <comment xml:lang="hr">Flatpak paket aplikacije</comment> <comment xml:lang="hu">Flatpak alkalmazáscsomag</comment> + <comment xml:lang="id">bundel aplikasi Flatpak</comment> + <comment xml:lang="it">Bundle applicazione Flatpak</comment> <comment xml:lang="kk">Flatpak қолданбалар дестесі</comment> <comment xml:lang="ko">Flatpak 프로그램 번들</comment> <comment xml:lang="pl">Pakiet programu Flatpak</comment> <comment xml:lang="pt_BR">Pacote de aplicativo Flatpak</comment> - <comment xml:lang="ru">пакет приложений Flatpak</comment> + <comment xml:lang="ru">Пакет приложения Flatpak</comment> <comment xml:lang="sk">Balík aplikácií Flatpak</comment> + <comment xml:lang="sr">скуп програма Флатпака</comment> + <comment xml:lang="sv">Flatpak-programbunt</comment> + <comment xml:lang="tr">Flatpak uygulama paketi</comment> <comment xml:lang="uk">пакунок із програмами Flatpak</comment> - <comment xml:lang="zh_CN">Flatpak 应用包</comment> + <comment xml:lang="zh_CN">Flatpak 应用组合包</comment> <comment xml:lang="zh_TW">Flatpak 應用程式套組</comment> <generic-icon name="package-x-generic"/> <magic priority="50"> @@ -39664,17 +40966,29 @@ <mime-type type="application/vnd.flatpak.repo"> <comment>Flatpak repository description</comment> <comment xml:lang="ca">descripció de dipòsit de Flatpak</comment> + <comment xml:lang="cs">popis repozitáře Flatpak</comment> <comment xml:lang="da">Flatpak-arkivbeskrivelse</comment> <comment xml:lang="de">Flatpak-Repositoriumsbeschreibung</comment> + <comment xml:lang="en_GB">Flatpak repository description</comment> <comment xml:lang="es">descripción de repositorio de Flatpak</comment> + <comment xml:lang="eu">Flatpak biltegi deskribapena</comment> + <comment xml:lang="fi">Flatpak-ohjelmistolähdekuvaus</comment> <comment xml:lang="fr">description de dépôt Flatpak</comment> + <comment xml:lang="ga">cur síos ar stórlann Flatpak</comment> + <comment xml:lang="he">תיאור מאגר Flatpak</comment> + <comment xml:lang="hr">Flatpak opis repozitorija</comment> <comment xml:lang="hu">Flatpak tárolóleírás</comment> + <comment xml:lang="id">deskripsi repositori Flatpak</comment> + <comment xml:lang="it">Descrizione repository Flatpack</comment> <comment xml:lang="kk">Flatpak репозиторийі сипаттамасы</comment> <comment xml:lang="ko">Flatpak 저장소 디스크립션</comment> <comment xml:lang="pl">Opis repozytorium Flatpak</comment> <comment xml:lang="pt_BR">Descrição de repositório Flatpak</comment> - <comment xml:lang="ru">описание репозитория Flatpak</comment> + <comment xml:lang="ru">Описание репозитория Flatpak</comment> <comment xml:lang="sk">Popis repozitára Flatpak</comment> + <comment xml:lang="sr">опис ризнице Флатпака</comment> + <comment xml:lang="sv">Flatpak-förrådsbeskrivning</comment> + <comment xml:lang="tr">Flatpak depo açıklaması</comment> <comment xml:lang="uk">опис сховища Flatpak</comment> <comment xml:lang="zh_CN">Flatpak 软件库描述</comment> <comment xml:lang="zh_TW">Flatpak 軟體庫描述</comment> @@ -39688,6 +41002,31 @@ <mime-type type="application/vnd.flatpak.ref"> <comment>Flatpak repository reference</comment> + <comment xml:lang="ca">referència de dipòsit Flatpak</comment> + <comment xml:lang="cs">odkaz na repozitář Flatpak</comment> + <comment xml:lang="de">Flatpak-Repositoriumsreferenz</comment> + <comment xml:lang="en_GB">Flatpak repository reference</comment> + <comment xml:lang="es">referencia a repositorio de Flatpak</comment> + <comment xml:lang="eu">Flatpak biltegi erreferentzia</comment> + <comment xml:lang="fi">Flatpak-ohjelmistolähdeviite</comment> + <comment xml:lang="fr">référence de dépôt Flatpak</comment> + <comment xml:lang="ga">tagairt do stórlann Flatpak</comment> + <comment xml:lang="hr">Flatpak preporučeni repozitorij</comment> + <comment xml:lang="hu">Flatpak tárolóhivatkozás</comment> + <comment xml:lang="id">acuan repositori Flatpak</comment> + <comment xml:lang="it">Riferimento repository Flatpack</comment> + <comment xml:lang="kk">Flatpak репозиторийіне сілтеме</comment> + <comment xml:lang="ko">Flatpak 저장소 참조</comment> + <comment xml:lang="pl">Odwołanie do repozytorium Flatpak</comment> + <comment xml:lang="pt_BR">Referência de repositório Flatpak</comment> + <comment xml:lang="ru">Ссылка на репозиторий Flatpak</comment> + <comment xml:lang="sk">Referencia repozitára Flatpak</comment> + <comment xml:lang="sr">упута ризнице Флатпака</comment> + <comment xml:lang="sv">Flatpak-förrådsreferens</comment> + <comment xml:lang="tr">Flatpak depo başvurusu</comment> + <comment xml:lang="uk">посилання на сховище Flatpak</comment> + <comment xml:lang="zh_CN">Flatpak 软件库引用</comment> + <comment xml:lang="zh_TW">Flatpak 軟體庫參照</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="text/plain"/> <magic priority="50"> @@ -39699,18 +41038,29 @@ <mime-type type="application/vnd.squashfs"> <comment>Squashfs filesystem</comment> <comment xml:lang="ca">Sistema de fitxers Squashfs</comment> + <comment xml:lang="cs">souborový systém Squashfs</comment> <comment xml:lang="da">Squashfs-filsystem</comment> <comment xml:lang="de">Squashfs-Dateisystem</comment> + <comment xml:lang="en_GB">Squashfs filesystem</comment> <comment xml:lang="es">sistema de archivos Squashfs</comment> + <comment xml:lang="eu">Squashfs fitxategi sistema</comment> + <comment xml:lang="fi">Squashfs-tiedostojärjestelmä</comment> <comment xml:lang="fr">système de fichiers Squashfs</comment> + <comment xml:lang="ga">córas comhad Squashfs</comment> <comment xml:lang="he">מערכת קבצים Squashfs</comment> + <comment xml:lang="hr">Squashfs datotečni sustav</comment> <comment xml:lang="hu">Squashfs fájlrendszer</comment> + <comment xml:lang="id">sistem berkas Squashfs</comment> + <comment xml:lang="it">File system squashfs</comment> <comment xml:lang="kk">Squashfs файлдық жүйесі</comment> <comment xml:lang="ko">Squashfs 파일 시스템</comment> <comment xml:lang="pl">System plików SquashFS</comment> <comment xml:lang="pt_BR">Sistema de arquivos Squashfs</comment> - <comment xml:lang="ru">файловая система Squashfs</comment> + <comment xml:lang="ru">Файловая система Squashfs</comment> <comment xml:lang="sk">Systém súborov Squashfs</comment> + <comment xml:lang="sr">систем датотека Сквошфс</comment> + <comment xml:lang="sv">Squashfs-filsystem</comment> + <comment xml:lang="tr">Squashfs dosya sistemi</comment> <comment xml:lang="uk">файлова система squashfs</comment> <comment xml:lang="zh_CN">Squashfs 文件系统</comment> <comment xml:lang="zh_TW">Squashfs 檔案系統</comment> @@ -39721,21 +41071,77 @@ <glob pattern="*.sqsh"/> </mime-type> + + <mime-type type="application/vnd.appimage"> + <comment>AppImage application bundle</comment> + <comment xml:lang="ca">paquet d'aplicació AppImage</comment> + <comment xml:lang="cs">balíček AppImage s aplikací</comment> + <comment xml:lang="da">Applmage-programsamling</comment> + <comment xml:lang="de">AppImage-Anwendungspaket</comment> + <comment xml:lang="en_GB">AppImage application bundle</comment> + <comment xml:lang="es">paquete de aplicación AppImage</comment> + <comment xml:lang="eu">AppImage aplikazio bilduma</comment> + <comment xml:lang="fi">AppImage-sovelluspaketti</comment> + <comment xml:lang="fr">lot applicatif AppImage</comment> + <comment xml:lang="ga">burla feidhmchláir AppImage</comment> + <comment xml:lang="he">חבילת יישומי AppImage</comment> + <comment xml:lang="hr">AppImage paket aplikacije</comment> + <comment xml:lang="hu">AppImage alkalmazáscsomag</comment> + <comment xml:lang="id">bundel aplikasi AppImage</comment> + <comment xml:lang="it">Bundle applicazione AppImage</comment> + <comment xml:lang="kk">AppImage қолданбалар дестесі</comment> + <comment xml:lang="ko">AppImage 프로그램 번들</comment> + <comment xml:lang="pl">Pakiet programu AppImage</comment> + <comment xml:lang="pt_BR">Pacote de aplicativo AppImage</comment> + <comment xml:lang="ru">Пакет приложения AppImage</comment> + <comment xml:lang="sk">Balík aplikácií AppImage</comment> + <comment xml:lang="sr">скуп програма Ап-слике</comment> + <comment xml:lang="sv">AppImage-programbunt</comment> + <comment xml:lang="tr">AppImage uygulama paketi</comment> + <comment xml:lang="uk">пакунок із програмами AppImage</comment> + <comment xml:lang="zh_CN">AppImage 应用组合包</comment> + <comment xml:lang="zh_TW">AppImage 應用程式套組</comment> + <sub-class-of type="application/x-executable"/> + <sub-class-of type="application/vnd.squashfs"/> + <generic-icon name="application-x-executable"/> + <magic priority="50"> + <match value="ELF" type="string" offset="1"> + <match value="0x41" type="byte" offset="8"> + <match value="0x49" type="byte" offset="9"> + <match value="0x02" type="byte" offset="10"/> + </match> + </match> + </match> + </magic> + <glob weight="60" pattern="*.appimage"/> + </mime-type> + <mime-type type="application/vnd.snap"> <comment>Snap package</comment> <comment xml:lang="ca">Paquet Snap</comment> + <comment xml:lang="cs">balíček Snap</comment> <comment xml:lang="da">Snap-pakke</comment> <comment xml:lang="de">Snap-Paket</comment> + <comment xml:lang="en_GB">Snap package</comment> <comment xml:lang="es">paquete Snap</comment> + <comment xml:lang="eu">Snap paketea</comment> + <comment xml:lang="fi">Snap-paketti</comment> <comment xml:lang="fr">paquet Snap</comment> + <comment xml:lang="ga">pacáiste Snap</comment> <comment xml:lang="he">חבילת Snap</comment> + <comment xml:lang="hr">Snap paket</comment> <comment xml:lang="hu">Snap-csomag</comment> + <comment xml:lang="id">paket Snap</comment> + <comment xml:lang="it">Pacchetto snap</comment> <comment xml:lang="kk">Snap дестесі</comment> <comment xml:lang="ko">Snap 패키지</comment> <comment xml:lang="pl">Pakiet Snap</comment> <comment xml:lang="pt_BR">Pacote Snap</comment> - <comment xml:lang="ru">пакет Snap</comment> + <comment xml:lang="ru">Пакет Snap</comment> <comment xml:lang="sk">Balík Snap</comment> + <comment xml:lang="sr">Снап пакет</comment> + <comment xml:lang="sv">Snap-paket</comment> + <comment xml:lang="tr">Snap paketi</comment> <comment xml:lang="uk">пакунок snap</comment> <comment xml:lang="zh_CN">Snap 软件包</comment> <comment xml:lang="zh_TW">Snap 軟體包</comment> @@ -39743,4 +41149,85 @@ <sub-class-of type="application/vnd.squashfs"/> </mime-type> + + <mime-type type="model/stl"> + <comment>STL 3D model</comment> + <acronym>STL</acronym> + <expanded-acronym>StereoLithography</expanded-acronym> + <magic priority="50"> + <match value="solid" type="string" offset="0"/> + <match value="SOLID" type="string" offset="0"/> + </magic> + <glob pattern="*.stl"/> + <alias type="model/x.stl-ascii"/> + <alias type="model/x.stl-binary"/> + </mime-type> + + <mime-type type="text/x.gcode"> + <comment>G-code file</comment> + <comment xml:lang="ca">fitxer G-code</comment> + <comment xml:lang="cs">soubor G-code</comment> + <comment xml:lang="de">G-Code-Datei</comment> + <comment xml:lang="en_GB">G-code file</comment> + <comment xml:lang="es">archivo G-code</comment> + <comment xml:lang="eu">G-code fitxategia</comment> + <comment xml:lang="fi">G-code-tiedosto</comment> + <comment xml:lang="fr">fichier G-code</comment> + <comment xml:lang="ga">comhad G-code</comment> + <comment xml:lang="hr">G-kôd datoteka</comment> + <comment xml:lang="hu">G-code fájl</comment> + <comment xml:lang="id">berkas G-code</comment> + <comment xml:lang="it">File G-code</comment> + <comment xml:lang="kk">G-code файлы</comment> + <comment xml:lang="ko">지-코드 파일</comment> + <comment xml:lang="pl">Plik G-code</comment> + <comment xml:lang="pt_BR">Arquivo G-code</comment> + <comment xml:lang="ru">Файл G-code</comment> + <comment xml:lang="sk">Súbor G-code</comment> + <comment xml:lang="sr">датотека Г-ко̂да</comment> + <comment xml:lang="sv">G-code-fil</comment> + <comment xml:lang="tr">G-code dosyası</comment> + <comment xml:lang="uk">файл G-code</comment> + <comment xml:lang="zh_CN">G-code 文件</comment> + <comment xml:lang="zh_TW">G-code 檔案</comment> + <sub-class-of type="text/plain"/> + <generic-icon name="text-x-generic"/> + <glob pattern="*.gcode"/> + </mime-type> + + <mime-type type="application/x-fds-disk"> + <comment>Nintendo FDS disk image</comment> + <comment xml:lang="ca">Imatge de disc Nintendo FDS</comment> + <comment xml:lang="cs">obraz disku pro Nintendo FDS</comment> + <comment xml:lang="de">Nintendo-FDS-Datenträgerabbild</comment> + <comment xml:lang="en_GB">Nintendo FDS disk image</comment> + <comment xml:lang="es">imagen de disco FDS de Nintendo</comment> + <comment xml:lang="eu">Nintendo FDS disko irudia</comment> + <comment xml:lang="fi">Nintendo FDS -levykuva</comment> + <comment xml:lang="fr">image disque Nintendo FDS</comment> + <comment xml:lang="ga">íomhá diosca Nintendo FDS</comment> + <comment xml:lang="hr">Nintendo FDS slika diska</comment> + <comment xml:lang="hu">Nintendo FDS lemezkép</comment> + <comment xml:lang="id">image disk Nintendo FDS</comment> + <comment xml:lang="it">Immagine disco Nintendo FDS</comment> + <comment xml:lang="kk">Nintendo FDS диск бейнесі</comment> + <comment xml:lang="ko">닌텐도 FDS 디스크 이미지</comment> + <comment xml:lang="pl">Obraz dysku Nintendo FDS</comment> + <comment xml:lang="pt_BR">Imagem de disco Nintendo FDS</comment> + <comment xml:lang="ru">Образ диска Nintendo FDS</comment> + <comment xml:lang="sk">Obraz disku Nintendo FDS</comment> + <comment xml:lang="sr">Нинтендо ФДС слика диска</comment> + <comment xml:lang="sv">Nintendo FDS-diskavbild</comment> + <comment xml:lang="tr">Nintendo FDS disk kalıbı</comment> + <comment xml:lang="uk">образ диска FDS Nintendo</comment> + <comment xml:lang="zh_CN">任天堂 FDS 磁盘映像</comment> + <comment xml:lang="zh_TW">Nintendo FDS 磁碟映像檔</comment> + <acronym>FDS</acronym> + <expanded-acronym>Famicom Disk System</expanded-acronym> + <glob pattern="*.fds"/> + <magic> + <match value="*NINTENDO-HVC*" type="string" offset="1"/> + </magic> + </mime-type> + </mime-info> diff --git a/src/corelib/mimetypes/mimetypes.qrc b/src/corelib/mimetypes/mimetypes.qrc index 19bc1d3e2a..4720bd302a 100644 --- a/src/corelib/mimetypes/mimetypes.qrc +++ b/src/corelib/mimetypes/mimetypes.qrc @@ -1,5 +1,5 @@ <RCC> <qresource prefix="/qt-project.org/qmime/packages"> - <file alias="freedesktop.org.xml">mime/packages/freedesktop.org.xml</file> + <file alias="freedesktop.org.xml" compression-algorithm="best">mime/packages/freedesktop.org.xml</file> </qresource> </RCC> diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index bfe9be559a..24a7a35ea5 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -74,7 +74,6 @@ QMimeDatabasePrivate::QMimeDatabasePrivate() QMimeDatabasePrivate::~QMimeDatabasePrivate() { - qDeleteAll(m_providers); } #ifdef QT_BUILD_INTERNAL @@ -107,52 +106,52 @@ void QMimeDatabasePrivate::loadProviders() mimeDirs.prepend(QLatin1String(":/qt-project.org/qmime")); //qDebug() << "mime dirs:" << mimeDirs; - QVector<QMimeProviderBase *> currentProviders = m_providers; - m_providers.clear(); + Providers currentProviders; + std::swap(m_providers, currentProviders); m_providers.reserve(mimeDirs.size()); for (const QString &mimeDir : qAsConst(mimeDirs)) { const QString cacheFile = mimeDir + QStringLiteral("/mime.cache"); QFileInfo fileInfo(cacheFile); // Check if we already have a provider for this dir - const auto it = std::find_if(currentProviders.begin(), currentProviders.end(), [mimeDir](QMimeProviderBase *prov) { return prov->directory() == mimeDir; }); + const auto predicate = [mimeDir](const std::unique_ptr<QMimeProviderBase> &prov) + { + return prov && prov->directory() == mimeDir; + }; + const auto it = std::find_if(currentProviders.begin(), currentProviders.end(), predicate); if (it == currentProviders.end()) { - QMimeProviderBase *provider = nullptr; + std::unique_ptr<QMimeProviderBase> provider; #if defined(QT_USE_MMAP) if (qEnvironmentVariableIsEmpty("QT_NO_MIME_CACHE") && fileInfo.exists()) { - provider = new QMimeBinaryProvider(this, mimeDir); + provider.reset(new QMimeBinaryProvider(this, mimeDir)); //qDebug() << "Created binary provider for" << mimeDir; if (!provider->isValid()) { - delete provider; - provider = nullptr; + provider.reset(); } } #endif if (!provider) { - provider = new QMimeXMLProvider(this, mimeDir); + provider.reset(new QMimeXMLProvider(this, mimeDir)); //qDebug() << "Created XML provider for" << mimeDir; } - m_providers.append(provider); + m_providers.push_back(std::move(provider)); } else { - QMimeProviderBase *provider = *it; - currentProviders.erase(it); + auto provider = std::move(*it); // take provider out of the vector provider->ensureLoaded(); if (!provider->isValid()) { - delete provider; - provider = new QMimeXMLProvider(this, mimeDir); + provider.reset(new QMimeXMLProvider(this, mimeDir)); //qDebug() << "Created XML provider to replace binary provider for" << mimeDir; } - m_providers.append(provider); + m_providers.push_back(std::move(provider)); } } - qDeleteAll(currentProviders); } -QVector<QMimeProviderBase *> QMimeDatabasePrivate::providers() +const QMimeDatabasePrivate::Providers &QMimeDatabasePrivate::providers() { #ifndef Q_OS_WASM // stub implementation always returns true Q_ASSERT(!mutex.tryLock()); // caller should have locked mutex #endif - if (m_providers.isEmpty()) { + if (m_providers.empty()) { loadProviders(); m_lastCheck.start(); } else { @@ -164,8 +163,7 @@ QVector<QMimeProviderBase *> QMimeDatabasePrivate::providers() QString QMimeDatabasePrivate::resolveAlias(const QString &nameOrAlias) { - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) { + for (const auto &provider : providers()) { const QString ret = provider->resolveAlias(nameOrAlias); if (!ret.isEmpty()) return ret; @@ -179,9 +177,8 @@ QString QMimeDatabasePrivate::resolveAlias(const QString &nameOrAlias) */ QMimeType QMimeDatabasePrivate::mimeTypeForName(const QString &nameOrAlias) { - const auto allProviders = providers(); const QString mimeName = resolveAlias(nameOrAlias); - for (QMimeProviderBase *provider : allProviders) { + for (const auto &provider : providers()) { const QMimeType mime = provider->mimeTypeForName(mimeName); if (mime.isValid()) return mime; @@ -205,8 +202,7 @@ QMimeGlobMatchResult QMimeDatabasePrivate::findByFileName(const QString &fileNam { QMimeGlobMatchResult result; // TODO this parses in the order (local, global). Check that it handles "NOGLOBS" correctly. - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->addFileNameMatches(fileName, result); return result; } @@ -227,8 +223,7 @@ void QMimeDatabasePrivate::loadGenericIcon(QMimeTypePrivate &mimePrivate) QMutexLocker locker(&mutex); if (mimePrivate.fromCache) { mimePrivate.genericIconName.clear(); - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) { + for (const auto &provider : providers()) { provider->loadGenericIcon(mimePrivate); if (!mimePrivate.genericIconName.isEmpty()) break; @@ -241,8 +236,7 @@ void QMimeDatabasePrivate::loadIcon(QMimeTypePrivate &mimePrivate) QMutexLocker locker(&mutex); if (mimePrivate.fromCache) { mimePrivate.iconName.clear(); - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) { + for (const auto &provider : providers()) { provider->loadIcon(mimePrivate); if (!mimePrivate.iconName.isEmpty()) break; @@ -276,8 +270,7 @@ QStringList QMimeDatabasePrivate::parents(const QString &mimeName) { Q_ASSERT(!mutex.tryLock()); QStringList result; - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->addParents(mimeName, result); if (result.isEmpty()) { const QString parent = fallbackParent(mimeName); @@ -291,8 +284,7 @@ QStringList QMimeDatabasePrivate::listAliases(const QString &mimeName) { QMutexLocker locker(&mutex); QStringList result; - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->addAliases(mimeName, result); return result; } @@ -331,8 +323,7 @@ QMimeType QMimeDatabasePrivate::findByData(const QByteArray &data, int *accuracy *accuracyPtr = 0; QMimeType candidate; - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->findByMagic(data, accuracyPtr, candidate); if (candidate.isValid()) @@ -414,8 +405,7 @@ QMimeType QMimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileNa QList<QMimeType> QMimeDatabasePrivate::allMimeTypes() { QList<QMimeType> result; - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->addAllMimeTypes(result); return result; } @@ -432,7 +422,7 @@ bool QMimeDatabasePrivate::inherits(const QString &mime, const QString &parent) toCheck.pop(); const auto parentList = parents(mimeName); for (const QString &par : parentList) - toCheck.push(par); + toCheck.push(resolveAlias(par)); } return false; } diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h index 1e605d9a24..d9cf446d44 100644 --- a/src/corelib/mimetypes/qmimedatabase_p.h +++ b/src/corelib/mimetypes/qmimedatabase_p.h @@ -63,6 +63,8 @@ QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qmutex.h> #include <QtCore/qvector.h> +#include <memory> + QT_BEGIN_NAMESPACE class QIODevice; @@ -72,7 +74,7 @@ class QMimeProviderBase; class QMimeDatabasePrivate { public: - Q_DISABLE_COPY(QMimeDatabasePrivate) + Q_DISABLE_COPY_MOVE(QMimeDatabasePrivate) QMimeDatabasePrivate(); ~QMimeDatabasePrivate(); @@ -102,11 +104,12 @@ public: bool mimeInherits(const QString &mime, const QString &parent); private: - QVector<QMimeProviderBase *> providers(); + using Providers = std::vector<std::unique_ptr<QMimeProviderBase>>; + const Providers &providers(); bool shouldCheck(); void loadProviders(); - mutable QVector<QMimeProviderBase *> m_providers; + mutable Providers m_providers; QElapsedTimer m_lastCheck; public: diff --git a/src/corelib/mimetypes/qmimeglobpattern.cpp b/src/corelib/mimetypes/qmimeglobpattern.cpp index cd42b4da83..e353ba10cc 100644 --- a/src/corelib/mimetypes/qmimeglobpattern.cpp +++ b/src/corelib/mimetypes/qmimeglobpattern.cpp @@ -39,7 +39,7 @@ #include "qmimeglobpattern_p.h" -#include <QRegExp> +#include <QRegularExpression> #include <QStringList> #include <QDebug> @@ -142,8 +142,8 @@ bool QMimeGlobPattern::matchFileName(const QString &inputFilename) const return (m_pattern == filename); // Other (quite rare) patterns, like "*.anim[1-9j]": use slow but correct method - QRegExp rx(m_pattern, Qt::CaseSensitive, QRegExp::WildcardUnix); - return rx.exactMatch(filename); + QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(m_pattern)); + return rx.match(filename).hasMatch(); } static bool isFastPattern(const QString &pattern) diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index aac51184a4..d5b8825972 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -445,10 +445,10 @@ void QMimeBinaryProvider::addAllMimeTypes(QList<QMimeType> &result) loadMimeTypeList(); if (result.isEmpty()) { result.reserve(m_mimetypeNames.count()); - for (const QString &name : m_mimetypeNames) + for (const QString &name : qAsConst(m_mimetypeNames)) result.append(mimeTypeForNameUnchecked(name)); } else { - for (const QString &name : m_mimetypeNames) + for (const QString &name : qAsConst(m_mimetypeNames)) if (std::find_if(result.constBegin(), result.constEnd(), [name](const QMimeType &mime) -> bool { return mime.name() == name; }) == result.constEnd()) result.append(mimeTypeForNameUnchecked(name)); diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index 875ff9e0eb..b6268210c0 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -97,17 +97,17 @@ public: QMimeBinaryProvider(QMimeDatabasePrivate *db, const QString &directory); virtual ~QMimeBinaryProvider(); - virtual bool isValid() override; - virtual QMimeType mimeTypeForName(const QString &name) override; + bool isValid() override; + QMimeType mimeTypeForName(const QString &name) override; void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &result) override; void addParents(const QString &mime, QStringList &result) override; - virtual QString resolveAlias(const QString &name) override; + QString resolveAlias(const QString &name) override; void addAliases(const QString &name, QStringList &result) override; void findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override; void addAllMimeTypes(QList<QMimeType> &result) override; static void loadMimeTypePrivate(QMimeTypePrivate &); - virtual void loadIcon(QMimeTypePrivate &) override; - virtual void loadGenericIcon(QMimeTypePrivate &) override; + void loadIcon(QMimeTypePrivate &) override; + void loadGenericIcon(QMimeTypePrivate &) override; void ensureLoaded() override; private: @@ -135,11 +135,11 @@ public: QMimeXMLProvider(QMimeDatabasePrivate *db, const QString &directory); ~QMimeXMLProvider(); - virtual bool isValid() override; - virtual QMimeType mimeTypeForName(const QString &name) override; + bool isValid() override; + QMimeType mimeTypeForName(const QString &name) override; void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &result) override; void addParents(const QString &mime, QStringList &result) override; - virtual QString resolveAlias(const QString &name) override; + QString resolveAlias(const QString &name) override; void addAliases(const QString &name, QStringList &result) override; void findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override; void addAllMimeTypes(QList<QMimeType> &result) override; diff --git a/src/corelib/mimetypes/qmimetypeparser_p.h b/src/corelib/mimetypes/qmimetypeparser_p.h index 6e3f5fd556..d6a1444592 100644 --- a/src/corelib/mimetypes/qmimetypeparser_p.h +++ b/src/corelib/mimetypes/qmimetypeparser_p.h @@ -64,7 +64,7 @@ class QIODevice; class QMimeTypeParserBase { - Q_DISABLE_COPY(QMimeTypeParserBase) + Q_DISABLE_COPY_MOVE(QMimeTypeParserBase) public: QMimeTypeParserBase() {} diff --git a/src/corelib/platform/platform.pri b/src/corelib/platform/platform.pri new file mode 100644 index 0000000000..1fe2db81b0 --- /dev/null +++ b/src/corelib/platform/platform.pri @@ -0,0 +1 @@ +wasm:include(wasm/wasm.pri) diff --git a/src/corelib/platform/wasm/qstdweb.cpp b/src/corelib/platform/wasm/qstdweb.cpp new file mode 100644 index 0000000000..1afd91d860 --- /dev/null +++ b/src/corelib/platform/wasm/qstdweb.cpp @@ -0,0 +1,236 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qstdweb_p.h" + +#include <emscripten/bind.h> +#include <cstdint> +#include <iostream> + +QT_BEGIN_NAMESPACE + +namespace qstdweb { + +typedef double uint53_t; // see Number.MAX_SAFE_INTEGER + +ArrayBuffer::ArrayBuffer(const emscripten::val &arrayBuffer) + :m_arrayBuffer(arrayBuffer) +{ + +} + +uint32_t ArrayBuffer::byteLength() const +{ + if (m_arrayBuffer.isUndefined() || m_arrayBuffer.isNull()) + return 0; + + return m_arrayBuffer["byteLength"].as<uint32_t>(); +} + +Blob::Blob(const emscripten::val &blob) + :m_blob(blob) +{ + +} + +uint32_t Blob::size() const +{ + return m_blob["size"].as<uint32_t>(); +} + +File::File(const emscripten::val &file) +:m_file(file) +{ + +} + +Blob File::slice(uint64_t begin, uint64_t end) const +{ + return Blob(m_file.call<emscripten::val>("slice", uint53_t(begin), uint53_t(end))); +} + +std::string File::name() const +{ + return m_file["name"].as<std::string>(); +} + +uint64_t File::size() const +{ + return uint64_t(m_file["size"].as<uint53_t>()); +} + +FileList::FileList(const emscripten::val &fileList) + :m_fileList(fileList) +{ + +} + +int FileList::length() const +{ + return m_fileList["length"].as<int>(); +} + +File FileList::item(int index) const +{ + return File(m_fileList[index]); +} + +File FileList::operator[](int index) const +{ + return item(index); +} + +ArrayBuffer FileReader::result() const +{ + return ArrayBuffer(m_fileReader["result"]); +} + +void FileReader::readAsArrayBuffer(const Blob &blob) const +{ + m_fileReader.call<void>("readAsArrayBuffer", blob.m_blob); +} + +void FileReader::onLoad(const std::function<void ()> &onLoad) +{ + m_onLoad.reset(new EventCallback(m_fileReader, "load", onLoad)); +} + +void FileReader::onError(const std::function<void ()> &onError) +{ + m_onError.reset(new EventCallback(m_fileReader, "error", onError)); +} + +void FileReader::onAbort(const std::function<void ()> &onAbort) +{ + m_onAbort.reset(new EventCallback(m_fileReader, "abort", onAbort)); +} + +Uint8Array Uint8Array::heap() +{ + return Uint8Array(heap_()); +} + +Uint8Array::Uint8Array(const emscripten::val &uint8Array) +: m_uint8Array(uint8Array) +{ + +} + +Uint8Array::Uint8Array(const ArrayBuffer &buffer) +: m_uint8Array(Uint8Array::constructor_().new_(buffer.m_arrayBuffer)) +{ + +} + +Uint8Array::Uint8Array(const ArrayBuffer &buffer, uint32_t offset, uint32_t length) +: m_uint8Array(Uint8Array::constructor_().new_(buffer.m_arrayBuffer, offset, length)) +{ + +} + +Uint8Array::Uint8Array(char *buffer, uint32_t size) +:m_uint8Array(Uint8Array::constructor_().new_(Uint8Array::heap().buffer().m_arrayBuffer, uint32_t(buffer), size)) +{ + +} + +ArrayBuffer Uint8Array::buffer() const +{ + return ArrayBuffer(m_uint8Array["buffer"]); +} + +uint32_t Uint8Array::length() const +{ + return m_uint8Array["length"].as<uint32_t>(); +} + +void Uint8Array::set(const Uint8Array &source) +{ + m_uint8Array.call<void>("set", source.m_uint8Array); // copies source content +} + +void Uint8Array::copyTo(char *destination) const +{ + Uint8Array(destination, length()).set(*this); +} + +void Uint8Array::copy(char *destination, const Uint8Array &source) +{ + Uint8Array(destination, source.length()).set(source); +} + +emscripten::val Uint8Array::heap_() +{ + return emscripten::val::module_property("HEAPU8"); +} + +emscripten::val Uint8Array::constructor_() +{ + return emscripten::val::global("Uint8Array"); +} + +// Registers a callback function for a named event on the given element. The event +// name must be the name as returned by the Event.type property: e.g. "load", "error". +EventCallback::EventCallback(emscripten::val element, const std::string &name, const std::function<void ()> &fn) +:m_fn(fn) +{ + element.set(contextPropertyName(name).c_str(), emscripten::val(intptr_t(this))); + element.set((std::string("on") + name).c_str(), emscripten::val::module_property("qtStdWebEventCallbackActivate")); +} + +void EventCallback::activate(emscripten::val event) +{ + emscripten::val target = event["target"]; + std::string eventName = event["type"].as<std::string>(); + EventCallback *that = reinterpret_cast<EventCallback *>(target[contextPropertyName(eventName).c_str()].as<intptr_t>()); + that->m_fn(); +} + +std::string EventCallback::contextPropertyName(const std::string &eventName) +{ + return std::string("data-qtEventCallbackContext") + eventName; +} + +EMSCRIPTEN_BINDINGS(QtStdwebCalback) { + emscripten::function("qtStdWebEventCallbackActivate", &EventCallback::activate); +} + +} // namespace qstdweb + +QT_END_NAMESPACE diff --git a/src/corelib/platform/wasm/qstdweb_p.h b/src/corelib/platform/wasm/qstdweb_p.h new file mode 100644 index 0000000000..75c2ec34b1 --- /dev/null +++ b/src/corelib/platform/wasm/qstdweb_p.h @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSTDWEB_P_H +#define QSTDWEB_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <qglobal.h> +#include <emscripten/val.h> +#include <cstdint> +#include <functional> + +QT_BEGIN_NAMESPACE + +namespace qstdweb { + + // DOM API in C++, implemented using emscripten val.h and bind.h. + // This is private API and can be extened and changed as needed. + + class ArrayBuffer; + class Blob; + class File; + class FileList; + class FileReader; + class Uint8Array; + class EventCallback; + + class ArrayBuffer { + public: + explicit ArrayBuffer(const emscripten::val &arrayBuffer); + uint32_t byteLength() const; + + private: + friend class Uint8Array; + emscripten::val m_arrayBuffer = emscripten::val::undefined(); + }; + + class Blob { + public: + explicit Blob(const emscripten::val &blob); + uint32_t size() const; + + private: + friend class FileReader; + emscripten::val m_blob = emscripten::val::undefined(); + }; + + class File { + public: + File() = default; + explicit File(const emscripten::val &file); + + Blob slice(uint64_t begin, uint64_t end) const; + std::string name() const; + uint64_t size() const; + + private: + emscripten::val m_file = emscripten::val::undefined(); + }; + + class FileList { + public: + FileList() = default; + explicit FileList(const emscripten::val &fileList); + + int length() const; + File item(int index) const; + File operator[](int index) const; + + private: + emscripten::val m_fileList = emscripten::val::undefined(); + }; + + class FileReader { + public: + ArrayBuffer result() const; + void readAsArrayBuffer(const Blob &blob) const; + + void onLoad(const std::function<void ()> &onLoad); + void onError(const std::function<void ()> &onError); + void onAbort(const std::function<void ()> &onAbort); + + private: + emscripten::val m_fileReader = emscripten::val::global("FileReader").new_(); + std::unique_ptr<EventCallback> m_onLoad; + std::unique_ptr<EventCallback> m_onError; + std::unique_ptr<EventCallback> m_onAbort; + }; + + class Uint8Array { + public: + static Uint8Array heap(); + explicit Uint8Array(const emscripten::val &uint8Array); + explicit Uint8Array(const ArrayBuffer &buffer); + Uint8Array(const ArrayBuffer &buffer, uint32_t offset, uint32_t length); + Uint8Array(char *buffer, uint32_t size); + + ArrayBuffer buffer() const; + uint32_t length() const; + void set(const Uint8Array &source); + + void copyTo(char *destination) const; + static void copy(char *destination, const Uint8Array &source); + private: + static emscripten::val heap_(); + static emscripten::val constructor_(); + emscripten::val m_uint8Array = emscripten::val::undefined(); + }; + + class EventCallback + { + public: + EventCallback(emscripten::val element, const std::string &name, const std::function<void ()> &fn); + static void activate(emscripten::val event); + private: + static std::string contextPropertyName(const std::string &eventName); + std::function<void ()> m_fn; + }; +} + +QT_END_NAMESPACE + +#endif diff --git a/src/corelib/platform/wasm/wasm.pri b/src/corelib/platform/wasm/wasm.pri new file mode 100644 index 0000000000..73447030fb --- /dev/null +++ b/src/corelib/platform/wasm/wasm.pri @@ -0,0 +1,3 @@ +INCLUDEDIR += $$PWD +HEADERS += $$PWD/qstdweb_p.h +SOURCES += $$PWD/qstdweb.cpp diff --git a/src/corelib/plugin/qfactoryinterface.h b/src/corelib/plugin/qfactoryinterface.h index f306460690..3aec4ddd55 100644 --- a/src/corelib/plugin/qfactoryinterface.h +++ b/src/corelib/plugin/qfactoryinterface.h @@ -52,8 +52,9 @@ struct Q_CORE_EXPORT QFactoryInterface virtual QStringList keys() const = 0; }; - +#ifndef Q_CLANG_QDOC Q_DECLARE_INTERFACE(QFactoryInterface, "org.qt-project.Qt.QFactoryInterface") +#endif QT_END_NAMESPACE diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index 5aca22497a..676b5047d6 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -71,13 +72,27 @@ inline constexpr unsigned char qPluginArchRequirements() } typedef QObject *(*QtPluginInstanceFunction)(); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) typedef const char *(*QtPluginMetaDataFunction)(); +#else +typedef QPair<const uchar *, size_t> (*QtPluginMetaDataFunction)(); +#endif + struct Q_CORE_EXPORT QStaticPlugin { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +public: + constexpr QStaticPlugin(QtPluginInstanceFunction i, QtPluginMetaDataFunction m) + : instance(i), rawMetaData(m().first), rawMetaDataSize(m().second) + QtPluginInstanceFunction instance; +private: + // ### Qt 6: revise, as this is not standard-layout + const void *rawMetaData; + qsizetype rawMetaDataSize +#elif !defined(Q_QDOC) // Note: This struct is initialized using an initializer list. // As such, it cannot have any new constructors or variables. -#ifndef Q_QDOC QtPluginInstanceFunction instance; QtPluginMetaDataFunction rawMetaData; #else @@ -148,6 +163,15 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin); return plugin; \ } +#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + +# define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS, PLUGINCLASSNAME) \ + Q_EXTERN_C Q_DECL_EXPORT \ + auto qt_plugin_query_metadata() \ + { return qMakePair<const void *, size_t>(qt_pluginMetaData, sizeof qt_pluginMetaData); } \ + Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance() \ + Q_PLUGIN_INSTANCE(PLUGINCLASS) + #else # define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS, PLUGINCLASSNAME) \ diff --git a/src/corelib/serialization/qcborarray.cpp b/src/corelib/serialization/qcborarray.cpp index c56536cdb1..28ae40f3df 100644 --- a/src/corelib/serialization/qcborarray.cpp +++ b/src/corelib/serialization/qcborarray.cpp @@ -39,6 +39,7 @@ #include "qcborarray.h" #include "qcborvalue_p.h" +#include "qdatastream.h" QT_BEGIN_NAMESPACE @@ -1218,4 +1219,23 @@ QDebug operator<<(QDebug dbg, const QCborArray &a) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QCborArray &value) +{ + stream << value.toCborValue().toCbor(); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QCborArray &value) +{ + QByteArray buffer; + stream >> buffer; + QCborParserError parseError{}; + value = QCborValue::fromCbor(buffer, &parseError).toArray(); + if (parseError.error) + stream.setStatus(QDataStream::ReadCorruptData); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h index ed0f4912ba..e06544f245 100644 --- a/src/corelib/serialization/qcborarray.h +++ b/src/corelib/serialization/qcborarray.h @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE class QJsonArray; +class QDataStream; class QCborContainerPrivate; class Q_CORE_EXPORT QCborArray @@ -271,6 +272,7 @@ private: void detach(qsizetype reserve = 0); friend QCborValue; + friend QCborValueRef; explicit QCborArray(QCborContainerPrivate &dd) noexcept; QExplicitlySharedDataPointer<QCborContainerPrivate> d; }; @@ -298,6 +300,11 @@ Q_CORE_EXPORT uint qHash(const QCborArray &array, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborArray &a); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QCborArray &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QCborArray &); +#endif + QT_END_NAMESPACE #endif // QCBORARRAY_H diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h index f8278f1649..3dfe50cd09 100644 --- a/src/corelib/serialization/qcborcommon.h +++ b/src/corelib/serialization/qcborcommon.h @@ -133,6 +133,11 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, QCborKnownTags tg); Q_CORE_EXPORT QDebug operator<<(QDebug, QCborTag tg); #endif +#if !defined(QT_NO_DEBUG_STREAM) +QDataStream &operator<<(QDataStream &ds, QCborSimpleType st); +QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st); +#endif + inline uint qHash(QCborSimpleType tag, uint seed = 0) { return qHash(quint8(tag), seed); diff --git a/src/corelib/serialization/qcbormap.cpp b/src/corelib/serialization/qcbormap.cpp index 33f9249993..4b28ca4a2e 100644 --- a/src/corelib/serialization/qcbormap.cpp +++ b/src/corelib/serialization/qcbormap.cpp @@ -1763,4 +1763,23 @@ QDebug operator<<(QDebug dbg, const QCborMap &m) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QCborMap &value) +{ + stream << value.toCborValue().toCbor(); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QCborMap &value) +{ + QByteArray buffer; + stream >> buffer; + QCborParserError parseError{}; + value = QCborValue::fromCbor(buffer, &parseError).toMap(); + if (parseError.error) + stream.setStatus(QDataStream::ReadCorruptData); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index 3eb2107691..4aea901eef 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -52,6 +52,7 @@ typedef QMap<QString, QVariant> QVariantMap; template <class Key, class T> class QHash; typedef QHash<QString, QVariant> QVariantHash; class QJsonObject; +class QDataStream; class QCborContainerPrivate; class Q_CORE_EXPORT QCborMap @@ -117,6 +118,8 @@ public: QCborValueRef item; // points to the value friend class Iterator; friend class QCborMap; + friend class QCborValue; + friend class QCborValueRef; ConstIterator(QCborContainerPrivate *dd, qsizetype ii) : item(dd, ii) {} public: typedef std::random_access_iterator_tag iterator_category; @@ -170,7 +173,7 @@ public: : QCborMap() { detach(args.size()); - for (auto pair : args) + for (const auto &pair : args) insert(pair.first, pair.second); } ~QCborMap(); @@ -322,9 +325,10 @@ public: QJsonObject toJsonObject() const; private: + friend class QCborValue; + friend class QCborValueRef; void detach(qsizetype reserve = 0); - friend QCborValue; explicit QCborMap(QCborContainerPrivate &dd) noexcept; QExplicitlySharedDataPointer<QCborContainerPrivate> d; }; @@ -352,6 +356,12 @@ Q_CORE_EXPORT uint qHash(const QCborMap &map, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborMap &m); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QCborMap &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QCborMap &); +#endif + + QT_END_NAMESPACE #endif // QCBORMAP_H diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp index d7b81ae324..546f9ffe57 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -44,6 +44,7 @@ #include <qbuffer.h> #include <qdebug.h> #include <qstack.h> +#include <qdatastream.h> QT_BEGIN_NAMESPACE @@ -170,6 +171,21 @@ Q_CORE_EXPORT const char *qt_cbor_simpletype_id(QCborSimpleType st) return nullptr; } +#if !defined(QT_NO_DATASTREAM) +QDataStream &operator<<(QDataStream &ds, QCborSimpleType st) +{ + return ds << quint8(st); +} + +QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st) +{ + quint8 v; + ds >> v; + st = QCborSimpleType(v); + return ds; +} +#endif + #if !defined(QT_NO_DEBUG_STREAM) QDebug operator<<(QDebug dbg, QCborSimpleType st) { diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index 80ef515fd2..c99782bb1e 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -39,7 +39,7 @@ #include "qcborvalue.h" #include "qcborvalue_p.h" - +#include "qdatastream.h" #include "qcborarray.h" #include "qcbormap.h" #include "qcborstream.h" @@ -128,10 +128,11 @@ QT_BEGIN_NAMESPACE Such values are completely valid and may appear in CBOR streams, unlike JSON content and QJsonValue's undefined bit. But like QJsonValue's - Undefined, it is returned by QCborArray::value() when out of range or - QCborMap::operator[] when the key is not found in the container. It is not - possible to tell such a case apart from the value of Undefined, so if that - is required, check the QCborArray size and use the QCborMap iterator API. + Undefined, it is returned by a CBOR container's value() or read-only + operator[] for invalid look-ups (index out of range for QCborArray, or key + not found for QCborMap). It is not possible to tell such a case apart from + the value of Undefined, so if that is required, check the QCborArray size + and use the QCborMap iterator API. \section1 Simple types @@ -457,7 +458,7 @@ QT_BEGIN_NAMESPACE \fn QCborValue::QCborValue(QCborValue &&other) \overload - Moves the contents of the \a other CBorValue object into this one and frees + Moves the contents of the \a other QCborValue object into this one and frees the resources of this one. */ @@ -465,7 +466,7 @@ QT_BEGIN_NAMESPACE \fn QCborValue &&QCborValue::operator=(QCborValue &&other) \overload - Moves the contents of the \a other CBorValue object into this one and frees + Moves the contents of the \a other QCborValue object into this one and frees the resources of this one. Returns a reference to this object. */ @@ -1986,12 +1987,24 @@ QUuid QCborValue::toUuid(const QUuid &defaultValue) const return QUuid::fromRfc4122(byteData->asByteArrayView()); } -QCborArray QCborValue::toArray() const -{ - return toArray(QCborArray()); -} +/*! + \fn QCborArray QCborValue::toArray() const + \fn QCborArray QCborValue::toArray(const QCborArray &defaultValue) const + + Returns the array value stored in this QCborValue, if it is of the array + type. Otherwise, it returns \a defaultValue. + + Note that this function performs no conversion from other types to + QCborArray. + + \sa isArray(), isByteArray(), isMap(), isContainer(), toMap() + */ /*! + \fn QCborArray QCborValueRef::toArray() const + \fn QCborArray QCborValueRef::toArray(const QCborArray &defaultValue) const + \internal + Returns the array value stored in this QCborValue, if it is of the array type. Otherwise, it returns \a defaultValue. @@ -2000,6 +2013,11 @@ QCborArray QCborValue::toArray() const \sa isArray(), isByteArray(), isMap(), isContainer(), toMap() */ +QCborArray QCborValue::toArray() const +{ + return toArray(QCborArray()); +} + QCborArray QCborValue::toArray(const QCborArray &defaultValue) const { if (!isArray()) @@ -2011,12 +2029,24 @@ QCborArray QCborValue::toArray(const QCborArray &defaultValue) const return dd ? QCborArray(*dd) : defaultValue; } -QCborMap QCborValue::toMap() const -{ - return toMap(QCborMap()); -} +/*! + \fn QCborMap QCborValue::toMap() const + \fn QCborMap QCborValue::toMap(const QCborMap &defaultValue) const + + Returns the map value stored in this QCborValue, if it is of the map type. + Otherwise, it returns \a defaultValue. + + Note that this function performs no conversion from other types to + QCborMap. + + \sa isMap(), isArray(), isContainer(), toArray() + */ /*! + \fn QCborMap QCborValueRef::toMap() const + \fn QCborMap QCborValueRef::toMap(const QCborMap &defaultValue) const + \internal + Returns the map value stored in this QCborValue, if it is of the map type. Otherwise, it returns \a defaultValue. @@ -2025,6 +2055,11 @@ QCborMap QCborValue::toMap() const \sa isMap(), isArray(), isContainer(), toArray() */ +QCborMap QCborValue::toMap() const +{ + return toMap(QCborMap()); +} + QCborMap QCborValue::toMap(const QCborMap &defaultValue) const { if (!isMap()) @@ -2077,15 +2112,16 @@ const QCborValue QCborValue::operator[](QLatin1String key) const } /*! + \overload + If this QCborValue is a QCborMap, searches elements for the value whose key - matches \a key. If this is an array, returns the element whose index is \a - key. If there's no matching value in the array or map, or if this + matches \a key. If this is a QCborArray, returns the element whose index is + \a key. If there's no matching value in the array or map, or if this QCborValue object is not an array or map, returns the undefined value. \sa operator[], QCborMap::operator[], QCborMap::value(), QCborMap::find(), QCborArray::operator[], QCborArray::at() */ - const QCborValue QCborValue::operator[](qint64 key) const { if (isMap()) @@ -2096,6 +2132,191 @@ const QCborValue QCborValue::operator[](qint64 key) const } /*! + \internal + */ +static Q_DECL_COLD_FUNCTION QCborMap arrayAsMap(const QCborArray &array) +{ + if (array.size()) + qWarning("Using CBOR array as map forced conversion"); + QCborMap map; + for (qsizetype i = array.size(); i-- > 0; ) { + QCborValue entry = array.at(i); + // Ignore padding entries that may have been added to grow the array + // when inserting past its end: + if (!entry.isInvalid()) + map[i] = entry; + } + return map; +} + +/*! + \internal + */ +static QCborContainerPrivate *maybeDetach(QCborContainerPrivate *container, qsizetype size) +{ + auto replace = QCborContainerPrivate::detach(container, size); + Q_ASSERT(replace); + if (replace != container) { + if (container) + container->deref(); + replace->ref.ref(); + } + return replace; +} + +/*! + \internal + */ +static QCborContainerPrivate *maybeGrow(QCborContainerPrivate *container, qsizetype index) +{ + auto replace = QCborContainerPrivate::grow(container, index); + Q_ASSERT(replace); + if (replace != container) { + if (container) + container->deref(); + replace->ref.ref(); + } + if (replace->elements.size() == index) + replace->append(Undefined()); + else + Q_ASSERT(replace->elements.size() > index); + return replace; +} + +/*! + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map, with the given \a key. When this QCborValue is a QCborMap, + this function is equivalent to the matching operator[] on that map. + + Before returning the reference: if this QCborValue was an array, it is first + converted to a map (so that \c{map[i]} is \c{array[i]} for each index, \c i, + with valid \c{array[i]}); otherwise, if it was not a map it will be + over-written with an empty map. + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +QCborValueRef QCborValue::operator[](const QString &key) +{ + if (!isMap()) + *this = QCborValue(isArray() ? arrayAsMap(toArray()) : QCborMap()); + + const qsizetype size = container ? container->elements.size() : 0; + qsizetype index = size + 1; + bool found = false; + if (container) { + QCborMap proxy(*container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + container = maybeDetach(container, size + (found ? 0 : 2)); + Q_ASSERT(container); + if (!found) { + container->append(key); + container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(container->elements.size() & 1)); + Q_ASSERT(index < container->elements.size()); + return { container, index }; +} + +/*! + \overload + + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map, with the given \a key. When this QCborValue is a QCborMap, + this function is equivalent to the matching operator[] on that map. + + Before returning the reference: if this QCborValue was an array, it is first + converted to a map (so that \c{map[i]} is \c{array[i]} for each index, \c i, + with valid \c{array[i]}); otherwise, if it was not a map it will be + over-written with an empty map. + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +QCborValueRef QCborValue::operator[](QLatin1String key) +{ + if (!isMap()) + *this = QCborValue(isArray() ? arrayAsMap(toArray()) : QCborMap()); + + const qsizetype size = container ? container->elements.size() : 0; + qsizetype index = size + 1; + bool found = false; + if (container) { + QCborMap proxy(*container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + container = maybeDetach(container, size + (found ? 0 : 2)); + Q_ASSERT(container); + if (!found) { + container->append(key); + container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(container->elements.size() & 1)); + Q_ASSERT(index < container->elements.size()); + return { container, index }; +} + +/*! + \overload + + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map or array, with the given \a key. When this QCborValue is a + QCborMap or, for 0 <= key < 0x10000, a QCborArray, this function is + equivalent to the matching operator[] on that map or array. + + Before returning the reference: if this QCborValue was an array but the key + is out of range, the array is first converted to a map (so that \c{map[i]} + is \c{array[i]} for each index, \c i, with valid \c{array[i]}); otherwise, + if it was not a map it will be over-written with an empty map. + + \sa operator[], QCborMap::operator[], QCborMap::value(), + QCborMap::find(), QCborArray::operator[], QCborArray::at() + */ +QCborValueRef QCborValue::operator[](qint64 key) +{ + if (isArray() && key >= 0 && key < 0x10000) { + container = maybeGrow(container, key); + return { container, qsizetype(key) }; + } + if (!isMap()) + *this = QCborValue(isArray() ? arrayAsMap(toArray()) : QCborMap()); + + const qsizetype size = container ? container->elements.size() : 0; + Q_ASSERT(!(size & 1)); + qsizetype index = size + 1; + bool found = false; + if (container) { + QCborMap proxy(*container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + container = maybeDetach(container, size + (found ? 0 : 2)); + Q_ASSERT(container); + if (!found) { + container->append(key); + container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(container->elements.size() & 1)); + Q_ASSERT(index < container->elements.size()); + return { container, index }; +} + +/*! Decodes one item from the CBOR stream found in \a reader and returns the equivalent representation. This function is recursive: if the item is a map or array, it will decode all items found in that map or array, until the @@ -2359,6 +2580,255 @@ QCborValue::Type QCborValueRef::concreteType(QCborValueRef self) noexcept return self.d->elements.at(self.i).type; } +/*! + If this QCborValueRef refers to a QCborMap, searches elements for the value + whose key matches \a key. If there's no key matching \a key in the map or if + this QCborValueRef object is not a map, returns the undefined value. + + This function is equivalent to: + + \code + value.toMap().value(key); + \endcode + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +const QCborValue QCborValueRef::operator[](const QString &key) const +{ + const QCborValue item = d->valueAt(i); + return item[key]; +} + +/*! + \overload + + If this QCborValueRef refers to a QCborMap, searches elements for the value + whose key matches \a key. If there's no key matching \a key in the map or if + this QCborValueRef object is not a map, returns the undefined value. + + This function is equivalent to: + + \code + value.toMap().value(key); + \endcode + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +const QCborValue QCborValueRef::operator[](QLatin1String key) const +{ + const QCborValue item = d->valueAt(i); + return item[key]; +} + +/*! + \overload + + If this QCborValueRef refers to a QCborMap, searches elements for the value + whose key matches \a key. If this is a QCborArray, returns the element whose + index is \a key. If there's no matching value in the array or map, or if + this QCborValueRef object is not an array or map, returns the undefined + value. + + \sa operator[], QCborMap::operator[], QCborMap::value(), + QCborMap::find(), QCborArray::operator[], QCborArray::at() + */ +const QCborValue QCborValueRef::operator[](qint64 key) const +{ + const QCborValue item = d->valueAt(i); + return item[key]; +} + +/*! + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map, with the given \a key. When this QCborValueRef refers to a + QCborMap, this function is equivalent to the matching operator[] on that + map. + + Before returning the reference: if the QCborValue referenced was an array, + it is first converted to a map (so that \c{map[i]} is \c{array[i]} for each + index, \c i, with valid \c{array[i]}); otherwise, if it was not a map it + will be over-written with an empty map. + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +QCborValueRef QCborValueRef::operator[](const QString &key) +{ + auto &e = d->elements[i]; + qsizetype size = 0; + if (e.flags & QtCbor::Element::IsContainer) { + if (e.container) { + if (e.type == QCborValue::Array) { + QCborValue repack = QCborValue(arrayAsMap(QCborArray(*e.container))); + qSwap(e.container, repack.container); + } else if (e.type != QCborValue::Map) { + e.container->deref(); + e.container = nullptr; + } + } + e.type = QCborValue::Map; + if (e.container) + size = e.container->elements.size(); + } else { + // Stomp any prior e.value, replace with a map (that we'll grow) + e.container = nullptr; + e.type = QCborValue::Map; + e.flags = QtCbor::Element::IsContainer; + } + + qsizetype index = size + 1; + bool found = false; + if (e.container) { + QCborMap proxy(*e.container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + e.container = maybeDetach(e.container, size + (found ? 0 : 2)); + Q_ASSERT(e.container); + if (!found) { + e.container->append(key); + e.container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(e.container->elements.size() & 1)); + Q_ASSERT(index < e.container->elements.size()); + return { e.container, index }; +} + +/*! + \overload + + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map, with the given \a key. When this QCborValue is a QCborMap, + this function is equivalent to the matching operator[] on that map. + + Before returning the reference: if the QCborValue referenced was an array, + it is first converted to a map (so that \c{map[i]} is \c{array[i]} for each + index, \c i, with valid \c{array[i]}); otherwise, if it was not a map it + will be over-written with an empty map. + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +QCborValueRef QCborValueRef::operator[](QLatin1String key) +{ + auto &e = d->elements[i]; + qsizetype size = 0; + if (e.flags & QtCbor::Element::IsContainer) { + if (e.container) { + if (e.type == QCborValue::Array) { + QCborValue repack = QCborValue(arrayAsMap(QCborArray(*e.container))); + qSwap(e.container, repack.container); + } else if (e.type != QCborValue::Map) { + e.container->deref(); + e.container = nullptr; + } + } + e.type = QCborValue::Map; + if (e.container) + size = e.container->elements.size(); + } else { + // Stomp any prior e.value, replace with a map (that we'll grow) + e.container = nullptr; + e.type = QCborValue::Map; + e.flags = QtCbor::Element::IsContainer; + } + + qsizetype index = size + 1; + bool found = false; + if (e.container) { + QCborMap proxy(*e.container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + e.container = maybeDetach(e.container, size + (found ? 0 : 2)); + Q_ASSERT(e.container); + if (!found) { + e.container->append(key); + e.container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(e.container->elements.size() & 1)); + Q_ASSERT(index < e.container->elements.size()); + return { e.container, index }; +} + +/*! + \overload + + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map or array, with the given \a key. When this QCborValue is a + QCborMap or, for 0 <= key < 0x10000, a QCborArray, this function is + equivalent to the matching operator[] on that map or array. + + Before returning the reference: if the QCborValue referenced was an array + but the key is out of range, the array is first converted to a map (so that + \c{map[i]} is \c{array[i]} for each index, \c i, with valid \c{array[i]}); + otherwise, if it was not a map it will be over-written with an empty map. + + \sa operator[], QCborMap::operator[], QCborMap::value(), + QCborMap::find(), QCborArray::operator[], QCborArray::at() + */ +QCborValueRef QCborValueRef::operator[](qint64 key) +{ + auto &e = d->elements[i]; + if (e.type == QCborValue::Array && key >= 0 && key < 0x10000) { + e.container = maybeGrow(e.container, key); + return { e.container, qsizetype(key) }; + } + qsizetype size = 0; + if (e.flags & QtCbor::Element::IsContainer) { + if (e.container) { + if (e.type == QCborValue::Array) { + QCborValue repack = QCborValue(arrayAsMap(QCborArray(*e.container))); + qSwap(e.container, repack.container); + } else if (e.type != QCborValue::Map) { + e.container->deref(); + e.container = nullptr; + } + } + e.type = QCborValue::Map; + if (e.container) + size = e.container->elements.size(); + } else { + // Stomp any prior e.value, replace with a map (that we'll grow) + e.container = nullptr; + e.type = QCborValue::Map; + e.flags = QtCbor::Element::IsContainer; + } + Q_ASSERT(!(size & 1)); + + qsizetype index = size + 1; + bool found = false; + if (e.container) { + QCborMap proxy(*e.container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + e.container = maybeDetach(e.container, size + (found ? 0 : 2)); + Q_ASSERT(e.container); + if (!found) { + e.container->append(key); + e.container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(e.container->elements.size() & 1)); + Q_ASSERT(index < e.container->elements.size()); + return { e.container, index }; +} + + inline QCborArray::QCborArray(QCborContainerPrivate &dd) noexcept : d(&dd) { @@ -2481,6 +2951,26 @@ QDebug operator<<(QDebug dbg, const QCborValue &v) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QCborValue &value) +{ + stream << QCborValue(value).toCbor(); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QCborValue &value) +{ + QByteArray buffer; + stream >> buffer; + QCborParserError parseError{}; + value = QCborValue::fromCbor(buffer, &parseError); + if (parseError.error) + stream.setStatus(QDataStream::ReadCorruptData); + return stream; +} +#endif + + QT_END_NAMESPACE #include "qcborarray.cpp" diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index d6ba4e88d8..f542e44c47 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -69,6 +69,7 @@ class QCborArray; class QCborMap; class QCborStreamReader; class QCborStreamWriter; +class QDataStream; struct QCborParserError { @@ -78,6 +79,7 @@ struct QCborParserError QString errorString() const { return error.toString(); } }; +class QCborValueRef; class QCborContainerPrivate; class Q_CORE_EXPORT QCborValue { @@ -242,20 +244,18 @@ public: #endif QUuid toUuid(const QUuid &defaultValue = {}) const; -#ifdef Q_QDOC - QCborArray toArray(const QCborArray &a = {}) const; - QCborMap toMap(const QCborMap &m = {}) const; -#else // only forward-declared, need split functions QCborArray toArray() const; QCborArray toArray(const QCborArray &defaultValue) const; QCborMap toMap() const; QCborMap toMap(const QCborMap &defaultValue) const; -#endif const QCborValue operator[](const QString &key) const; const QCborValue operator[](QLatin1String key) const; const QCborValue operator[](qint64 key) const; + QCborValueRef operator[](qint64 key); + QCborValueRef operator[](QLatin1String key); + QCborValueRef operator[](const QString & key); int compare(const QCborValue &other) const; #if 0 && QT_HAS_INCLUDE(<compare>) @@ -393,16 +393,18 @@ public: QUuid toUuid(const QUuid &defaultValue = {}) const { return concrete().toUuid(defaultValue); } -#ifdef Q_QDOC - QCborArray toArray(const QCborArray &a = {}) const; - QCborMap toMap(const QCborMap &m = {}) const; -#else // only forward-declared, need split functions. Implemented in qcbor{array,map}.h QCborArray toArray() const; QCborArray toArray(const QCborArray &a) const; QCborMap toMap() const; QCborMap toMap(const QCborMap &m) const; -#endif + + const QCborValue operator[](const QString &key) const; + const QCborValue operator[](QLatin1String key) const; + const QCborValue operator[](qint64 key) const; + QCborValueRef operator[](qint64 key); + QCborValueRef operator[](QLatin1String key); + QCborValueRef operator[](const QString & key); int compare(const QCborValue &other) const { return concrete().compare(other); } @@ -434,6 +436,7 @@ public: { return concrete().toDiagnosticNotation(opt); } private: + friend class QCborValue; friend class QCborArray; friend class QCborMap; friend class QCborContainerPrivate; @@ -465,6 +468,11 @@ Q_CORE_EXPORT uint qHash(const QCborValue &value, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborValue &v); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QCborValue &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QCborValue &); +#endif + QT_END_NAMESPACE #if defined(QT_X11_DEFINES_FOUND) diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 951f6c9736..ead6ed5083 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -368,7 +368,7 @@ QDataStream::~QDataStream() /*! \fn QIODevice *QDataStream::device() const - Returns the I/O device currently set, or 0 if no + Returns the I/O device currently set, or \nullptr if no device is currently set. \sa setDevice() @@ -377,7 +377,7 @@ QDataStream::~QDataStream() /*! void QDataStream::setDevice(QIODevice *d) - Sets the I/O device to \a d, which can be 0 + Sets the I/O device to \a d, which can be \nullptr to unset to current I/O device. \sa device() @@ -392,17 +392,18 @@ void QDataStream::setDevice(QIODevice *d) dev = d; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete Unsets the I/O device. - Use setDevice(0) instead. + Use setDevice(nullptr) instead. */ void QDataStream::unsetDevice() { - setDevice(0); + setDevice(nullptr); } - +#endif /*! \fn bool QDataStream::atEnd() const @@ -559,6 +560,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_5_10 Same as Qt_5_6 \value Qt_5_11 Same as Qt_5_6 \value Qt_5_12 Version 18 (Qt 5.12) + \value Qt_5_13 Version 19 (Qt 5.13) \omitvalue Qt_DefaultCompiledVersion \sa setVersion(), version() diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index eae0146553..81134f74b0 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -99,10 +99,11 @@ public: Qt_5_10 = Qt_5_9, Qt_5_11 = Qt_5_10, Qt_5_12 = 18, -#if QT_VERSION >= 0x050d00 + Qt_5_13 = 19, +#if QT_VERSION >= 0x050e00 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #endif - Qt_DefaultCompiledVersion = Qt_5_12 + Qt_DefaultCompiledVersion = Qt_5_13 }; enum ByteOrder { @@ -130,7 +131,10 @@ public: QIODevice *device() const; void setDevice(QIODevice *); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDataStream::setDevice(nullptr) instead") void unsetDevice(); +#endif bool atEnd() const; diff --git a/src/corelib/serialization/qjson_p.h b/src/corelib/serialization/qjson_p.h index feba1faac6..40b2414e4a 100644 --- a/src/corelib/serialization/qjson_p.h +++ b/src/corelib/serialization/qjson_p.h @@ -746,7 +746,7 @@ public: bool valid() const; private: - Q_DISABLE_COPY(Data) + Q_DISABLE_COPY_MOVE(Data) }; } diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index 1187bb03a3..7dfa9b43f0 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -675,6 +675,14 @@ bool QJsonArray::operator!=(const QJsonArray &other) const \sa begin(), constEnd() */ +/*! \fn QJsonArray::const_iterator QJsonArray::cbegin() const + + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item + in the array. + + \sa begin(), cend() +*/ + /*! \fn QJsonArray::iterator QJsonArray::end() Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item @@ -696,6 +704,14 @@ bool QJsonArray::operator!=(const QJsonArray &other) const \sa constBegin(), end() */ +/*! \fn QJsonArray::const_iterator QJsonArray::cend() const + + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary + item after the last item in the array. + + \sa cbegin(), end() +*/ + /*! \fn void QJsonArray::push_back(const QJsonValue &value) This function is provided for STL compatibility. It is equivalent @@ -1259,5 +1275,22 @@ QDebug operator<<(QDebug dbg, const QJsonArray &a) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonArray &array) +{ + QJsonDocument doc{array}; + stream << doc.toJson(QJsonDocument::Compact); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonArray &array) +{ + QJsonDocument doc; + stream >> doc; + array = doc.array(); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index 5dff4a0aa9..ba346fb848 100644 --- a/src/corelib/serialization/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h @@ -214,9 +214,11 @@ public: inline iterator begin() { detach2(); return iterator(this, 0); } inline const_iterator begin() const { return const_iterator(this, 0); } inline const_iterator constBegin() const { return const_iterator(this, 0); } + inline const_iterator cbegin() const { return const_iterator(this, 0); } inline iterator end() { detach2(); return iterator(this, size()); } inline const_iterator end() const { return const_iterator(this, size()); } inline const_iterator constEnd() const { return const_iterator(this, size()); } + inline const_iterator cend() const { return const_iterator(this, size()); } iterator insert(iterator before, const QJsonValue &value) { insert(before.i, value); return before; } iterator erase(iterator it) { removeAt(it.i); return it; } @@ -271,6 +273,11 @@ Q_CORE_EXPORT uint qHash(const QJsonArray &array, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonArray &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonArray &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonArray &); +#endif + QT_END_NAMESPACE #endif // QJSONARRAY_H diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index 4f756df97c..dc5f384108 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -824,7 +824,7 @@ QCborArray QCborArray::fromJsonArray(const QJsonArray &array) { QCborArray a; a.detach(array.size()); - for (const QJsonValue v : array) { + for (const QJsonValue &v : array) { if (v.isString()) a.d->append(v.toString()); else diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index 0cd86d3ded..179a87c699 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -47,6 +47,7 @@ #include "qjsonwriter_p.h" #include "qjsonparser_p.h" #include "qjson_p.h" +#include "qdatastream.h" QT_BEGIN_NAMESPACE @@ -657,4 +658,23 @@ QDebug operator<<(QDebug dbg, const QJsonDocument &o) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonDocument &doc) +{ + stream << doc.toJson(QJsonDocument::Compact); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonDocument &doc) +{ + QByteArray buffer; + stream >> buffer; + QJsonParseError parseError{}; + doc = QJsonDocument::fromJson(buffer, &parseError); + if (parseError.error && !buffer.isEmpty()) + stream.setStatus(QDataStream::ReadCorruptData); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsondocument.h b/src/corelib/serialization/qjsondocument.h index b784890c54..a749439b7d 100644 --- a/src/corelib/serialization/qjsondocument.h +++ b/src/corelib/serialization/qjsondocument.h @@ -172,6 +172,11 @@ Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonDocument) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonDocument &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonDocument &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonDocument &); +#endif + QT_END_NAMESPACE #endif // QJSONDOCUMENT_H diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp index 950bec535b..a9f25a119c 100644 --- a/src/corelib/serialization/qjsonobject.cpp +++ b/src/corelib/serialization/qjsonobject.cpp @@ -1320,4 +1320,21 @@ QDebug operator<<(QDebug dbg, const QJsonObject &o) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonObject &object) +{ + QJsonDocument doc{object}; + stream << doc.toJson(QJsonDocument::Compact); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonObject &object) +{ + QJsonDocument doc; + stream >> doc; + object = doc.object(); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index be42d3747a..80fe6b2f3f 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -268,6 +268,11 @@ Q_CORE_EXPORT uint qHash(const QJsonObject &object, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonObject &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonObject &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonObject &); +#endif + QT_END_NAMESPACE #endif // QJSONOBJECT_H diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp index 2c04da4885..1fc610d7c7 100644 --- a/src/corelib/serialization/qjsonvalue.cpp +++ b/src/corelib/serialization/qjsonvalue.cpp @@ -45,6 +45,7 @@ #include <qvariant.h> #include <qstringlist.h> #include <qdebug.h> +#include "qdatastream.h" #ifndef QT_BOOTSTRAPPED # include <qcborarray.h> @@ -933,4 +934,78 @@ QDebug operator<<(QDebug dbg, const QJsonValue &o) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonValue &v) +{ + quint8 type = v.t; + stream << type; + switch (type) { + case QJsonValue::Undefined: + case QJsonValue::Null: + break; + case QJsonValue::Bool: + stream << v.toBool(); + break; + case QJsonValue::Double: + stream << v.toDouble(); + break; + case QJsonValue::String: + stream << v.toString(); + break; + case QJsonValue::Array: + stream << v.toArray(); + break; + case QJsonValue::Object: + stream << v.toObject(); + break; + } + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonValue &v) +{ + quint8 type; + stream >> type; + switch (type) { + case QJsonValue::Undefined: + case QJsonValue::Null: + v = QJsonValue{QJsonValue::Type(type)}; + break; + case QJsonValue::Bool: { + bool b; + stream >> b; + v = QJsonValue(b); + break; + } case QJsonValue::Double: { + double d; + stream >> d; + v = QJsonValue{d}; + break; + } case QJsonValue::String: { + QString s; + stream >> s; + v = QJsonValue{s}; + break; + } + case QJsonValue::Array: { + QJsonArray a; + stream >> a; + v = QJsonValue{a}; + break; + } + case QJsonValue::Object: { + QJsonObject o; + stream >> o; + v = QJsonValue{o}; + break; + } + default: { + stream.setStatus(QDataStream::ReadCorruptData); + v = QJsonValue{QJsonValue::Undefined}; + } + } + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index d8e121524d..0339eb59f7 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -152,6 +152,7 @@ private: friend class QJsonObject; friend class QCborValue; friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); + friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonValue &); QJsonValue(QJsonPrivate::Data *d, QJsonPrivate::Base *b, const QJsonPrivate::Value& v); void stringDataFromQStringHelper(const QString &string); @@ -218,7 +219,6 @@ private: uint index : 31; }; -#ifndef Q_QDOC // ### Qt 6: Get rid of these fake pointer classes class QJsonValuePtr { @@ -243,7 +243,6 @@ public: QJsonValueRef& operator*() { return valueRef; } QJsonValueRef* operator->() { return &valueRef; } }; -#endif Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonValue) @@ -253,6 +252,11 @@ Q_CORE_EXPORT uint qHash(const QJsonValue &value, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonValue &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonValue &); +#endif + QT_END_NAMESPACE #endif // QJSONVALUE_H diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp index fb7b677b2d..c9ba183a50 100644 --- a/src/corelib/serialization/qtextstream.cpp +++ b/src/corelib/serialization/qtextstream.cpp @@ -1332,7 +1332,7 @@ void QTextStream::setDevice(QIODevice *device) /*! Returns the current device associated with the QTextStream, - or 0 if no device has been assigned. + or \nullptr if no device has been assigned. \sa setDevice(), string() */ @@ -1369,8 +1369,8 @@ void QTextStream::setString(QString *string, QIODevice::OpenMode openMode) } /*! - Returns the current string assigned to the QTextStream, or 0 if no - string has been assigned. + Returns the current string assigned to the QTextStream, or + \nullptr if no string has been assigned. \sa setString(), device() */ diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 827996ee2d..0170be7602 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -223,7 +223,7 @@ QString QXmlStreamReaderPrivate::resolveUndeclaredEntity(const QString &name) The stream reader does \e not take ownership of the resolver. It's the callers responsibility to ensure that the resolver is valid during the entire life-time of the stream reader object, or until - another resolver or 0 is set. + another resolver or \nullptr is set. \sa entityResolver() */ @@ -236,7 +236,7 @@ void QXmlStreamReader::setEntityResolver(QXmlStreamEntityResolver *resolver) /*! \since 4.4 - Returns the entity resolver, or 0 if there is no entity resolver. + Returns the entity resolver, or \nullptr if there is no entity resolver. \sa setEntityResolver() */ @@ -480,7 +480,7 @@ void QXmlStreamReader::setDevice(QIODevice *device) /*! Returns the current device associated with the QXmlStreamReader, - or 0 if no device has been assigned. + or \nullptr if no device has been assigned. \sa setDevice() */ @@ -3315,7 +3315,7 @@ void QXmlStreamWriter::setDevice(QIODevice *device) /*! Returns the current device associated with the QXmlStreamWriter, - or 0 if no device has been assigned. + or \nullptr if no device has been assigned. \sa setDevice() */ diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g index 10bfcd491c..e6328a11ac 100644 --- a/src/corelib/serialization/qxmlstream.g +++ b/src/corelib/serialization/qxmlstream.g @@ -41,6 +41,8 @@ %merged_output qxmlstream_p.h +%expect 4 + %token NOTOKEN %token SPACE " " %token LANGLE "<" @@ -144,7 +146,12 @@ %start document + + /. + +#include <QtCore/private/qglobal_p.h> + template <typename T> class QXmlStreamSimpleStack { T *data; int tos, cap; @@ -155,7 +162,8 @@ public: inline void reserve(int extraCapacity) { if (tos + extraCapacity + 1 > cap) { cap = qMax(tos + extraCapacity + 1, cap << 1 ); - data = reinterpret_cast<T *>(realloc(data, cap * sizeof(T))); + void *ptr = realloc(static_cast<void *>(data), cap * sizeof(T)); + data = reinterpret_cast<T *>(ptr); Q_CHECK_PTR(data); } } @@ -753,7 +761,7 @@ bool QXmlStreamReaderPrivate::parse() state_stack[tos] = 0; return true; } else if (act > 0) { - if (++tos == stack_size-1) + if (++tos >= stack_size-1) reallocateStack(); Value &val = sym_stack[tos]; @@ -890,7 +898,7 @@ doctype_decl ::= langle_bang DOCTYPE qname markup space_opt RANGLE; /. case $rule_number: dtdName = symString(3); - // fall through + Q_FALLTHROUGH(); ./ doctype_decl ::= doctype_decl_start external_id space_opt markup space_opt RANGLE; /. diff --git a/src/corelib/statemachine/qabstractstate.cpp b/src/corelib/statemachine/qabstractstate.cpp index 1a9ad4601d..0db44bc427 100644 --- a/src/corelib/statemachine/qabstractstate.cpp +++ b/src/corelib/statemachine/qabstractstate.cpp @@ -155,7 +155,8 @@ QAbstractState::~QAbstractState() } /*! - Returns this state's parent state, or 0 if the state has no parent state. + Returns this state's parent state, or \nullptr if the state has no + parent state. */ QState *QAbstractState::parentState() const { @@ -166,8 +167,8 @@ QState *QAbstractState::parentState() const } /*! - Returns the state machine that this state is part of, or 0 if the state is - not part of a state machine. + Returns the state machine that this state is part of, or \nullptr if + the state is not part of a state machine. */ QStateMachine *QAbstractState::machine() const { diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index ebf33e120a..d841fd3c8b 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -195,8 +195,8 @@ QAbstractTransition::~QAbstractTransition() } /*! - Returns the source state of this transition, or 0 if this transition has no - source state. + Returns the source state of this transition, or \nullptr if this + transition has no source state. */ QState *QAbstractTransition::sourceState() const { @@ -205,14 +205,14 @@ QState *QAbstractTransition::sourceState() const } /*! - Returns the target state of this transition, or 0 if the transition has no - target. + Returns the target state of this transition, or \nullptr if the + transition has no target. */ QAbstractState *QAbstractTransition::targetState() const { Q_D(const QAbstractTransition); if (d->targetStates.isEmpty()) - return 0; + return nullptr; return d->targetStates.first().data(); } @@ -325,8 +325,8 @@ void QAbstractTransition::setTransitionType(TransitionType type) } /*! - Returns the state machine that this transition is part of, or 0 if the - transition is not part of a state machine. + Returns the state machine that this transition is part of, or + \nullptr if the transition is not part of a state machine. */ QStateMachine *QAbstractTransition::machine() const { diff --git a/src/corelib/statemachine/qsignaleventgenerator_p.h b/src/corelib/statemachine/qsignaleventgenerator_p.h index 271f6317bd..72592b8731 100644 --- a/src/corelib/statemachine/qsignaleventgenerator_p.h +++ b/src/corelib/statemachine/qsignaleventgenerator_p.h @@ -71,7 +71,7 @@ private: void execute(void **_a); private: - Q_DISABLE_COPY(QSignalEventGenerator) + Q_DISABLE_COPY_MOVE(QSignalEventGenerator) }; QT_END_NAMESPACE diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index 0666e600a4..b3de334677 100644 --- a/src/corelib/statemachine/qsignaltransition_p.h +++ b/src/corelib/statemachine/qsignaltransition_p.h @@ -70,7 +70,7 @@ public: void unregister(); void maybeRegister(); - virtual void callOnTransition(QEvent *e) override; + void callOnTransition(QEvent *e) override; const QObject *sender; QByteArray signal; diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index 2531874a87..ae13d4e4cf 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -473,7 +473,8 @@ void QState::onExit(QEvent *event) } /*! - Returns this state's initial state, or 0 if the state has no initial state. + Returns this state's initial state, or \nullptr if the state has no + initial state. */ QAbstractState *QState::initialState() const { diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 7388d496d9..ee3f7be279 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1721,8 +1721,8 @@ QAbstractTransition *QStateMachinePrivate::createInitialTransition() const : QAbstractTransition() { setTargetStates(targets); } protected: - virtual bool eventTest(QEvent *) override { return true; } - virtual void onTransition(QEvent *) override {} + bool eventTest(QEvent *) override { return true; } + void onTransition(QEvent *) override {} }; QState *root = rootState(); diff --git a/src/corelib/thread/qresultstore.cpp b/src/corelib/thread/qresultstore.cpp index e0ce1b4b78..1b3bc20eca 100644 --- a/src/corelib/thread/qresultstore.cpp +++ b/src/corelib/thread/qresultstore.cpp @@ -43,6 +43,21 @@ QT_BEGIN_NAMESPACE namespace QtPrivate { +/*! + \class QtPrivate::ResultItem + \internal + */ + +/*! + \class QtPrivate::ResultIteratorBase + \internal + */ + +/*! + \class QtPrivate::ResultStoreBase + \internal + */ + ResultIteratorBase::ResultIteratorBase() : mapIterator(QMap<int, ResultItem>::const_iterator()), m_vectorIndex(0) { } ResultIteratorBase::ResultIteratorBase(QMap<int, ResultItem>::const_iterator _mapIterator, int _vectorIndex) diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h index 39f0a6d1bb..1f29e8d187 100644 --- a/src/corelib/thread/qresultstore.h +++ b/src/corelib/thread/qresultstore.h @@ -56,7 +56,6 @@ QT_BEGIN_NAMESPACE either individually or in batches. */ -#ifndef Q_QDOC namespace QtPrivate { @@ -196,7 +195,6 @@ public: Q_DECLARE_TYPEINFO(QtPrivate::ResultItem, Q_PRIMITIVE_TYPE); -#endif //Q_QDOC QT_END_NAMESPACE diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 329caa02ba..a13f8ca215 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -100,6 +100,9 @@ #include <sys/neutrino.h> #endif +#if defined(Q_OS_WASM) +#include <emscripten/val.h> +#endif QT_BEGIN_NAMESPACE @@ -499,6 +502,8 @@ int QThread::idealThreadCount() Q_DECL_NOTHROW // as of aug 2008 VxWorks < 6.6 only supports one single core CPU cores = 1; # endif +#elif defined(Q_OS_WASM) + cores = emscripten::val::global("navigator")["hardwareConcurrency"].as<int>(); #else // the rest: Linux, Solaris, AIX, Tru64 cores = (int)sysconf(_SC_NPROCESSORS_ONLN); diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index c8bb384532..70eae9e463 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -3882,9 +3882,7 @@ static qulonglong toIntegral_helper(const char *data, bool *ok, int base, qulong template <typename T> static inline T toIntegral_helper(const char *data, bool *ok, int base) { - // ### Qt6: use std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type - const bool isUnsigned = T(0) < T(-1); - typedef typename QtPrivate::QConditional<isUnsigned, qulonglong, qlonglong>::Type Int64; + using Int64 = typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type; #if defined(QT_CHECK_RANGE) if (base != 0 && (base < 2 || base > 36)) { diff --git a/src/corelib/tools/qbytearraylist.cpp b/src/corelib/tools/qbytearraylist.cpp index c815e766ab..d04555ed4d 100644 --- a/src/corelib/tools/qbytearraylist.cpp +++ b/src/corelib/tools/qbytearraylist.cpp @@ -150,4 +150,26 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char return res; } +/*! + \fn int QByteArrayList::indexOf(const char *needle, int from) const + + Returns the index position of the first occurrence of \a needle in + the list, searching forward from index position \a from. Returns + -1 if no item matched. + + \a needle must be NUL-terminated. + + This overload doesn't require creating a QByteArray, thus saving a + memory allocation and some CPU time. + + \since 5.13 + \overload +*/ + +int QtPrivate::QByteArrayList_indexOf(const QByteArrayList *that, const char *needle, int from) +{ + const auto it = std::find_if(that->begin() + from, that->end(), [needle](const QByteArray &item) { return item == needle; }); + return it == that->end() ? -1 : int(std::distance(that->begin(), it)); +} + QT_END_NAMESPACE diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/tools/qbytearraylist.h index ed014dd157..d69e8bb54b 100644 --- a/src/corelib/tools/qbytearraylist.h +++ b/src/corelib/tools/qbytearraylist.h @@ -50,21 +50,22 @@ QT_BEGIN_NAMESPACE typedef QListIterator<QByteArray> QByteArrayListIterator; typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator; -#ifndef Q_QDOC +#ifndef Q_CLANG_QDOC typedef QList<QByteArray> QByteArrayList; namespace QtPrivate { QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *separator, int separatorLength); + int Q_CORE_EXPORT QByteArrayList_indexOf(const QByteArrayList *that, const char *needle, int from); } #endif -#ifdef Q_QDOC +#ifdef Q_CLANG_QDOC class QByteArrayList : public QList<QByteArray> #else template <> struct QListSpecialMethods<QByteArray> #endif { -#ifndef Q_QDOC +#ifndef Q_CLANG_QDOC protected: ~QListSpecialMethods() {} #endif @@ -76,6 +77,9 @@ public: inline QByteArray join(char sep) const { return QtPrivate::QByteArrayList_join(self(), &sep, 1); } + inline int indexOf(const char *needle, int from = 0) const + { return QtPrivate::QByteArrayList_indexOf(self(), needle, from); } + private: typedef QList<QByteArray> Self; Self *self() { return static_cast<Self *>(this); } diff --git a/src/corelib/tools/qcache.qdoc b/src/corelib/tools/qcache.qdoc index 31dfcb42cf..ffc21318f4 100644 --- a/src/corelib/tools/qcache.qdoc +++ b/src/corelib/tools/qcache.qdoc @@ -70,7 +70,7 @@ To look up objects in the cache, use object() or operator[](). This function looks up an object by its key, and returns either a pointer to the cached object (which is owned by - the cache) or 0. + the cache) or \nullptr. If you want to remove an object from the cache for a particular key, call remove(). This will also delete the object. If you want to @@ -171,7 +171,7 @@ /*! \fn template <class Key, class T> T *QCache<Key, T>::object(const Key &key) const - Returns the object associated with key \a key, or 0 if the key does + Returns the object associated with key \a key, or \nullptr if the key does not exist in the cache. \warning The returned object is owned by QCache and may be @@ -190,7 +190,7 @@ /*! \fn template <class Key, class T> T *QCache<Key, T>::operator[](const Key &key) const - Returns the object associated with key \a key, or 0 if the key does + Returns the object associated with key \a key, or \nullptr if the key does not exist in the cache. This is the same as object(). diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index 361c3fb987..fc2d434a8d 100644 --- a/src/corelib/tools/qcollator_p.h +++ b/src/corelib/tools/qcollator_p.h @@ -122,7 +122,7 @@ public: void cleanup(); private: - Q_DISABLE_COPY(QCollatorPrivate) + Q_DISABLE_COPY_MOVE(QCollatorPrivate) }; class QCollatorSortKeyPrivate : public QSharedData @@ -139,7 +139,7 @@ public: CollatorKeyType m_key; private: - Q_DISABLE_COPY(QCollatorSortKeyPrivate) + Q_DISABLE_COPY_MOVE(QCollatorSortKeyPrivate) }; diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp index 279d6565da..6817d73143 100644 --- a/src/corelib/tools/qcommandlineparser.cpp +++ b/src/corelib/tools/qcommandlineparser.cpp @@ -589,7 +589,7 @@ static void showParserMessage(const QString &message, MessageType type) void QCommandLineParser::process(const QStringList &arguments) { if (!d->parse(arguments)) { - showParserMessage(errorText() + QLatin1Char('\n'), ErrorMessage); + showParserMessage(QCoreApplication::applicationName() + QLatin1String(": ") + errorText() + QLatin1Char('\n'), ErrorMessage); qt_call_post_routines(); ::exit(EXIT_FAILURE); } diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 3cba786865..80d6dada60 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -2183,16 +2183,6 @@ int QTime::elapsed() const typedef QDateTimePrivate::QDateTimeShortData ShortData; typedef QDateTimePrivate::QDateTimeData QDateTimeData; -// Calls the platform variant of tzset -static void qt_tzset() -{ -#if defined(Q_OS_WIN) - _tzset(); -#else - tzset(); -#endif // Q_OS_WIN -} - // Returns the platform variant of timezone, i.e. the standard time offset // The timezone external variable is documented as always holding the // Standard Time offset as seconds west of Greenwich, i.e. UTC+01:00 is -3600 @@ -2290,7 +2280,7 @@ static qint64 qt_mktime(QDate *date, QTime *time, QDateTimePrivate::DaylightStat #if defined(Q_OS_WIN) int hh = local.tm_hour; #endif // Q_OS_WIN - time_t secsSinceEpoch = mktime(&local); + time_t secsSinceEpoch = qMkTime(&local); if (secsSinceEpoch != time_t(-1)) { *date = QDate(local.tm_year + 1900, local.tm_mon + 1, local.tm_mday); *time = QTime(local.tm_hour, local.tm_min, local.tm_sec, msec); @@ -2349,10 +2339,10 @@ static bool qt_localtime(qint64 msecsSinceEpoch, QDate *localDate, QTime *localT tm local; bool valid = false; - // localtime() is required to work as if tzset() was called before it. - // localtime_r() does not have this requirement, so make an explicit call. + // localtime() is specified to work as if it called tzset(). + // localtime_r() does not have this constraint, so make an explicit call. // The explicit call should also request the timezone info be re-parsed. - qt_tzset(); + qTzSet(); #if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) // Use the reentrant version of localtime() where available // as is thread-safe and doesn't use a shared static data area @@ -2434,7 +2424,7 @@ static bool epochMSecsToLocalTime(qint64 msecs, QDate *localDate, QTime *localTi if (msecs < 0) { // Docs state any LocalTime before 1970-01-01 will *not* have any Daylight Time applied // Instead just use the standard offset from UTC to convert to UTC time - qt_tzset(); + qTzSet(); msecsToTime(msecs - qt_timezone() * 1000, localDate, localTime); if (daylightStatus) *daylightStatus = QDateTimePrivate::StandardTime; @@ -2497,7 +2487,7 @@ static qint64 localMSecsToEpochMSecs(qint64 localMsecs, } } else { // If we don't call mktime then need to call tzset to get offset - qt_tzset(); + qTzSet(); } // Time is clearly before 1970-01-01 so just use standard offset to convert qint64 utcMsecs = localMsecs + qt_timezone() * 1000; diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h index 2f98cf5cc1..63be0952ff 100644 --- a/src/corelib/tools/qfreelist_p.h +++ b/src/corelib/tools/qfreelist_p.h @@ -187,7 +187,7 @@ class QFreeList QAtomicInt _next; // QFreeList is not copyable - Q_DISABLE_COPY(QFreeList) + Q_DISABLE_COPY_MOVE(QFreeList) public: Q_DECL_CONSTEXPR inline QFreeList(); diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 17aba8035b..1de93ff9e1 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -48,6 +48,23 @@ QT_BEGIN_NAMESPACE /* + ### Qt 5: + ### This needs to be removed for next releases of Qt. It is a workaround for vc++ because + ### Qt exports QPolygon and QPolygonF that inherit QVector<QPoint> and + ### QVector<QPointF> respectively. +*/ + +#if defined(Q_CC_MSVC) && defined(QT_BUILD_CORE_LIB) +QT_BEGIN_INCLUDE_NAMESPACE +#include <QtCore/qpoint.h> +QT_END_INCLUDE_NAMESPACE + +template class Q_CORE_EXPORT QVector<QPointF>; +template class Q_CORE_EXPORT QVector<QPoint>; +#endif + + +/* QList as an array-list combines the easy-of-use of a random access interface with fast list operations and the low memory management overhead of an array. Accessing elements by index, @@ -948,6 +965,13 @@ void **QListData::erase(void **xi) /*! \fn template <class T> void QList<T>::swap(int i, int j) + \obsolete Use swapItemsAt() + + \sa move(), swapItemsAt() +*/ + +/*! \fn template <class T> void QList<T>::swapItemsAt(int i, int j) + Exchange the item at index position \a i with the item at index position \a j. This function assumes that both \a i and \a j are at least 0 but less than size(). To avoid failure, test that both diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 49ccbc9c9f..6643288bd5 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -45,6 +45,7 @@ #include <QtCore/qrefcount.h> #include <QtCore/qarraydata.h> #include <QtCore/qhashfunctions.h> +#include <QtCore/qvector.h> #include <iterator> #include <list> @@ -117,6 +118,11 @@ struct Q_CORE_EXPORT QListData { inline void **end() const Q_DECL_NOTHROW { return d->array + d->end; } }; +namespace QtPrivate { + template <typename V, typename U> int indexOf(const QList<V> &list, const U &u, int from); + template <typename V, typename U> int lastIndexOf(const QList<V> &list, const U &u, int from); +} + template <typename T> class QList #ifndef Q_QDOC @@ -135,6 +141,8 @@ public: QListData::InlineWithPaddingLayout >::type>::type {}; private: + template <typename V, typename U> friend int QtPrivate::indexOf(const QList<V> &list, const U &u, int from); + template <typename V, typename U> friend int QtPrivate::lastIndexOf(const QList<V> &list, const U &u, int from); struct Node { void *v; #if defined(Q_CC_BOR) Q_INLINE_TEMPLATE T &t(); @@ -213,7 +221,11 @@ public: T takeFirst(); T takeLast(); void move(int from, int to); - void swap(int i, int j); + void swapItemsAt(int i, int j); +#if QT_DEPRECATED_SINCE(5, 13) && QT_VERSION < QT_VERSION_CHECK(6,0,0) + QT_DEPRECATED_X("Use QList<T>::swapItemsAt()") + void swap(int i, int j) { swapItemsAt(i, j); } +#endif int indexOf(const T &t, int from = 0) const; int lastIndexOf(const T &t, int from = -1) const; bool contains(const T &t) const; @@ -689,7 +701,7 @@ inline void QList<T>::replace(int i, const T &t) } template <typename T> -inline void QList<T>::swap(int i, int j) +inline void QList<T>::swapItemsAt(int i, int j) { Q_ASSERT_X(i >= 0 && i < p.size() && j >= 0 && j < p.size(), "QList<T>::swap", "index out of range"); @@ -970,35 +982,57 @@ inline void QList<T>::append(const QList<T> &t) template <typename T> Q_OUTOFLINE_TEMPLATE int QList<T>::indexOf(const T &t, int from) const { + return QtPrivate::indexOf<T, T>(*this, t, from); +} + +namespace QtPrivate +{ +template <typename T, typename U> +int indexOf(const QList<T> &list, const U &u, int from) +{ + typedef typename QList<T>::Node Node; + if (from < 0) - from = qMax(from + p.size(), 0); - if (from < p.size()) { - Node *n = reinterpret_cast<Node *>(p.at(from -1)); - Node *e = reinterpret_cast<Node *>(p.end()); + from = qMax(from + list.p.size(), 0); + if (from < list.p.size()) { + Node *n = reinterpret_cast<Node *>(list.p.at(from -1)); + Node *e = reinterpret_cast<Node *>(list.p.end()); while (++n != e) - if (n->t() == t) - return int(n - reinterpret_cast<Node *>(p.begin())); + if (n->t() == u) + return int(n - reinterpret_cast<Node *>(list.p.begin())); } return -1; } +} template <typename T> Q_OUTOFLINE_TEMPLATE int QList<T>::lastIndexOf(const T &t, int from) const { + return QtPrivate::lastIndexOf<T, T>(*this, t, from); +} + +namespace QtPrivate +{ +template <typename T, typename U> +int lastIndexOf(const QList<T> &list, const U &u, int from) +{ + typedef typename QList<T>::Node Node; + if (from < 0) - from += p.size(); - else if (from >= p.size()) - from = p.size()-1; + from += list.p.size(); + else if (from >= list.p.size()) + from = list.p.size()-1; if (from >= 0) { - Node *b = reinterpret_cast<Node *>(p.begin()); - Node *n = reinterpret_cast<Node *>(p.at(from + 1)); + Node *b = reinterpret_cast<Node *>(list.p.begin()); + Node *n = reinterpret_cast<Node *>(list.p.at(from + 1)); while (n-- != b) { - if (n->t() == t) + if (n->t() == u) return n - b; } } return -1; } +} template <typename T> Q_OUTOFLINE_TEMPLATE bool QList<T>::contains(const T &t) const @@ -1051,6 +1085,37 @@ inline int QList<T>::count_impl(const T &t, QListData::ArrayCompatibleLayout) co t)); } +template <typename T> +Q_OUTOFLINE_TEMPLATE QVector<T> QList<T>::toVector() const +{ + QVector<T> result(size()); + for (int i = 0; i < size(); ++i) + result[i] = at(i); + return result; +} + +template <typename T> +QList<T> QList<T>::fromVector(const QVector<T> &vector) +{ + return vector.toList(); +} + +template <typename T> +Q_OUTOFLINE_TEMPLATE QList<T> QVector<T>::toList() const +{ + QList<T> result; + result.reserve(size()); + for (int i = 0; i < size(); ++i) + result.append(at(i)); + return result; +} + +template <typename T> +QVector<T> QVector<T>::fromList(const QList<T> &list) +{ + return list.toVector(); +} + Q_DECLARE_SEQUENTIAL_ITERATOR(List) Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(List) diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index df768fb875..79ecdb0a54 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -620,13 +620,18 @@ static QLocalePrivate *c_private() */ /*! - Constructs a QSystemLocale object. The constructor will automatically - install this object as the system locale and remove any earlier installed - system locales. + Constructs a QSystemLocale object. + + The constructor will automatically install this object as the system locale, + if there's not one active. It also resets the flag that'll prompt + QLocale::system() to re-initialize its data, so that instantiating a + QSystemLocale transiently (doesn't install the transient as system locale if + there was one already and) triggers an update to the system locale's data. */ QSystemLocale::QSystemLocale() { - _systemLocale = this; + if (!_systemLocale) + _systemLocale = this; globalLocaleData.m_language_id = 0; } @@ -656,15 +661,17 @@ static const QSystemLocale *systemLocale() return QSystemLocale_globalSystemLocale(); } -void QLocalePrivate::updateSystemPrivate() +static void updateSystemPrivate() { - // this function is NOT thread-safe! + // This function is NOT thread-safe! + // It *should not* be called by anything but systemData() const QSystemLocale *sys_locale = systemLocale(); // tell the object that the system locale has changed. sys_locale->query(QSystemLocale::LocaleChanged, QVariant()); - globalLocaleData = *sys_locale->fallbackUiLocale().d->m_data; + // Populate global with fallback as basis: + globalLocaleData = *sys_locale->fallbackUiLocaleData(); QVariant res = sys_locale->query(QSystemLocale::LanguageId, QVariant()); if (!res.isNull()) { @@ -715,7 +722,7 @@ static const QLocaleData *systemData() static QBasicMutex systemDataMutex; systemDataMutex.lock(); if (globalLocaleData.m_language_id == 0) - QLocalePrivate::updateSystemPrivate(); + updateSystemPrivate(); systemDataMutex.unlock(); } @@ -1180,9 +1187,7 @@ static qulonglong toIntegral_helper(const QLocaleData *d, QStringView str, bool template <typename T> static inline T toIntegral_helper(const QLocalePrivate *d, QStringView str, bool *ok) { - // ### Qt6: use std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type - const bool isUnsigned = T(0) < T(-1); - typedef typename QtPrivate::QConditional<isUnsigned, qulonglong, qlonglong>::Type Int64; + using Int64 = typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type; // we select the right overload by the last, unused parameter Int64 val = toIntegral_helper(d->m_data, str, ok, d->m_numberOptions, Int64()); @@ -2365,7 +2370,6 @@ QString QLocale::toString(double i, char f, int prec) const QLocale QLocale::system() { - // this function is NOT thread-safe! QT_PREPEND_NAMESPACE(systemData)(); // trigger updating of the system data if necessary if (systemLocalePrivate.isDestroyed()) return QLocale(QLocale::C); @@ -3891,6 +3895,19 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci \sa formattedDataSize() */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \obsolete + + Use the const version instead. +*/ +QString QLocale::formattedDataSize(qint64 bytes, int precision, DataSizeFormats format) +{ + const auto *that = this; + return that->formattedDataSize(bytes, precision, format); +} +#endif + /*! \since 5.10 @@ -3907,7 +3924,7 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci whereas \c DataSizeSIFormat uses the older SI quantifiers k, M, etc., and \c DataSizeTraditionalFormat abuses them. */ -QString QLocale::formattedDataSize(qint64 bytes, int precision, DataSizeFormats format) +QString QLocale::formattedDataSize(qint64 bytes, int precision, DataSizeFormats format) const { int power, base = 1000; if (!bytes) { diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index f3afb8c406..1fbd96c6d5 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -436,6 +436,11 @@ public: Cantonese = 357, Osage = 358, Tangut = 359, + Ido = 360, + Lojban = 361, + Sicilian = 362, + SouthernKurdish = 363, + WesternBalochi = 364, Afan = Oromo, Bhutani = Dzongkha, @@ -452,7 +457,7 @@ public: Twi = Akan, Uigur = Uighur, - LastLanguage = Tangut + LastLanguage = WesternBalochi }; enum Script { @@ -1061,7 +1066,10 @@ public: { return toCurrencyString(double(i), symbol, precision); } #endif +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QString formattedDataSize(qint64 bytes, int precision = 2, DataSizeFormats format = DataSizeIecFormat); +#endif + QString formattedDataSize(qint64 bytes, int precision = 2, DataSizeFormats format = DataSizeIecFormat) const; QStringList uiLanguages() const; @@ -1091,6 +1099,7 @@ public: private: QLocale(QLocalePrivate &dd); friend class QLocalePrivate; + friend class QSystemLocale; friend Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed) Q_DECL_NOTHROW; QSharedDataPointer<QLocalePrivate> d; diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index 76ca909d83..b852c10b8d 100644 --- a/src/corelib/tools/qlocale.qdoc +++ b/src/corelib/tools/qlocale.qdoc @@ -105,42 +105,80 @@ \value AnyLanguage \value C The "C" locale is identical in behavior to English/UnitedStates. + \value Abkhazian - \value Oromo \value Afan Obsolete, please use Oromo \value Afar \value Afrikaans + \value Aghem + \value Ahom Since Qt 5.7 + \value Akan + \value Akkadian Since Qt 5.1 \value Akoose Since Qt 5.3 \value Albanian + \value AmericanSignLanguage Since Qt 5.7 \value Amharic + \value AncientEgyptian Since Qt 5.1 + \value AncientGreek Since Qt 5.1 + \value AncientNorthArabian Since Qt 5.5 \value Arabic + \value Aragonese Since Qt 5.1 + \value Aramaic Since Qt 5.1 + \value ArdhamagadhiPrakrit Since Qt 5.7 \value Armenian \value Assamese + \value Asturian + \value Asu + \value Atsam \value Avaric + \value Avestan \value Aymara \value Azerbaijani + \value Bafia + \value Balinese Since Qt 5.1 + \value Bambara + \value Bamun Since Qt 5.1 + \value Basaa \value Bashkir \value Basque + \value Bassa Since Qt 5.5 + \value BatakToba Since Qt 5.1 + \value Belarusian + \value Bemba + \value Bena \value Bengali - \value Dzongkha + \value Bhojpuri Since Qt 5.7 \value Bhutani Obsolete, please use Dzongkha \value Bihari \value Bislama - \value Bosnian + \value Blin \value Bodo + \value Bosnian \value Breton + \value Buginese Since Qt 5.1 + \value Buhid Since Qt 5.1 \value Bulgarian \value Burmese - \value Belarusian \value Byelorussian Obsolete, please use Belarusian - \value Khmer \value Cambodian Obsolete, please use Khmer + \value Cantonese Since Qt 5.7 + \value Carian Since Qt 5.1 \value Catalan + \value CentralKurdish Since Qt 5.5 + \value CentralMoroccoTamazight + \value Chakma Since Qt 5.1 \value Chamorro \value Chechen + \value Cherokee + \value Chewa Obsolete, please use Nyanja + \value Chiga \value Chinese \value Church \value Chuvash + \value ClassicalMandaic Since Qt 5.1 + \value Colognian + \value CongoSwahili + \value Coptic Since Qt 5.1 \value Cornish \value Corsican \value Cree @@ -148,33 +186,58 @@ \value Czech \value Danish \value Divehi + \value Dogri Since Qt 5.1 + \value Duala \value Dutch + \value Dzongkha + \value EasternCham Since Qt 5.1 + \value EasternKayah Since Qt 5.1 + \value Embu \value English \value Esperanto \value Estonian + \value Etruscan Since Qt 5.1 + \value Ewe + \value Ewondo \value Faroese \value Fijian + \value Filipino \value Finnish \value French - \value WesternFrisian same as Frisian \value Frisian same as WesternFrisian + \value Friulian + \value Fulah + \value Ga \value Gaelic \value Galician + \value Ganda + \value Geez \value Georgian \value German + \value Gothic Since Qt 5.1 \value Greek \value Greenlandic \value Guarani \value Gujarati + \value Gusii \value Haitian + \value Hanunoo Since Qt 5.1 \value Hausa + \value Hawaiian \value Hebrew \value Herero + \value HieroglyphicLuwian Since Qt 5.7 \value Hindi \value HiriMotu + \value HmongNjua Since Qt 5.5 + \value Ho Since Qt 5.5 \value Hungarian \value Icelandic + \value Ido Since Qt 5.12 + \value Igbo + \value InariSami Since Qt 5.5 \value Indonesian + \value Ingush Since Qt 5.1 \value Interlingua \value Interlingue \value Inuktitut @@ -183,306 +246,244 @@ \value Italian \value Japanese \value Javanese + \value Jju + \value JolaFonyi + \value Kabuverdianu + \value Kabyle + \value Kako + \value Kalenjin + \value Kamba \value Kannada \value Kanuri \value Kashmiri \value Kazakh + \value Kenyang Since Qt 5.5 + \value Khmer + \value Kiche Since Qt 5.5 + \value Kikuyu \value Kinyarwanda \value Kirghiz \value Komi \value Kongo + \value Konkani \value Korean + \value Koro + \value KoyraboroSenni + \value KoyraChiini + \value Kpelle \value Kurdish - \value Rundi \value Kurundi Obsolete, please use Rundi \value Kwanyama + \value Kwasio \value Lakota Since Qt 5.3 + \value Langi \value Lao + \value LargeFloweryMiao Since Qt 5.1 \value Latin \value Latvian + \value Lepcha Since Qt 5.1 + \value Lezghian Since Qt 5.5 \value Limburgish + \value Limbu Since Qt 5.1 + \value LinearA Since Qt 5.5 \value Lingala + \value Lisu Since Qt 5.1 + \value LiteraryChinese Since Qt 5.7 \value Lithuanian + \value Lojban Since Qt 5.12 + \value LowerSorbian Since Qt 5.5 + \value LowGerman \value LubaKatanga + \value LuleSami Since Qt 5.5 + \value Luo + \value Lu Since Qt 5.1 \value Luxembourgish - \value Marshallese + \value Luyia + \value Lycian Since Qt 5.1 + \value Lydian Since Qt 5.1 \value Macedonian + \value Machame + \value Maithili Since Qt 5.5 + \value MakhuwaMeetto + \value Makonde \value Malagasy \value Malay \value Malayalam \value Maltese + \value Mandingo Since Qt 5.1 + \value ManichaeanMiddlePersian Since Qt 5.5 + \value Manipuri Since Qt 5.1 \value Manx \value Maori + \value Mapuche Since Qt 5.5 \value Marathi + \value Marshallese + \value Masai + \value Mazanderani Since Qt 5.7 + \value Mende Since Qt 5.5 + \value Meroitic Since Qt 5.1 + \value Meru + \value Meta + \value Mohawk Since Qt 5.5 \value Moldavian Obsolete, please use Romanian \value Mongolian + \value Mono Since Qt 5.5 + \value Morisyen + \value Mru Since Qt 5.7 + \value Mundang + \value Nama \value NauruLanguage \value Navaho \value Ndonga \value Nepali - \value Norwegian same as NorwegianBokmal + \value Newari Since Qt 5.7 + \value Ngiemboon + \value Ngomba + \value Nko Since Qt 5.5 + \value NorthernLuri Since Qt 5.7 + \value NorthernSami + \value NorthernSotho + \value NorthernThai Since Qt 5.1 + \value NorthNdebele \value NorwegianBokmal same as Norwegian \value NorwegianNynorsk + \value Norwegian same as NorwegianBokmal + \value Nuer + \value Nyanja + \value Nyankole \value Occitan \value Ojibwa + \value OldIrish Since Qt 5.1 + \value OldNorse Since Qt 5.1 + \value OldPersian Since Qt 5.1 + \value OldTurkish Since Qt 5.1 \value Oriya + \value Oromo + \value Osage Since Qt 5.7 \value Ossetic + \value Pahlavi Since Qt 5.1 + \value Palauan Since Qt 5.7 \value Pali + \value Papiamento Since Qt 5.7 + \value Parthian Since Qt 5.1 \value Pashto \value Persian + \value Phoenician Since Qt 5.1 \value Polish \value Portuguese + \value PrakritLanguage Since Qt 5.1 + \value Prussian Since Qt 5.5 \value Punjabi \value Quechua - \value Romansh + \value Rejang Since Qt 5.1 \value RhaetoRomance Obsolete, please use Romansh \value Romanian + \value Romansh + \value Rombo + \value Rundi \value Russian + \value Rwa + \value Sabaean Since Qt 5.1 + \value Saho + \value Sakha + \value Samaritan Since Qt 5.1 + \value Samburu \value Samoan \value Sango + \value Sangu \value Sanskrit + \value Santali Since Qt 5.1 + \value Saraiki Since Qt 5.7 \value Sardinian + \value Saurashtra Since Qt 5.1 + \value Sena \value Serbian \value SerboCroatian Obsolete, please use Serbian - \value SouthernSotho - \value Tswana + \value Shambala \value Shona + \value SichuanYi + \value Sicilian Since Qt 5.12 + \value Sidamo \value Sindhi \value Sinhala - \value Swati + \value SkoltSami Since Qt 5.5 \value Slovak \value Slovenian + \value Soga \value Somali + \value Sora Since Qt 5.1 + \value SouthernKurdish Since Qt 5.12 + \value SouthernSami Since Qt 5.5 + \value SouthernSotho + \value SouthNdebele \value Spanish \value StandardMoroccanTamazight Since Qt 5.3 \value Sundanese \value Swahili + \value Swati \value Swedish + \value SwissGerman + \value Sylheti Since Qt 5.1 + \value Syriac + \value Tachelhit \value Tagalog Obsolete, please use Filipino + \value Tagbanwa Since Qt 5.1 \value Tahitian + \value TaiDam Since Qt 5.1 + \value TaiNua Since Qt 5.1 + \value Taita \value Tajik \value Tamil + \value Tangut Since Qt 5.7 + \value Taroko + \value Tasawaq \value Tatar + \value TedimChin Since Qt 5.5 \value Telugu + \value Teso \value Thai \value Tibetan + \value Tigre \value Tigrinya + \value TokelauLanguage Since Qt 5.7 + \value TokPisin Since Qt 5.7 \value Tongan \value Tsonga + \value Tswana \value Turkish \value Turkmen + \value TuvaluLanguage Since Qt 5.7 \value Twi Obsolete, please use Akan + \value Tyap + \value Ugaritic Since Qt 5.1 \value Uighur \value Uigur Obsolete, please use Uighur \value Ukrainian + \value UncodedLanguages Since Qt 5.7 + \value UpperSorbian Since Qt 5.5 \value Urdu \value Uzbek + \value Vai + \value Venda \value Vietnamese \value Volapuk + \value Vunjo + \value Walamo \value Walloon + \value Walser + \value Warlpiri Since Qt 5.5 \value Welsh + \value WesternBalochi Since Qt 5.12 + \value WesternFrisian same as Frisian \value Wolof \value Xhosa + \value Yangben \value Yiddish \value Yoruba + \value Zarma \value Zhuang \value Zulu - \value Bosnian - \value Divehi - \value Manx - \value Cornish - \value Akan - \value Konkani - \value Ga - \value Igbo - \value Kamba - \value Syriac - \value Blin - \value Geez - \value Koro - \value Sidamo - \value Atsam - \value Tigre - \value Jju - \value Friulian - \value Venda - \value Ewe - \value Walamo - \value Hawaiian - \value Tyap - \value Nyanja - \value Chewa Obsolete, please use Nyanja - \value Filipino - \value SwissGerman - \value SichuanYi - \value Kpelle - \value LowGerman - \value SouthNdebele - \value NorthernSotho - \value NorthernSami - \value Taroko - \value Gusii - \value Taita - \value Fulah - \value Kikuyu - \value Samburu - \value Sena - \value NorthNdebele - \value Rombo - \value Tachelhit - \value Kabyle - \value Nyankole - \value Bena - \value Vunjo - \value Bambara - \value Embu - \value Cherokee - \value Morisyen - \value Makonde - \value Langi - \value Ganda - \value Bemba - \value Kabuverdianu - \value Meru - \value Kalenjin - \value Nama - \value Machame - \value Colognian - \value Masai - \value Soga - \value Luyia - \value Asu - \value Teso - \value Saho - \value KoyraChiini - \value Rwa - \value Luo - \value Chiga - \value CentralMoroccoTamazight - \value KoyraboroSenni - \value Shambala - \value Aghem - \value Basaa - \value Zarma - \value Duala - \value JolaFonyi - \value Ewondo - \value Bafia - \value MakhuwaMeetto - \value Mundang - \value Kwasio - \value Nuer - \value Sakha - \value Sangu - \value CongoSwahili - \value Tasawaq - \value Vai - \value Walser - \value Yangben - \value Avestan - \value Asturian - \value Ngomba - \value Kako - \value Meta - \value Ngiemboon - \value Aragonese - \value Akkadian - \value AncientEgyptian - \value AncientGreek - \value Aramaic - \value Balinese - \value Bamun - \value BatakToba - \value Buginese - \value Buhid - \value Carian - \value Chakma - \value ClassicalMandaic - \value Coptic - \value Dogri - \value EasternCham - \value EasternKayah - \value Etruscan - \value Gothic - \value Hanunoo - \value Ingush - \value LargeFloweryMiao - \value Lepcha - \value Limbu - \value Lisu - \value Lu - \value Lycian - \value Lydian - \value Mandingo - \value Manipuri - \value Meroitic - \value NorthernThai - \value OldIrish - \value OldNorse - \value OldPersian - \value OldTurkish - \value Pahlavi - \value Parthian - \value Phoenician - \value PrakritLanguage - \value Rejang - \value Sabaean - \value Samaritan - \value Santali - \value Saurashtra - \value Sora - \value Sylheti - \value Tagbanwa - \value TaiDam - \value TaiNua - \value Ugaritic - \value Mapuche Since Qt 5.5 - \value CentralKurdish Since Qt 5.5 - \value LowerSorbian Since Qt 5.5 - \value UpperSorbian Since Qt 5.5 - \value Kenyang Since Qt 5.5 - \value Mohawk Since Qt 5.5 - \value Nko Since Qt 5.5 - \value Prussian Since Qt 5.5 - \value Kiche Since Qt 5.5 - \value SouthernSami Since Qt 5.5 - \value LuleSami Since Qt 5.5 - \value InariSami Since Qt 5.5 - \value SkoltSami Since Qt 5.5 - \value Warlpiri Since Qt 5.5 - \value ManichaeanMiddlePersian Since Qt 5.5 - \value Mende Since Qt 5.5 - \value AncientNorthArabian Since Qt 5.5 - \value LinearA Since Qt 5.5 - \value HmongNjua Since Qt 5.5 - \value Ho Since Qt 5.5 - \value Lezghian Since Qt 5.5 - \value Bassa Since Qt 5.5 - \value Mono Since Qt 5.5 - \value TedimChin Since Qt 5.5 - \value Maithili Since Qt 5.5 - \value LowerSorbian Since Qt 5.5 - \value UpperSorbian Since Qt 5.5 - \value Ahom Since Qt 5.7 - \value AmericanSignLanguage Since Qt 5.7 - \value ArdhamagadhiPrakrit Since Qt 5.7 - \value Bhojpuri Since Qt 5.7 - \value Cantonese Since Qt 5.7 - \value HieroglyphicLuwian Since Qt 5.7 - \value LiteraryChinese Since Qt 5.7 - \value Mazanderani Since Qt 5.7 - \value Mru Since Qt 5.7 - \value Newari Since Qt 5.7 - \value NorthernLuri Since Qt 5.7 - \value Osage Since Qt 5.7 - \value Palauan Since Qt 5.7 - \value Papiamento Since Qt 5.7 - \value Saraiki Since Qt 5.7 - \value Tangut Since Qt 5.7 - \value TokelauLanguage Since Qt 5.7 - \value TokPisin Since Qt 5.7 - \value TuvaluLanguage Since Qt 5.7 - \value UncodedLanguages Since Qt 5.7 + \omitvalue LastLanguage \sa language(), languageToString() @@ -494,7 +495,9 @@ This enumerated type is used to specify a country. \value AnyCountry + \value Afghanistan + \value AlandIslands \value Albania \value Algeria \value AmericanSamoa @@ -506,6 +509,7 @@ \value Argentina \value Armenia \value Aruba + \value AscensionIsland \value Australia \value Austria \value Azerbaijan @@ -520,11 +524,13 @@ \value Bermuda \value Bhutan \value Bolivia + \value Bonaire \value BosniaAndHerzegowina \value Botswana \value BouvetIsland \value Brazil \value BritishIndianOceanTerritory + \value BritishVirginIslands \value Brunei \value Bulgaria \value BurkinaFaso @@ -536,6 +542,7 @@ \value CapeVerde \value CaymanIslands \value CentralAfricanRepublic + \value CeutaAndMelilla \value Chad \value Chile \value China @@ -544,18 +551,19 @@ \value CocosIslands \value Colombia \value Comoros - \value CongoKinshasa \value CongoBrazzaville - \value DemocraticRepublicOfCongo Obsolete, please use CongoKinshasa - \value PeoplesRepublicOfCongo Obsolete, please use CongoBrazzaville + \value CongoKinshasa \value CookIslands \value CostaRica - \value IvoryCoast \value Croatia \value Cuba + \value CuraSao \value Cyprus \value CzechRepublic + \value DemocraticRepublicOfCongo Obsolete, please use CongoKinshasa + \value DemocraticRepublicOfKorea Obsolete, please use NorthKorea \value Denmark + \value DiegoGarcia \value Djibouti \value Dominica \value DominicanRepublic @@ -604,19 +612,18 @@ \value Iran \value Iraq \value Ireland + \value IsleOfMan \value Israel \value Italy + \value IvoryCoast \value Jamaica \value Japan + \value Jersey \value Jordan \value Kazakhstan \value Kenya \value Kiribati - \value NorthKorea - \value SouthKorea - \value DemocraticRepublicOfKorea Obsolete, please use NorthKorea - \value RepublicOfKorea Obsolete, please use SouthKorea - \value Kosovo + \value Kosovo Since Qt 5.2 \value Kuwait \value Kyrgyzstan \value Laos @@ -648,6 +655,7 @@ \value Moldova \value Monaco \value Mongolia + \value Montenegro \value Montserrat \value Morocco \value Mozambique @@ -664,6 +672,7 @@ \value Niue \value NorfolkIsland \value NorthernMarianaIslands + \value NorthKorea \value Norway \value Oman \value OutlyingOceania Since Qt 5.7 @@ -673,6 +682,7 @@ \value Panama \value PapuaNewGuinea \value Paraguay + \value PeoplesRepublicOfCongo Obsolete, please use CongoBrazzaville \value Peru \value Philippines \value Pitcairn @@ -680,32 +690,39 @@ \value Portugal \value PuertoRico \value Qatar + \value RepublicOfKorea Obsolete, please use SouthKorea \value Reunion \value Romania - \value Russia same as RussianFederation \value RussianFederation same as Russia + \value Russia same as RussianFederation \value Rwanda + \value SaintBarthelemy + \value SaintHelena \value SaintKittsAndNevis \value SaintLucia + \value SaintMartin + \value SaintPierreAndMiquelon \value SaintVincentAndTheGrenadines \value Samoa \value SanMarino \value SaoTomeAndPrincipe \value SaudiArabia \value Senegal + \value Serbia \value Seychelles \value SierraLeone \value Singapore + \value SintMaarten \value Slovakia \value Slovenia \value SolomonIslands \value Somalia \value SouthAfrica \value SouthGeorgiaAndTheSouthSandwichIslands + \value SouthKorea + \value SouthSudan \value Spain \value SriLanka - \value SaintHelena - \value SaintPierreAndMiquelon \value Sudan \value Suriname \value SvalbardAndJanMayenIslands @@ -723,6 +740,7 @@ \value Tokelau Obsolete, please use TokelauCountry \value Tonga \value TrinidadAndTobago + \value TristanDaCunha \value Tunisia \value Turkey \value Turkmenistan @@ -735,35 +753,20 @@ \value UnitedKingdom \value UnitedStates \value UnitedStatesMinorOutlyingIslands + \value UnitedStatesVirginIslands \value Uruguay \value Uzbekistan \value Vanuatu \value VaticanCityState \value Venezuela \value Vietnam - \value BritishVirginIslands - \value UnitedStatesVirginIslands \value WallisAndFutunaIslands \value WesternSahara \value World Since Qt 5.12 \value Yemen \value Zambia \value Zimbabwe - \value Montenegro - \value Serbia - \value SaintBarthelemy - \value SaintMartin - \value AscensionIsland - \value AlandIslands - \value DiegoGarcia - \value CeutaAndMelilla - \value IsleOfMan - \value Jersey - \value TristanDaCunha - \value SouthSudan - \value CuraSao - \value Bonaire - \value SintMaarten + \omitvalue LastCountry \sa country(), countryToString() @@ -775,135 +778,136 @@ This enumerated type is used to specify a script. \value AnyScript + \value AdlamScript Since Qt 5.7 \value AhomScript Since Qt 5.7 \value AnatolianHieroglyphsScript Since Qt 5.7 \value ArabicScript \value ArmenianScript - \value AvestanScript - \value BalineseScript - \value BamumScript + \value AvestanScript Since Qt 5.1 + \value BalineseScript Since Qt 5.1 + \value BamumScript Since Qt 5.1 \value BassaVahScript Since Qt 5.5 - \value BatakScript + \value BatakScript Since Qt 5.1 \value BengaliScript \value BhaiksukiScript Since Qt 5.7 - \value BopomofoScript - \value BrahmiScript - \value BrailleScript - \value BugineseScript - \value BuhidScript - \value CanadianAboriginalScript - \value CarianScript + \value BopomofoScript Since Qt 5.1 + \value BrahmiScript Since Qt 5.1 + \value BrailleScript Since Qt 5.1 + \value BugineseScript Since Qt 5.1 + \value BuhidScript Since Qt 5.1 + \value CanadianAboriginalScript Since Qt 5.1 + \value CarianScript Since Qt 5.1 \value CaucasianAlbanianScript Since Qt 5.5 - \value ChakmaScript - \value ChamScript + \value ChakmaScript Since Qt 5.1 + \value ChamScript Since Qt 5.1 \value CherokeeScript - \value CopticScript - \value CypriotScript + \value CopticScript Since Qt 5.1 + \value CuneiformScript Since Qt 5.1 + \value CypriotScript Since Qt 5.1 \value CyrillicScript - \value DeseretScript + \value DeseretScript Since Qt 5.1 \value DevanagariScript \value DuployanScript Since Qt 5.5 - \value EgyptianHieroglyphsScript + \value EgyptianHieroglyphsScript Since Qt 5.1 \value ElbasanScript Since Qt 5.5 \value EthiopicScript - \value FraserScript + \value FraserScript Since Qt 5.1 \value GeorgianScript - \value GlagoliticScript - \value GothicScript + \value GlagoliticScript Since Qt 5.1 + \value GothicScript Since Qt 5.1 \value GranthaScript Since Qt 5.5 \value GreekScript \value GujaratiScript \value GurmukhiScript - \value HanScript - \value HangulScript - \value HanunooScript + \value HangulScript Since Qt 5.1 + \value HanScript Since Qt 5.1 + \value HanunooScript Since Qt 5.1 \value HanWithBopomofoScript Since Qt 5.7 \value HatranScript Since Qt 5.7 \value HebrewScript - \value HiraganaScript - \value ImperialAramaicScript - \value InscriptionalPahlaviScript - \value InscriptionalParthianScript + \value HiraganaScript Since Qt 5.1 + \value ImperialAramaicScript Since Qt 5.1 + \value InscriptionalPahlaviScript Since Qt 5.1 + \value InscriptionalParthianScript Since Qt 5.1 \value JamoScript Since Qt 5.7 \value JapaneseScript - \value JavaneseScript - \value KaithiScript + \value JavaneseScript Since Qt 5.1 + \value KaithiScript Since Qt 5.1 \value KannadaScript - \value KatakanaScript - \value KayahLiScript - \value KharoshthiScript - \value KhmerScript + \value KatakanaScript Since Qt 5.1 + \value KayahLiScript Since Qt 5.1 + \value KharoshthiScript Since Qt 5.1 + \value KhmerScript Since Qt 5.1 \value KhojkiScript Since Qt 5.5 \value KhudawadiScript Since Qt 5.5 \value KoreanScript - \value LannaScript + \value LannaScript Since Qt 5.1 \value LaoScript \value LatinScript - \value LepchaScript - \value LimbuScript + \value LepchaScript Since Qt 5.1 + \value LimbuScript Since Qt 5.1 \value LinearAScript Since Qt 5.5 - \value LinearBScript - \value LycianScript - \value LydianScript + \value LinearBScript Since Qt 5.1 + \value LycianScript Since Qt 5.1 + \value LydianScript Since Qt 5.1 \value MahajaniScript Since Qt 5.5 \value MalayalamScript - \value MandaeanScript + \value MandaeanScript Since Qt 5.1 \value ManichaeanScript Since Qt 5.5 \value MarchenScript Since Qt 5.7 - \value MeiteiMayekScript + \value MeiteiMayekScript Since Qt 5.1 \value MendeKikakuiScript Since Qt 5.5 - \value MeroiticScript - \value MeroiticCursiveScript + \value MeroiticCursiveScript Since Qt 5.1 + \value MeroiticScript Since Qt 5.1 \value ModiScript Since Qt 5.5 \value MongolianScript \value MroScript Since Qt 5.5 \value MultaniScript Since Qt 5.7 \value MyanmarScript \value NabataeanScript Since Qt 5.5 - \value NkoScript \value NewaScript Since Qt 5.7 - \value NewTaiLueScript - \value OghamScript - \value OlChikiScript - \value OldItalicScript + \value NewTaiLueScript Since Qt 5.1 + \value NkoScript Since Qt 5.1 + \value OghamScript Since Qt 5.1 + \value OlChikiScript Since Qt 5.1 \value OldHungarianScript Since Qt 5.7 + \value OldItalicScript Since Qt 5.1 \value OldNorthArabianScript Since Qt 5.5 \value OldPermicScript Since Qt 5.5 - \value OldPersianScript - \value OldSouthArabianScript + \value OldPersianScript Since Qt 5.1 + \value OldSouthArabianScript Since Qt 5.1 \value OriyaScript - \value OrkhonScript + \value OrkhonScript Since Qt 5.1 \value OsageScript Since Qt 5.7 - \value OsmanyaScript + \value OsmanyaScript Since Qt 5.1 \value PahawhHmongScript Since Qt 5.5 \value PalmyreneScript Since Qt 5.5 \value PauCinHauScript Since Qt 5.5 - \value PhagsPaScript - \value PhoenicianScript - \value PollardPhoneticScript + \value PhagsPaScript Since Qt 5.1 + \value PhoenicianScript Since Qt 5.1 + \value PollardPhoneticScript Since Qt 5.1 \value PsalterPahlaviScript Since Qt 5.5 - \value RejangScript - \value RunicScript - \value SamaritanScript - \value SaurashtraScript - \value SharadaScript - \value ShavianScript + \value RejangScript Since Qt 5.1 + \value RunicScript Since Qt 5.1 + \value SamaritanScript Since Qt 5.1 + \value SaurashtraScript Since Qt 5.1 + \value SharadaScript Since Qt 5.1 + \value ShavianScript Since Qt 5.1 \value SiddhamScript Since Qt 5.5 \value SignWritingScript Since Qt 5.7 - \value SimplifiedHanScript same as SimplifiedChineseScript \value SimplifiedChineseScript same as SimplifiedHanScript + \value SimplifiedHanScript same as SimplifiedChineseScript \value SinhalaScript - \value SoraSompengScript - \value CuneiformScript - \value SundaneseScript - \value SylotiNagriScript + \value SoraSompengScript Since Qt 5.1 + \value SundaneseScript Since Qt 5.1 + \value SylotiNagriScript Since Qt 5.1 \value SyriacScript - \value TagalogScript - \value TagbanwaScript - \value TaiLeScript - \value TaiVietScript - \value TakriScript + \value TagalogScript Since Qt 5.1 + \value TagbanwaScript Since Qt 5.1 + \value TaiLeScript Since Qt 5.1 + \value TaiVietScript Since Qt 5.1 + \value TakriScript Since Qt 5.1 \value TamilScript \value TangutScript Since Qt 5.7 \value TeluguScript @@ -912,12 +916,13 @@ \value TibetanScript \value TifinaghScript \value TirhutaScript Since Qt 5.5 - \value TraditionalHanScript same as TraditionalChineseScript \value TraditionalChineseScript same as TraditionalHanScript - \value UgariticScript + \value TraditionalHanScript same as TraditionalChineseScript + \value UgariticScript Since Qt 5.1 \value VaiScript \value VarangKshitiScript Since Qt 5.5 \value YiScript + \omitvalue LastScript \sa script(), scriptToString(), languageToString() diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index 507afdcecd..58e71e1dcc 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -77,7 +77,7 @@ static const int ImperialMeasurementSystemsCount = // GENERATED PART STARTS HERE /* - This part of the file was generated on 2018-10-19 from the + This part of the file was generated on 2018-11-08 from the Common Locale Data Repository v34 http://www.unicode.org/cldr/ @@ -122,6 +122,7 @@ static const QLocaleId likely_subtags[] = { { 195, 0, 0 }, { 195, 7, 239 }, // bem -> bem_Latn_ZM { 186, 0, 0 }, { 186, 7, 210 }, // bez -> bez_Latn_TZ { 20, 0, 0 }, { 20, 2, 33 }, // bg -> bg_Cyrl_BG + { 364, 0, 0 }, { 364, 1, 163 }, // bgn -> bgn_Arab_PK { 343, 0, 0 }, { 343, 13, 100 }, // bho -> bho_Deva_IN { 18, 0, 0 }, { 18, 7, 229 }, // bi -> bi_Latn_VU { 270, 0, 0 }, { 270, 7, 170 }, // bku -> bku_Latn_PH @@ -224,10 +225,12 @@ static const QLocaleId likely_subtags[] = { { 168, 0, 0 }, { 168, 34, 44 }, // ii -> ii_Yiii_CN { 56, 0, 0 }, { 56, 7, 225 }, // ik -> ik_Latn_US { 281, 0, 0 }, { 281, 2, 178 }, // inh -> inh_Cyrl_RU + { 360, 0, 0 }, { 360, 7, 260 }, // io -> io_Latn_001 { 51, 0, 0 }, { 51, 7, 99 }, // is -> is_Latn_IS { 58, 0, 0 }, { 58, 7, 106 }, // it -> it_Latn_IT { 55, 0, 0 }, { 55, 44, 38 }, // iu -> iu_Cans_CA { 59, 0, 0 }, { 59, 19, 108 }, // ja -> ja_Jpan_JP + { 361, 0, 0 }, { 361, 7, 260 }, // jbo -> jbo_Latn_001 { 257, 0, 0 }, { 257, 7, 37 }, // jgo -> jgo_Latn_CM { 200, 0, 0 }, { 200, 7, 210 }, // jmc -> jmc_Latn_TZ { 60, 0, 0 }, { 60, 7, 101 }, // jv -> jv_Latn_ID @@ -385,10 +388,12 @@ static const QLocaleId likely_subtags[] = { { 305, 0, 0 }, { 305, 90, 100 }, // saz -> saz_Saur_IN { 249, 0, 0 }, { 249, 7, 210 }, // sbp -> sbp_Latn_TZ { 115, 0, 0 }, { 115, 7, 106 }, // sc -> sc_Latn_IT + { 362, 0, 0 }, { 362, 7, 106 }, // scn -> scn_Latn_IT { 105, 0, 0 }, { 105, 1, 163 }, // sd -> sd_Arab_PK { 105, 13, 0 }, { 105, 13, 100 }, // sd_Deva -> sd_Deva_IN { 105, 111, 0 }, { 105, 111, 100 }, // sd_Khoj -> sd_Khoj_IN { 105, 125, 0 }, { 105, 125, 100 }, // sd_Sind -> sd_Sind_IN + { 363, 0, 0 }, { 363, 1, 102 }, // sdh -> sdh_Arab_IR { 173, 0, 0 }, { 173, 7, 161 }, // se -> se_Latn_NO { 180, 0, 0 }, { 180, 7, 146 }, // seh -> seh_Latn_MZ { 213, 0, 0 }, { 213, 7, 132 }, // ses -> ses_Latn_ML @@ -1252,6 +1257,11 @@ static const quint16 locale_index[] = { 574, // Cantonese 0, // Osage 0, // Tangut + 576, // Ido + 577, // Lojban + 578, // Sicilian + 579, // Southern Kurdish + 580, // Western Balochi 0 // trailing 0 }; @@ -1592,13 +1602,13 @@ static const QLocaleData locale_data[] = { { 98, 7, 41, 44, 46, 59, 37, 48, 45, 43, 101, 171, 187, 8220, 8221, 0,6 , 0,6 , 0,6 , 0,6 , 415,8 , 97,16 , 37,5 , 8,10 , 16581,48 , 16629,91 , 16720,24 , 16581,48 , 16629,91 , 16720,24 , 8692,28 , 8720,66 , 8786,14 , 8692,28 , 8720,66 , 8786,14 , 226,2 , 216,2 , 45,4 , 5,17 , 22,23 , {88,65,70}, 32,4 , 11499,25 , 4,4 , 36,5 , 3506,5 , 3511,22 , 0, 0, 1, 6, 7 }, // Sango/Latin/Central African Republic { 99, 13, 100, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {73,78,82}, 121,1 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 7, 7, 7 }, // Sanskrit/Devanagari/India { 100, 2, 243, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 16744,48 , 16792,81 , 12698,24 , 16744,48 , 16792,81 , 12698,24 , 8800,28 , 8828,52 , 8880,14 , 8800,28 , 8828,52 , 8880,14 , 228,9 , 218,8 , 803,7 , 5,17 , 22,23 , {82,83,68}, 288,3 , 11524,58 , 13,5 , 4,0 , 3533,6 , 3539,6 , 0, 0, 1, 6, 7 }, // Serbian/Cyrillic/Serbia - { 100, 2, 27, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 16873,50 , 16792,81 , 12698,24 , 16744,48 , 16792,81 , 12698,24 , 8894,26 , 8920,55 , 8880,14 , 8894,26 , 8920,55 , 8880,14 , 237,11 , 218,8 , 803,7 , 5,17 , 22,23 , {66,65,77}, 291,2 , 11582,174 , 13,5 , 4,0 , 3533,6 , 3545,19 , 2, 1, 1, 6, 7 }, // Serbian/Cyrillic/Bosnia And Herzegowina - { 100, 2, 242, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 16923,58 , 16792,81 , 12698,24 , 16923,58 , 16792,81 , 12698,24 , 8975,33 , 8920,55 , 8880,14 , 8975,33 , 8920,55 , 8880,14 , 237,11 , 218,8 , 803,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 11756,23 , 13,5 , 4,0 , 3533,6 , 3564,9 , 2, 1, 1, 6, 7 }, // Serbian/Cyrillic/Montenegro - { 100, 2, 257, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 16923,58 , 16792,81 , 12698,24 , 16923,58 , 16792,81 , 12698,24 , 8975,33 , 8828,52 , 8880,14 , 8975,33 , 8828,52 , 8880,14 , 228,9 , 218,8 , 803,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 11756,23 , 13,5 , 4,0 , 3533,6 , 3573,6 , 2, 1, 1, 6, 7 }, // Serbian/Cyrillic/Kosovo - { 100, 7, 27, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 163,7 , 163,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 16981,50 , 17031,81 , 9742,24 , 17112,48 , 17031,81 , 9742,24 , 9008,26 , 9034,57 , 2102,14 , 9008,26 , 9034,57 , 2102,14 , 248,11 , 226,8 , 296,7 , 5,17 , 22,23 , {66,65,77}, 144,2 , 11779,174 , 13,5 , 4,0 , 3579,6 , 620,19 , 2, 1, 1, 6, 7 }, // Serbian/Latin/Bosnia And Herzegowina - { 100, 7, 242, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 163,7 , 163,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17160,58 , 17031,81 , 9742,24 , 17160,58 , 17031,81 , 9742,24 , 9091,33 , 9034,57 , 2102,14 , 9091,33 , 9034,57 , 2102,14 , 248,11 , 226,8 , 296,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 11953,23 , 13,5 , 4,0 , 3579,6 , 3585,9 , 2, 1, 1, 6, 7 }, // Serbian/Latin/Montenegro - { 100, 7, 243, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 163,7 , 163,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17112,48 , 17031,81 , 9742,24 , 17112,48 , 17031,81 , 9742,24 , 9124,28 , 9152,54 , 2102,14 , 9124,28 , 9152,54 , 2102,14 , 259,9 , 226,8 , 296,7 , 5,17 , 22,23 , {82,83,68}, 288,3 , 11976,58 , 13,5 , 4,0 , 3579,6 , 3594,6 , 0, 0, 1, 6, 7 }, // Serbian/Latin/Serbia - { 100, 7, 257, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 163,7 , 163,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17160,58 , 17031,81 , 9742,24 , 17160,58 , 17031,81 , 9742,24 , 9091,33 , 9152,54 , 2102,14 , 9091,33 , 9152,54 , 2102,14 , 259,9 , 226,8 , 296,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 11953,23 , 13,5 , 4,0 , 3579,6 , 3600,6 , 2, 1, 1, 6, 7 }, // Serbian/Latin/Kosovo + { 100, 7, 27, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 163,7 , 163,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 16873,50 , 16923,81 , 9742,24 , 17004,48 , 16923,81 , 9742,24 , 8894,26 , 8920,57 , 2102,14 , 8894,26 , 8920,57 , 2102,14 , 237,11 , 226,8 , 296,7 , 5,17 , 22,23 , {66,65,77}, 144,2 , 11582,174 , 13,5 , 4,0 , 3545,6 , 620,19 , 2, 1, 1, 6, 7 }, // Serbian/Latin/Bosnia And Herzegowina + { 100, 7, 242, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 163,7 , 163,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17052,58 , 16923,81 , 9742,24 , 17052,58 , 16923,81 , 9742,24 , 8977,33 , 8920,57 , 2102,14 , 8977,33 , 8920,57 , 2102,14 , 237,11 , 226,8 , 296,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 11756,23 , 13,5 , 4,0 , 3545,6 , 3551,9 , 2, 1, 1, 6, 7 }, // Serbian/Latin/Montenegro + { 100, 7, 243, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 163,7 , 163,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17004,48 , 16923,81 , 9742,24 , 17004,48 , 16923,81 , 9742,24 , 9010,28 , 9038,54 , 2102,14 , 9010,28 , 9038,54 , 2102,14 , 248,9 , 226,8 , 296,7 , 5,17 , 22,23 , {82,83,68}, 288,3 , 11779,58 , 13,5 , 4,0 , 3545,6 , 3560,6 , 0, 0, 1, 6, 7 }, // Serbian/Latin/Serbia + { 100, 2, 27, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17110,50 , 16792,81 , 12698,24 , 16744,48 , 16792,81 , 12698,24 , 9092,26 , 9118,55 , 8880,14 , 9092,26 , 9118,55 , 8880,14 , 257,11 , 218,8 , 803,7 , 5,17 , 22,23 , {66,65,77}, 291,2 , 11837,174 , 13,5 , 4,0 , 3533,6 , 3566,19 , 2, 1, 1, 6, 7 }, // Serbian/Cyrillic/Bosnia And Herzegowina + { 100, 2, 242, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17160,58 , 16792,81 , 12698,24 , 17160,58 , 16792,81 , 12698,24 , 9173,33 , 9118,55 , 8880,14 , 9173,33 , 9118,55 , 8880,14 , 257,11 , 218,8 , 803,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 12011,23 , 13,5 , 4,0 , 3533,6 , 3585,9 , 2, 1, 1, 6, 7 }, // Serbian/Cyrillic/Montenegro + { 100, 2, 257, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17160,58 , 16792,81 , 12698,24 , 17160,58 , 16792,81 , 12698,24 , 9173,33 , 8828,52 , 8880,14 , 9173,33 , 8828,52 , 8880,14 , 228,9 , 218,8 , 803,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 12011,23 , 13,5 , 4,0 , 3533,6 , 3594,6 , 2, 1, 1, 6, 7 }, // Serbian/Cyrillic/Kosovo + { 100, 7, 257, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8216, 8216, 0,6 , 0,6 , 163,7 , 163,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 17052,58 , 16923,81 , 9742,24 , 17052,58 , 16923,81 , 9742,24 , 8977,33 , 9038,54 , 2102,14 , 8977,33 , 9038,54 , 2102,14 , 248,9 , 226,8 , 296,7 , 5,17 , 22,23 , {69,85,82}, 14,1 , 11756,23 , 13,5 , 4,0 , 3545,6 , 3600,6 , 2, 1, 1, 6, 7 }, // Serbian/Latin/Kosovo { 101, 2, 81, 44, 160, 59, 37, 48, 45, 43, 101, 171, 187, 8222, 8220, 0,6 , 0,6 , 610,9 , 610,9 , 156,8 , 1094,23 , 37,5 , 8,10 , 17218,63 , 17281,82 , 11058,24 , 17363,60 , 17423,86 , 11058,24 , 9206,28 , 9234,61 , 9295,14 , 9309,28 , 9337,61 , 9295,14 , 268,15 , 234,15 , 45,4 , 5,17 , 22,23 , {71,69,76}, 228,1 , 12034,17 , 8,5 , 4,0 , 3606,4 , 3610,11 , 2, 1, 1, 6, 7 }, // Ossetic/Cyrillic/Georgia { 101, 2, 178, 44, 160, 59, 37, 48, 45, 43, 101, 171, 187, 8222, 8220, 0,6 , 0,6 , 610,9 , 610,9 , 156,8 , 1094,23 , 37,5 , 8,10 , 17218,63 , 17281,82 , 11058,24 , 17363,60 , 17423,86 , 11058,24 , 9206,28 , 9234,61 , 9295,14 , 9309,28 , 9337,61 , 9295,14 , 268,15 , 234,15 , 45,4 , 5,17 , 22,23 , {82,85,66}, 123,1 , 12051,17 , 8,5 , 4,0 , 3606,4 , 3621,6 , 2, 1, 1, 6, 7 }, // Ossetic/Cyrillic/Russia { 102, 7, 195, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {90,65,82}, 5,1 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 7, 6, 7 }, // Southern Sotho/Latin/South Africa @@ -1684,7 +1694,7 @@ static const QLocaleData locale_data[] = { { 140, 7, 195, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 842,9 , 851,8 , 547,6 , 35,18 , 37,5 , 8,10 , 23839,48 , 23887,91 , 134,24 , 23839,48 , 23887,91 , 23978,24 , 12558,28 , 12586,74 , 12660,14 , 12558,28 , 12586,74 , 12660,14 , 0,2 , 0,2 , 0,5 , 5,17 , 22,23 , {90,65,82}, 5,1 , 14929,67 , 4,4 , 4,0 , 4446,7 , 4453,17 , 2, 1, 7, 6, 7 }, // Zulu/Latin/South Africa { 141, 7, 161, 44, 160, 59, 37, 48, 8722, 43, 101, 171, 187, 8216, 8217, 0,6 , 0,6 , 192,8 , 192,8 , 495,10 , 478,17 , 37,5 , 441,16 , 5656,48 , 14503,83 , 134,24 , 24002,59 , 14503,83 , 134,24 , 12674,28 , 12702,51 , 2293,14 , 12753,28 , 12702,51 , 2293,14 , 414,9 , 380,11 , 45,4 , 5,17 , 22,23 , {78,79,75}, 190,2 , 9840,44 , 13,5 , 4,0 , 4470,7 , 4477,5 , 2, 0, 1, 6, 7 }, // Norwegian Nynorsk/Latin/Norway { 142, 7, 27, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8221, 8216, 8217, 0,6 , 0,6 , 163,7 , 163,7 , 1507,11 , 450,19 , 37,5 , 8,10 , 8336,48 , 24061,83 , 9742,24 , 8336,48 , 24061,83 , 9742,24 , 2016,28 , 2044,58 , 2102,14 , 2016,28 , 2044,58 , 2116,14 , 423,10 , 391,7 , 296,7 , 5,17 , 22,23 , {66,65,77}, 144,2 , 14996,170 , 13,5 , 4,0 , 4482,8 , 620,19 , 2, 1, 1, 6, 7 }, // Bosnian/Latin/Bosnia And Herzegowina - { 142, 2, 27, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8218, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 24144,48 , 24192,83 , 12698,24 , 24144,48 , 24192,83 , 12698,24 , 12781,28 , 12809,56 , 8880,14 , 12781,28 , 12809,56 , 8880,14 , 228,9 , 398,7 , 45,4 , 5,17 , 22,23 , {66,65,77}, 291,2 , 15166,151 , 13,5 , 4,0 , 4490,8 , 3545,19 , 2, 1, 1, 6, 7 }, // Bosnian/Cyrillic/Bosnia And Herzegowina + { 142, 2, 27, 44, 46, 59, 37, 48, 45, 43, 101, 8222, 8220, 8218, 8216, 0,6 , 0,6 , 116,7 , 116,7 , 1067,7 , 1074,20 , 37,5 , 8,10 , 24144,48 , 24192,83 , 12698,24 , 24144,48 , 24192,83 , 12698,24 , 12781,28 , 12809,56 , 8880,14 , 12781,28 , 12809,56 , 8880,14 , 228,9 , 398,7 , 45,4 , 5,17 , 22,23 , {66,65,77}, 291,2 , 15166,151 , 13,5 , 4,0 , 4490,8 , 3566,19 , 2, 1, 1, 6, 7 }, // Bosnian/Cyrillic/Bosnia And Herzegowina { 143, 29, 131, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {77,86,82}, 0,0 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 5, 6, 7 }, // Divehi/Thaana/Maldives { 144, 7, 251, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 80,17 , 37,5 , 8,10 , 24275,102 , 24377,140 , 158,27 , 24275,102 , 24377,140 , 158,27 , 12865,30 , 12895,57 , 85,14 , 12865,30 , 12895,57 , 85,14 , 64,4 , 61,4 , 45,4 , 5,17 , 22,23 , {71,66,80}, 119,1 , 0,7 , 4,4 , 4,0 , 4498,5 , 4503,12 , 2, 1, 1, 6, 7 }, // Manx/Latin/Isle Of Man { 145, 7, 224, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 119,10 , 97,16 , 37,5 , 8,10 , 24517,46 , 24563,130 , 158,27 , 24517,46 , 24563,130 , 158,27 , 12952,28 , 12980,61 , 85,14 , 12952,28 , 12980,61 , 85,14 , 64,4 , 61,4 , 45,4 , 5,17 , 22,23 , {71,66,80}, 119,1 , 0,7 , 4,4 , 4,0 , 4515,8 , 4523,14 , 2, 1, 1, 6, 7 }, // Cornish/Latin/United Kingdom @@ -1833,6 +1843,11 @@ static const QLocaleData locale_data[] = { { 349, 1, 103, 1643, 1644, 1563, 1642, 1776, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 18,7 , 25,12 , 39219,77 , 39219,77 , 158,27 , 39219,77 , 39219,77 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {73,81,68}, 44,5 , 0,7 , 8,5 , 4,0 , 5865,11 , 0,0 , 0, 0, 6, 5, 6 }, // Northern Luri/Arabic/Iraq { 357, 6, 97, 46, 44, 59, 37, 48, 45, 43, 101, 12300, 12301, 12302, 12303, 170,5 , 170,5 , 1010,5 , 1010,5 , 394,8 , 423,14 , 198,6 , 215,13 , 4423,39 , 4423,39 , 158,27 , 4423,39 , 4423,39 , 158,27 , 1953,28 , 1953,28 , 1981,14 , 1953,28 , 1953,28 , 1981,14 , 58,2 , 55,2 , 45,4 , 5,17 , 22,23 , {72,75,68}, 134,3 , 17327,11 , 4,4 , 4,0 , 5876,2 , 5878,14 , 2, 1, 7, 6, 7 }, // Cantonese/Traditional Han/Hong Kong { 357, 5, 44, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 170,5 , 170,5 , 1010,5 , 1010,5 , 394,8 , 402,13 , 198,6 , 204,11 , 4423,39 , 4462,38 , 158,27 , 4423,39 , 4462,38 , 158,27 , 1932,21 , 1953,28 , 1981,14 , 1932,21 , 1953,28 , 1981,14 , 58,2 , 55,2 , 45,4 , 5,17 , 22,23 , {67,78,89}, 133,1 , 3122,13 , 4,4 , 4,0 , 5892,2 , 5894,7 , 2, 1, 7, 6, 7 }, // Cantonese/Simplified Han/China + { 360, 7, 260, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {0,0,0}, 0,0 , 2586,0 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Ido/Latin/World + { 361, 7, 260, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {0,0,0}, 0,0 , 2586,0 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Lojban/Latin/World + { 362, 7, 106, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {69,85,82}, 14,1 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Sicilian/Latin/Italy + { 363, 1, 102, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {73,82,82}, 0,0 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 0, 0, 6, 5, 5 }, // Southern Kurdish/Arabic/Iran + { 364, 1, 163, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {80,75,82}, 176,2 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 0, 7, 6, 7 }, // Western Balochi/Arabic/Pakistan { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, {0,0,0}, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0, 0, 0, 0, 0 } // trailing 0s }; @@ -2860,24 +2875,24 @@ static const ushort months_data[] = { 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, -0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, -0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, -0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, -0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x431, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, -0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, -0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x432, 0x2e, 0x3b, 0x434, 0x435, 0x446, 0x2e, -0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, -0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, -0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, -0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, -0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, -0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, -0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, -0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, -0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, -0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, -0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, -0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x42f, 0x43d, +0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, +0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, +0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, +0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, +0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, +0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, +0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, +0x62, 0x61, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, +0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, +0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, +0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, +0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, +0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, +0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, +0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b, +0x458, 0x430, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x431, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, +0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, +0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x432, 0x2e, 0x3b, 0x434, 0x435, 0x446, 0x2e, 0x3b, 0x42f, 0x43d, 0x432, 0x2e, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x2e, 0x3b, 0x410, 0x43f, 0x440, 0x2e, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x2e, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x41e, 0x43a, 0x442, 0x2e, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x414, 0x435, 0x43a, 0x2e, @@ -4429,23 +4444,23 @@ static const ushort days_data[] = { 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, -0x43d, 0x3b, 0x43f, 0x3b, 0x443, 0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x3b, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, -0x43d, 0x3b, 0x443, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, -0x43d, 0x435, 0x434, 0x458, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, -0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440, 0x438, 0x458, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, -0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x435, 0x434, 0x2e, 0x3b, -0x43f, 0x43e, 0x43d, 0x2e, 0x3b, 0x443, 0x442, 0x2e, 0x3b, 0x441, 0x440, 0x2e, 0x3b, 0x447, 0x435, 0x442, 0x2e, 0x3b, 0x43f, 0x435, -0x442, 0x2e, 0x3b, 0x441, 0x443, 0x431, 0x2e, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x3b, 0x73, -0x72, 0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, -0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, -0x3b, 0x73, 0x72, 0x69, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, -0x74, 0x61, 0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x65, 0x64, 0x2e, 0x3b, 0x70, 0x6f, 0x6e, 0x2e, -0x3b, 0x75, 0x74, 0x2e, 0x3b, 0x73, 0x72, 0x2e, 0x3b, 0x10d, 0x65, 0x74, 0x2e, 0x3b, 0x70, 0x65, 0x74, 0x2e, 0x3b, 0x73, -0x75, 0x62, 0x2e, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x6f, 0x3b, 0x73, 0x72, 0x65, 0x3b, -0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x3b, -0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x73, 0x72, -0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x61, 0x6b, 0x3b, 0x73, -0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x425, 0x446, 0x431, 0x3b, 0x41a, 0x440, 0x441, 0x3b, 0x414, 0x446, 0x433, 0x3b, 0x4d4, 0x440, +0x43d, 0x3b, 0x43f, 0x3b, 0x443, 0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, +0x6e, 0x3b, 0x75, 0x74, 0x3b, 0x73, 0x72, 0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, +0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, +0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x73, 0x72, 0x69, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, +0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x61, 0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x65, 0x64, +0x2e, 0x3b, 0x70, 0x6f, 0x6e, 0x2e, 0x3b, 0x75, 0x74, 0x2e, 0x3b, 0x73, 0x72, 0x2e, 0x3b, 0x10d, 0x65, 0x74, 0x2e, 0x3b, +0x70, 0x65, 0x74, 0x2e, 0x3b, 0x73, 0x75, 0x62, 0x2e, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, +0x6f, 0x3b, 0x73, 0x72, 0x65, 0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, +0x64, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, +0x72, 0x61, 0x6b, 0x3b, 0x73, 0x72, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, +0x65, 0x74, 0x61, 0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, +0x443, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, 0x43d, 0x435, +0x434, 0x458, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, +0x430, 0x43a, 0x3b, 0x441, 0x440, 0x438, 0x458, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, +0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x435, 0x434, 0x2e, 0x3b, 0x43f, 0x43e, +0x43d, 0x2e, 0x3b, 0x443, 0x442, 0x2e, 0x3b, 0x441, 0x440, 0x2e, 0x3b, 0x447, 0x435, 0x442, 0x2e, 0x3b, 0x43f, 0x435, 0x442, 0x2e, +0x3b, 0x441, 0x443, 0x431, 0x2e, 0x3b, 0x425, 0x446, 0x431, 0x3b, 0x41a, 0x440, 0x441, 0x3b, 0x414, 0x446, 0x433, 0x3b, 0x4d4, 0x440, 0x442, 0x3b, 0x426, 0x43f, 0x440, 0x3b, 0x41c, 0x440, 0x431, 0x3b, 0x421, 0x431, 0x442, 0x3b, 0x425, 0x443, 0x44b, 0x446, 0x430, 0x443, 0x431, 0x43e, 0x43d, 0x3b, 0x41a, 0x44a, 0x443, 0x44b, 0x440, 0x438, 0x441, 0x4d5, 0x440, 0x3b, 0x414, 0x44b, 0x446, 0x446, 0x4d5, 0x433, 0x3b, 0x4d4, 0x440, 0x442, 0x44b, 0x446, 0x446, 0x4d5, 0x433, 0x3b, 0x426, 0x44b, 0x43f, 0x43f, 0x4d5, 0x440, 0x4d5, 0x43c, 0x3b, 0x41c, @@ -5138,9 +5153,9 @@ static const ushort am_data[] = { 0x101, 0x6e, 0x74, 0x254, 0x301, 0x6e, 0x67, 0x254, 0x301, 0x70, 0x72, 0x69, 0x65, 0x161, 0x70, 0x69, 0x65, 0x74, 0x43f, 0x440, 0x435, 0x442, 0x43f, 0x43b, 0x430, 0x434, 0x43d, 0x435, 0x50, 0x47, 0x92e, 0x2e, 0x92a, 0x942, 0x2e, 0x4af, 0x2e, 0x4e9, 0x2e, 0x63a, 0x2e, 0x645, 0x2e, 0x642, 0x628, 0x644, 0x200c, 0x627, 0x632, 0x638, 0x647, 0x631, 0x64, 0x61, 0x20, 0x6d, 0x61, 0x6e, 0x68, 0xe3, -0xa2a, 0xa42, 0x2e, 0xa26, 0xa41, 0x2e, 0x4e, 0x44, 0x43f, 0x440, 0x435, 0x20, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x43f, 0x440, 0x438, -0x458, 0x435, 0x20, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x70, 0x72, 0x69, 0x6a, 0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x70, -0x72, 0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x4d5, 0x43c, 0x431, 0x438, 0x441, 0x431, 0x43e, 0x43d, 0x44b, 0x20, 0x440, 0x430, +0xa2a, 0xa42, 0x2e, 0xa26, 0xa41, 0x2e, 0x4e, 0x44, 0x43f, 0x440, 0x435, 0x20, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x70, 0x72, 0x69, +0x6a, 0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x70, 0x72, 0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0x43f, 0x440, 0x438, +0x458, 0x435, 0x20, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x4d5, 0x43c, 0x431, 0x438, 0x441, 0x431, 0x43e, 0x43d, 0x44b, 0x20, 0x440, 0x430, 0x437, 0x43c, 0x4d5, 0x635, 0x628, 0x62d, 0x60c, 0x20, 0x645, 0x646, 0x62c, 0x647, 0x646, 0x62f, 0xdb4, 0xdd9, 0x2e, 0xdc0, 0x2e, 0x73, 0x6e, 0x2e, 0x66, 0x6d, 0x43f, 0x435, 0x2e, 0x20, 0x447, 0x43e, 0x2e, 0xbae, 0xbc1, 0xbb1, 0xbcd, 0xbaa, 0xb95, 0xbb2, 0xbcd, 0xe01, 0xe48, 0xe2d, 0xe19, 0xe40, 0xe17, 0xe35, 0xe48, 0xe22, 0xe07, 0xf66, 0xf94, 0xf0b, 0xf51, 0xfb2, 0xf7c, 0xf0b, 0x1295, 0x1309, 0x1206, 0x20, @@ -5814,29 +5829,29 @@ static const ushort currency_display_name_data[] = { 0x3b, 0x3b, 0x3b, 0x3b, 0x421, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x430, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x430, 0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, -0x430, 0x3b, 0x411, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, -0x447, 0x43a, 0x430, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, -0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, -0x43e, 0x432, 0x430, 0x447, 0x43a, 0x430, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, -0x20, 0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, -0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x435, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, -0x43b, 0x43d, 0x435, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x65, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, -0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x438, 0x445, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, -0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x438, 0x445, 0x20, 0x43c, 0x430, 0x440, 0x430, 0x43a, 0x430, 0x3b, 0x415, 0x432, 0x440, 0x43e, -0x3b, 0x3b, 0x435, 0x432, 0x440, 0x43e, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x430, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x430, 0x3b, 0x42, -0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, -0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, -0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, +0x430, 0x3b, 0x42, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, -0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x65, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x65, -0x20, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, -0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x69, 0x68, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, -0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20, 0x6d, 0x61, 0x72, 0x61, 0x6b, 0x61, 0x3b, 0x45, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, -0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x53, 0x72, 0x70, 0x73, -0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, -0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x61, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x61, 0x3b, 0x3b, 0x73, -0x72, 0x70, 0x73, 0x6b, 0x69, 0x68, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x61, 0x3b, 0x41b, 0x430, 0x440, 0x3b, 0x3b, 0x43b, +0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, +0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, +0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x65, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, +0x6c, 0x6e, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, +0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x69, 0x68, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, +0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20, 0x6d, 0x61, 0x72, 0x61, 0x6b, 0x61, 0x3b, 0x45, 0x76, 0x72, 0x6f, +0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x53, +0x72, 0x70, 0x73, 0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x20, +0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x61, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x61, +0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x68, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x61, 0x3b, 0x411, 0x43e, 0x441, +0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x430, 0x20, 0x43a, +0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, +0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, +0x430, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440, 0x43a, +0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, +0x430, 0x447, 0x43a, 0x435, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x435, 0x20, 0x43c, +0x430, 0x440, 0x43a, 0x65, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, +0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x438, 0x445, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, +0x43d, 0x438, 0x445, 0x20, 0x43c, 0x430, 0x440, 0x430, 0x43a, 0x430, 0x3b, 0x415, 0x432, 0x440, 0x43e, 0x3b, 0x3b, 0x435, 0x432, 0x440, +0x43e, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x430, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x430, 0x3b, 0x41b, 0x430, 0x440, 0x3b, 0x3b, 0x43b, 0x430, 0x440, 0x3b, 0x3b, 0x3b, 0x3b, 0x43b, 0x430, 0x440, 0x44b, 0x3b, 0x421, 0x43e, 0x43c, 0x3b, 0x3b, 0x441, 0x43e, 0x43c, 0x3b, 0x3b, 0x3b, 0x3b, 0x441, 0x43e, 0x43c, 0x44b, 0x3b, 0x44, 0x6f, 0x72, 0x61, 0x20, 0x72, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x67e, 0x627, 0x6aa, 0x633, 0x62a, 0x627, 0x646, 0x64a, 0x20, 0x631, @@ -6291,9 +6306,9 @@ static const ushort endonyms_data[] = { 0x441, 0x442, 0x430, 0x43d, 0x41a, 0x438, 0x440, 0x433, 0x438, 0x437, 0x438, 0x44f, 0x41c, 0x43e, 0x43b, 0x434, 0x43e, 0x432, 0x430, 0x423, 0x43a, 0x440, 0x430, 0x438, 0x43d, 0x430, 0x53, 0xe4, 0x6e, 0x67, 0xf6, 0x4b, 0xf6, 0x64, 0xf6, 0x72, 0xf6, 0x73, 0xea, 0x73, 0x65, 0x20, 0x74, 0xee, 0x20, 0x42, 0xea, 0x61, 0x66, 0x72, 0xee, 0x6b, 0x61, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x421, -0x440, 0x431, 0x438, 0x458, 0x430, 0x411, 0x43e, 0x441, 0x43d, 0x430, 0x20, 0x438, 0x20, 0x425, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, -0x432, 0x438, 0x43d, 0x430, 0x426, 0x440, 0x43d, 0x430, 0x20, 0x413, 0x43e, 0x440, 0x430, 0x41a, 0x43e, 0x441, 0x43e, 0x432, 0x43e, 0x73, -0x72, 0x70, 0x73, 0x6b, 0x69, 0x43, 0x72, 0x6e, 0x61, 0x20, 0x47, 0x6f, 0x72, 0x61, 0x53, 0x72, 0x62, 0x69, 0x6a, 0x61, +0x440, 0x431, 0x438, 0x458, 0x430, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x43, 0x72, 0x6e, 0x61, 0x20, 0x47, 0x6f, 0x72, 0x61, +0x53, 0x72, 0x62, 0x69, 0x6a, 0x61, 0x411, 0x43e, 0x441, 0x43d, 0x430, 0x20, 0x438, 0x20, 0x425, 0x435, 0x440, 0x446, 0x435, 0x433, +0x43e, 0x432, 0x438, 0x43d, 0x430, 0x426, 0x440, 0x43d, 0x430, 0x20, 0x413, 0x43e, 0x440, 0x430, 0x41a, 0x43e, 0x441, 0x43e, 0x432, 0x43e, 0x4b, 0x6f, 0x73, 0x6f, 0x76, 0x6f, 0x438, 0x440, 0x43e, 0x43d, 0x413, 0x443, 0x44b, 0x440, 0x434, 0x437, 0x44b, 0x441, 0x442, 0x43e, 0x43d, 0x423, 0x4d5, 0x440, 0x4d5, 0x441, 0x435, 0x63, 0x68, 0x69, 0x53, 0x68, 0x6f, 0x6e, 0x61, 0x633, 0x646, 0x68c, 0x64a, 0x67e, 0x627, 0x6aa, 0x633, 0x62a, 0x627, 0x646, 0xdc3, 0xdd2, 0xd82, 0xdc4, 0xdbd, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, @@ -6773,6 +6788,11 @@ static const char language_name_list[] = "Cantonese\0" "Osage\0" "Tangut\0" +"Ido\0" +"Lojban\0" +"Sicilian\0" +"Southern Kurdish\0" +"Western Balochi\0" ; static const quint16 language_name_index[] = { @@ -7136,6 +7156,11 @@ static const quint16 language_name_index[] = { 3050, // Cantonese 3060, // Osage 3066, // Tangut + 3073, // Ido + 3077, // Lojban + 3084, // Sicilian + 3093, // Southern Kurdish + 3110, // Western Balochi }; static const char script_name_list[] = @@ -8319,6 +8344,11 @@ static const unsigned char language_code_list[] = "yue" // Cantonese "osa" // Osage "txg" // Tangut +"io\0" // Ido +"jbo" // Lojban +"scn" // Sicilian +"sdh" // Southern Kurdish +"bgn" // Western Balochi ; static const unsigned char script_code_list[] = diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index a96ecf1c1c..98b6a31a46 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -66,6 +66,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_SYSTEMLOCALE +struct QLocaleData; class Q_CORE_EXPORT QSystemLocale { public: @@ -126,6 +127,7 @@ public: virtual QVariant query(QueryType type, QVariant in) const; virtual QLocale fallbackUiLocale() const; + inline const QLocaleData *fallbackUiLocaleData() const; private: QSystemLocale(bool); friend class QSystemLocaleSingleton; @@ -373,8 +375,6 @@ public: QLocale::MeasurementSystem measurementSystem() const; - static void updateSystemPrivate(); - QString dateTimeToString(QStringView format, const QDateTime &datetime, const QDate &dateOnly, const QTime &timeOnly, const QLocale *q) const; @@ -384,6 +384,10 @@ public: QLocale::NumberOptions m_numberOptions; }; +#ifndef QT_NO_SYSTEMLOCALE +const QLocaleData *QSystemLocale::fallbackUiLocaleData() const { return fallbackUiLocale().d->m_data; } +#endif + template <> inline QLocalePrivate *QSharedDataPointer<QLocalePrivate>::clone() { diff --git a/src/corelib/tools/qmakearray_p.h b/src/corelib/tools/qmakearray_p.h index ae4d7f07c6..71441c2c27 100644 --- a/src/corelib/tools/qmakearray_p.h +++ b/src/corelib/tools/qmakearray_p.h @@ -111,10 +111,10 @@ struct QuickSortFilter<Predicate, QuickSortData<Head, Tail...>> using TailFilteredData = typename QuickSortFilter< Predicate, QuickSortData<Tail...>>::Type; - using Type = typename QConditional< + using Type = typename std::conditional< Predicate<Head>::value, decltype(quickSortConcat(QuickSortData<Head> {}, TailFilteredData{})), - TailFilteredData>::Type; + TailFilteredData>::type; }; template <template <typename> class Predicate> diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h new file mode 100644 index 0000000000..4dd9e9603b --- /dev/null +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -0,0 +1,198 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QOFFSETSTRINGARRAY_P_H +#define QOFFSETSTRINGARRAY_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "private/qglobal_p.h" + +#include <tuple> +#include <array> + +QT_BEGIN_NAMESPACE + +namespace QtPrivate { +template<int N, int O, int I, int ... Idx> +struct OffsetSequenceHelper : OffsetSequenceHelper<N - 1, O + I, Idx..., O> { }; + +template<int Last, int I, int S, int ... Idx> +struct OffsetSequenceHelper<1, Last, I, S, Idx...> : IndexesList<Last + I, Idx..., Last> +{ + static const constexpr auto Length = Last + I; + using Type = typename std::conditional< + Last <= std::numeric_limits<quint8>::max(), + quint8, + typename std::conditional< + Last <= std::numeric_limits<quint16>::max(), + quint16, + int>::type + >::type; +}; + +template<int ... Idx> +struct OffsetSequence : OffsetSequenceHelper<sizeof ... (Idx), 0, Idx..., 0> { }; + +template<int N> +struct StaticString +{ + const char data[N]; +}; + + +template<> +struct StaticString<0> +{ + static constexpr int size() noexcept + { + return 0; + } +}; + +template<typename, typename> +struct StaticStringBuilder; + +template<int ... I1, int ... I2> +struct StaticStringBuilder<IndexesList<I1...>, IndexesList<I2...>> +{ + +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4100) // The formal parameter is not referenced in the body of the function. + // The unreferenced parameter is ignored. + // It happens when 'rs' is StaticString<0> + template<int N1, int N2> + static constexpr StaticString<N1 + N2> concatenate( + const char (&ls)[N1], const StaticString<N2> &rs) noexcept + { + return StaticString<N1 + N2>{{ls[I1]..., rs.data[I2]...}}; + } +QT_WARNING_POP +}; + +template<int Sum> +constexpr StaticString<0> staticString() noexcept +{ + return StaticString<0>{}; +} + +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4503) +template<int Sum, int I, int ... Ix> +constexpr StaticString<Sum> staticString(const char (&s)[I], const char (&...sx)[Ix]) noexcept +{ + return StaticStringBuilder< + makeIndexSequence<I>, + makeIndexSequence<Sum - I>>::concatenate(s, staticString<Sum - I>(sx...)); +} +QT_WARNING_POP +} // namespace QtPrivate + +template<typename T, int SizeString, int SizeOffsets> +class QOffsetStringArray +{ +public: + using Type = T; + + template<int ... Ox> + constexpr QOffsetStringArray(const QtPrivate::StaticString<SizeString> &str, + QtPrivate::IndexesList<SizeString, Ox...>) noexcept + : m_string(str), + m_offsets{Ox...} + { } + + constexpr inline const char *operator[](const int index) const noexcept + { + return m_string.data + m_offsets[qBound(int(0), index, SizeOffsets - 1)]; + } + + constexpr inline const char *at(const int index) const noexcept + { + return m_string.data + m_offsets[index]; + } + + constexpr inline const char *str() const { return m_string.data; } + constexpr inline const T *offsets() const { return m_offsets; } + constexpr inline int count() const { return SizeOffsets; }; + + static constexpr const auto sizeString = SizeString; + static constexpr const auto sizeOffsets = SizeOffsets; + +private: + QtPrivate::StaticString<SizeString> m_string; + const T m_offsets[SizeOffsets]; +}; + +template<typename T, int N, int ... Ox> +constexpr QOffsetStringArray<T, N, sizeof ... (Ox)> qOffsetStringArray( + const QtPrivate::StaticString<N> &string, + QtPrivate::IndexesList<N, Ox...> offsets) noexcept +{ + return QOffsetStringArray<T, N, sizeof ... (Ox)>( + string, + offsets); +} + +template<int ... Nx> +struct QOffsetStringArrayRet +{ + using Offsets = QtPrivate::OffsetSequence<Nx...>; + using Type = QOffsetStringArray<typename Offsets::Type, Offsets::Length, sizeof ... (Nx)>; +}; + +template<int ... Nx> +constexpr auto qOffsetStringArray(const char (&...strings)[Nx]) noexcept -> typename QOffsetStringArrayRet<Nx...>::Type +{ + using Offsets = QtPrivate::OffsetSequence<Nx...>; + return qOffsetStringArray<typename Offsets::Type>( + QtPrivate::staticString<Offsets::Length>(strings...), Offsets{}); +} + +QT_END_NAMESPACE + +#endif // QOFFSETSTRINGARRAY_P_H diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index e44307f28d..ddd715f745 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -533,7 +533,7 @@ Q_CORE_EXPORT QBasicAtomicInteger<quint64> qt_cpu_features[1] = { Q_BASIC_ATOMIC Q_CORE_EXPORT QBasicAtomicInteger<unsigned> qt_cpu_features[2] = { Q_BASIC_ATOMIC_INITIALIZER(0), Q_BASIC_ATOMIC_INITIALIZER(0) }; #endif -void qDetectCpuFeatures() +quint64 qDetectCpuFeatures() { quint64 f = detectProcessorFeatures(); QByteArray disable = qgetenv("QT_NO_CPU_FEATURE"); @@ -567,6 +567,7 @@ void qDetectCpuFeatures() #ifndef Q_ATOMIC_INT64_IS_SUPPORTED qt_cpu_features[1].store(f >> 32); #endif + return f; } void qDumpCPUFeatures() diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 9f1321df94..c36e1e484f 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -344,7 +344,7 @@ extern Q_CORE_EXPORT QBasicAtomicInteger<quint64> qt_cpu_features[1]; #else extern Q_CORE_EXPORT QBasicAtomicInteger<unsigned> qt_cpu_features[2]; #endif -Q_CORE_EXPORT void qDetectCpuFeatures(); +Q_CORE_EXPORT quint64 qDetectCpuFeatures(); static inline quint64 qCpuFeatures() { @@ -353,11 +353,7 @@ static inline quint64 qCpuFeatures() features |= quint64(qt_cpu_features[1].load()) << 32; #endif if (Q_UNLIKELY(features == 0)) { - qDetectCpuFeatures(); - features = qt_cpu_features[0].load(); -#ifndef Q_ATOMIC_INT64_IS_SUPPORTED - features |= quint64(qt_cpu_features[1].load()) << 32; -#endif + features = qDetectCpuFeatures(); Q_ASSUME(features != 0); } return features; diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 63d44eb39c..dc09c8e729 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -120,7 +120,7 @@ QT_BEGIN_NAMESPACE * Whenever multiple alternatives are equivalent or near so, we prefer the one * using instructions from SSE2, since SSE2 is guaranteed to be enabled for all * 64-bit builds and we enable it for 32-bit builds by default. Use of higher - * SSE versions should be done when there's a clear performance benefit and + * SSE versions should be done when there is a clear performance benefit and * requires fallback code to SSE2, if it exists. * * Performance measurement in the past shows that most strings are short in @@ -1550,7 +1550,7 @@ const QString::Null QString::null = { }; functions. The former searches forward starting from a given index position, the latter searches backward. Both return the index position of the character or substring if they find it; otherwise, - they return -1. For example, here's a typical loop that finds all + they return -1. For example, here is a typical loop that finds all occurrences of a particular substring: \snippet qstring/main.cpp 6 @@ -6712,7 +6712,7 @@ namespace QUnicodeTables { this function requires to be a valid, empty string) and \c{s} contains the only copy of the string, without reallocation (thus, \a it is still valid). - There's one pathological case left: when the in-place conversion needs to + There is one pathological case left: when the in-place conversion needs to reallocate memory to grow the buffer. In that case, we need to adjust the \a it pointer. */ @@ -6870,7 +6870,7 @@ QString &QString::sprintf(const char *cformat, ...) \warning We do not recommend using QString::asprintf() in new Qt code. Instead, consider using QTextStream or arg(), both of which support Unicode strings seamlessly and are type-safe. - Here's an example that uses QTextStream: + Here is an example that uses QTextStream: \snippet qstring/main.cpp 64 @@ -7837,7 +7837,7 @@ QStringList QString::split(const QString &sep, SplitBehavior behavior, Qt::CaseS the result. \note All references are valid as long this string is alive. Destroying this - string will cause all references be dangling pointers. + string will cause all references to be dangling pointers. \since 5.4 \sa QStringRef split() @@ -7871,7 +7871,7 @@ QVector<QStringRef> QString::splitRef(QChar sep, SplitBehavior behavior, Qt::Cas the result. \note All references are valid as long this string is alive. Destroying this - string will cause all references be dangling pointers. + string will cause all references to be dangling pointers. \since 5.4 */ @@ -7920,17 +7920,17 @@ static ResultList splitString(const QString &source, MidMethod mid, const QRegEx does not match anywhere in the string, split() returns a single-element list containing this string. - Here's an example where we extract the words in a sentence + Here is an example where we extract the words in a sentence using one or more whitespace characters as the separator: \snippet qstring/main.cpp 59 - Here's a similar example, but this time we use any sequence of + Here is a similar example, but this time we use any sequence of non-word characters as the separator: \snippet qstring/main.cpp 60 - Here's a third example where we use a zero-length assertion, + Here is a third example where we use a zero-length assertion, \b{\\b} (word boundary), to split the string into an alternating sequence of non-word and word tokens: @@ -7953,7 +7953,7 @@ QStringList QString::split(const QRegExp &rx, SplitBehavior behavior) const single-element vector containing this string reference. \note All references are valid as long this string is alive. Destroying this - string will cause all references be dangling pointers. + string will cause all references to be dangling pointers. \sa QStringRef split() */ @@ -8002,17 +8002,17 @@ static ResultList splitString(const QString &source, MidMethod mid, const QRegul does not match anywhere in the string, split() returns a single-element list containing this string. - Here's an example where we extract the words in a sentence + Here is an example where we extract the words in a sentence using one or more whitespace characters as the separator: \snippet qstring/main.cpp 90 - Here's a similar example, but this time we use any sequence of + Here is a similar example, but this time we use any sequence of non-word characters as the separator: \snippet qstring/main.cpp 91 - Here's a third example where we use a zero-length assertion, + Here is a third example where we use a zero-length assertion, \b{\\b} (word boundary), to split the string into an alternating sequence of non-word and word tokens: @@ -8035,7 +8035,7 @@ QStringList QString::split(const QRegularExpression &re, SplitBehavior behavior) single-element vector containing this string reference. \note All references are valid as long this string is alive. Destroying this - string will cause all references be dangling pointers. + string will cause all references to be dangling pointers. \sa split() QStringRef */ @@ -9172,7 +9172,7 @@ bool QString::isRightToLeft() const to create a deep copy of the data, ensuring that the raw data isn't modified. - Here's an example of how we can use a QRegularExpression on raw data in + Here is an example of how we can use a QRegularExpression on raw data in memory without requiring to copy the data into a QString: \snippet qstring/main.cpp 22 diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 6be3dcdbe1..da76601e88 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -899,10 +899,8 @@ private: template <typename T> static T toIntegral_helper(const QChar *data, int len, bool *ok, int base) { - // ### Qt6: use std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type - const bool isUnsigned = T(0) < T(-1); - typedef typename QtPrivate::QConditional<isUnsigned, qulonglong, qlonglong>::Type Int64; - typedef typename QtPrivate::QConditional<isUnsigned, uint, int>::Type Int32; + using Int64 = typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type; + using Int32 = typename std::conditional<std::is_unsigned<T>::value, uint, int>::type; // we select the right overload by casting size() to int or uint Int64 val = toIntegral_helper(data, Int32(len), ok, base); diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index cf150c2a1b..cc6eaf8ad2 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -376,6 +376,56 @@ bool QtPrivate::QStringList_contains(const QStringList *that, QLatin1String str, return stringList_contains(*that, str, cs); } +/*! + \fn bool QStringList::indexOf(QStringView str, int from) const + \overload + \since 5.13 + + Returns the index position of the first occurrence of \a str in + the list, searching forward from index position \a from. Returns + -1 if no item matched. + + \sa lastIndexOf(), contains() + */ + +/*! + \fn bool QStringList::indexOf(QLatin1String str, int from) const + \overload + \since 5.13 + + Returns the index position of the first occurrence of \a str in + the list, searching forward from index position \a from. Returns + -1 if no item matched. + + \sa lastIndexOf(), contains() + */ + +/*! + \fn bool QStringList::lastIndexOf(QStringView str, int from) const + \overload + \since 5.13 + + Returns the index position of the last occurrence of \a str in + the list, searching backward from index position \a from. If \a + from is -1 (the default), the search starts at the last item. + Returns -1 if no item matched. + + \sa indexOf(), contains() + */ + +/*! + \fn bool QStringList::lastIndexOf(QLatin1String str, int from) const + \overload + \since 5.13 + + Returns the index position of the last occurrence of \a str in + the list, searching backward from index position \a from. If \a + from is -1 (the default), the search starts at the last item. + Returns -1 if no item matched. + + \sa indexOf(), contains() + */ + #ifndef QT_NO_REGEXP /*! \fn QStringList QStringList::filter(const QRegExp &rx) const @@ -780,7 +830,7 @@ int QtPrivate::QStringList_removeDuplicates(QStringList *that) continue; ++setSize; if (j != i) - that->swap(i, j); + that->swapItemsAt(i, j); ++j; } if (n != j) diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 10cbad04d6..b6c48488df 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -132,6 +132,12 @@ public: inline QStringList &operator<<(const QList<QString> &l) { *this += l; return *this; } + inline int indexOf(QStringView str, int from = 0) const; + inline int indexOf(QLatin1String str, int from = 0) const; + + inline int lastIndexOf(QStringView str, int from = -1) const; + inline int lastIndexOf(QLatin1String str, int from = -1) const; + #ifndef QT_NO_REGEXP inline int indexOf(const QRegExp &rx, int from = 0) const; inline int lastIndexOf(const QRegExp &rx, int from = -1) const; @@ -249,6 +255,26 @@ inline QStringList operator+(const QList<QString> &one, const QStringList &other return n; } +inline int QStringList::indexOf(QStringView string, int from) const +{ + return QtPrivate::indexOf<QString, QStringView>(*this, string, from); +} + +inline int QStringList::indexOf(QLatin1String string, int from) const +{ + return QtPrivate::indexOf<QString, QLatin1String>(*this, string, from); +} + +inline int QStringList::lastIndexOf(QStringView string, int from) const +{ + return QtPrivate::lastIndexOf<QString, QStringView>(*this, string, from); +} + +inline int QStringList::lastIndexOf(QLatin1String string, int from) const +{ + return QtPrivate::lastIndexOf<QString, QLatin1String>(*this, string, from); +} + #ifndef QT_NO_REGEXP inline QStringList &QListSpecialMethods<QString>::replaceInStrings(const QRegExp &rx, const QString &after) { diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 30fd7b2865..b51cd819c5 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -42,7 +42,6 @@ #include <QtCore/qalgorithms.h> #include <QtCore/qiterator.h> -#include <QtCore/qlist.h> #include <QtCore/qrefcount.h> #include <QtCore/qarraydata.h> #include <QtCore/qhashfunctions.h> @@ -94,7 +93,13 @@ public: void reserve(int size); inline void squeeze() { - reallocData(d->size, d->size); + if (d->size < int(d->alloc)) { + if (!d->size) { + *this = QVector<T>(); + return; + } + realloc(d->size); + } if (d->capacityReserved) { // capacity reserved in a read only memory would be useless // this checks avoid writing to such memory. @@ -297,9 +302,10 @@ public: inline std::vector<T> toStdVector() const { return std::vector<T>(d->begin(), d->end()); } private: - // ### Qt6: remove const from int parameters + // ### Qt6: remove methods, they are unused void reallocData(const int size, const int alloc, QArrayData::AllocationOptions options = QArrayData::Default); void reallocData(const int sz) { reallocData(sz, d->alloc); } + void realloc(int alloc, QArrayData::AllocationOptions options = QArrayData::Default); void freeData(Data *d); void defaultConstruct(T *from, T *to); void copyConstruct(const T *srcFrom, const T *srcTo, T *dstFrom); @@ -387,7 +393,7 @@ void QVector<T>::detach() d = Data::unsharableEmpty(); else #endif - reallocData(d->size, int(d->alloc)); + realloc(int(d->alloc)); } Q_ASSERT(isDetached()); } @@ -396,7 +402,7 @@ template <typename T> void QVector<T>::reserve(int asize) { if (asize > int(d->alloc)) - reallocData(d->size, asize); + realloc(asize); if (isDetached() #if !defined(QT_NO_UNSHARABLE_CONTAINERS) && d != Data::unsharableEmpty() @@ -409,21 +415,26 @@ void QVector<T>::reserve(int asize) template <typename T> void QVector<T>::resize(int asize) { - int newAlloc; - const int oldAlloc = int(d->alloc); - QArrayData::AllocationOptions opt; - - if (asize > oldAlloc) { // there is not enough space - newAlloc = asize; - opt = QArrayData::Grow; - } else { - newAlloc = oldAlloc; + if (asize == d->size) + return; + if (asize > int(d->alloc) || !isDetached()) { // there is not enough space + QArrayData::AllocationOptions opt = asize > int(d->alloc) ? QArrayData::Grow : QArrayData::Default; + realloc(qMax(int(d->alloc), asize), opt); } - reallocData(asize, newAlloc, opt); + if (asize < d->size) + destruct(begin() + asize, end()); + else + defaultConstruct(end(), begin() + asize); + d->size = asize; } template <typename T> inline void QVector<T>::clear() -{ resize(0); } +{ + if (!d->size) + return; + destruct(begin(), end()); + d->size = 0; +} template <typename T> inline const T &QVector<T>::at(int i) const { Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::at", "index out of range"); @@ -654,6 +665,77 @@ void QVector<T>::reallocData(const int asize, const int aalloc, QArrayData::Allo Q_ASSERT(d->size == asize); } +template<typename T> +void QVector<T>::realloc(int aalloc, QArrayData::AllocationOptions options) +{ + Q_ASSERT(aalloc >= d->size); + Data *x = d; + + const bool isShared = d->ref.isShared(); + Q_ASSERT(aalloc != int(d->alloc) || isShared); + + QT_TRY { + // allocate memory + x = Data::allocate(aalloc, options); + Q_CHECK_PTR(x); + // aalloc is bigger then 0 so it is not [un]sharedEmpty +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) + Q_ASSERT(x->ref.isSharable() || options.testFlag(QArrayData::Unsharable)); +#endif + Q_ASSERT(!x->ref.isStatic()); + x->size = d->size; + + T *srcBegin = d->begin(); + T *srcEnd = d->end(); + T *dst = x->begin(); + + if (!QTypeInfoQuery<T>::isRelocatable || (isShared && QTypeInfo<T>::isComplex)) { + QT_TRY { + if (isShared || !std::is_nothrow_move_constructible<T>::value) { + // we can not move the data, we need to copy construct it + while (srcBegin != srcEnd) + new (dst++) T(*srcBegin++); + } else { + while (srcBegin != srcEnd) + new (dst++) T(std::move(*srcBegin++)); + } + } QT_CATCH (...) { + // destruct already copied objects + destruct(x->begin(), dst); + QT_RETHROW; + } + } else { + ::memcpy(static_cast<void *>(dst), static_cast<void *>(srcBegin), (srcEnd - srcBegin) * sizeof(T)); + dst += srcEnd - srcBegin; + } + + } QT_CATCH (...) { + Data::deallocate(x); + QT_RETHROW; + } + x->capacityReserved = d->capacityReserved; + + Q_ASSERT(d != x); + if (!d->ref.deref()) { + if (!QTypeInfoQuery<T>::isRelocatable || !aalloc || (isShared && QTypeInfo<T>::isComplex)) { + // data was copy constructed, we need to call destructors + // or if !alloc we did nothing to the old 'd'. + freeData(d); + } else { + Data::deallocate(d); + } + } + d = x; + + Q_ASSERT(d->data()); + Q_ASSERT(uint(d->size) <= d->alloc); +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) + Q_ASSERT(d != Data::unsharableEmpty()); +#endif + Q_ASSERT(d != Data::sharedNull()); + Q_ASSERT(d->alloc >= uint(aalloc)); +} + #if defined(Q_CC_MSVC) QT_WARNING_POP #endif @@ -679,7 +761,7 @@ void QVector<T>::append(const T &t) if (!isDetached() || isTooSmall) { T copy(t); QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default); - reallocData(d->size, isTooSmall ? d->size + 1 : d->alloc, opt); + realloc(isTooSmall ? d->size + 1 : d->alloc, opt); if (QTypeInfo<T>::isComplex) new (d->end()) T(qMove(copy)); @@ -702,7 +784,7 @@ void QVector<T>::append(T &&t) const bool isTooSmall = uint(d->size + 1) > d->alloc; if (!isDetached() || isTooSmall) { QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default); - reallocData(d->size, isTooSmall ? d->size + 1 : d->alloc, opt); + realloc(isTooSmall ? d->size + 1 : d->alloc, opt); } new (d->end()) T(std::move(t)); @@ -717,13 +799,11 @@ void QVector<T>::removeLast() Q_ASSERT(!isEmpty()); Q_ASSERT(d->alloc); - if (!d->ref.isShared()) { - --d->size; - if (QTypeInfo<T>::isComplex) - (d->data() + d->size)->~T(); - } else { - reallocData(d->size - 1); - } + if (d->ref.isShared()) + detach(); + --d->size; + if (QTypeInfo<T>::isComplex) + (d->data() + d->size)->~T(); } template <typename T> @@ -735,7 +815,7 @@ typename QVector<T>::iterator QVector<T>::insert(iterator before, size_type n, c if (n != 0) { const T copy(t); if (!isDetached() || d->size + n > int(d->alloc)) - reallocData(d->size, d->size + n, QArrayData::Grow); + realloc(d->size + n, QArrayData::Grow); if (!QTypeInfoQuery<T>::isRelocatable) { T *b = d->end(); T *i = d->end() + n; @@ -768,7 +848,7 @@ typename QVector<T>::iterator QVector<T>::insert(iterator before, T &&t) const auto offset = std::distance(d->begin(), before); if (!isDetached() || d->size + 1 > int(d->alloc)) - reallocData(d->size, d->size + 1, QArrayData::Grow); + realloc(d->size + 1, QArrayData::Grow); if (!QTypeInfoQuery<T>::isRelocatable) { T *i = d->end(); T *j = i + 1; @@ -870,14 +950,14 @@ QVector<T> &QVector<T>::fill(const T &from, int asize) template <typename T> QVector<T> &QVector<T>::operator+=(const QVector &l) { - if (d == Data::sharedNull()) { + if (d->size == 0) { *this = l; } else { uint newSize = d->size + l.d->size; const bool isTooSmall = newSize > d->alloc; if (!isDetached() || isTooSmall) { QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default); - reallocData(d->size, isTooSmall ? newSize : d->alloc, opt); + realloc(isTooSmall ? newSize : d->alloc, opt); } if (d->alloc) { @@ -960,7 +1040,7 @@ Q_OUTOFLINE_TEMPLATE QVector<T> QVector<T>::mid(int pos, int len) const } QVector<T> midResult; - midResult.reallocData(0, len); + midResult.realloc(len); T *srcFrom = d->begin() + pos; T *srcTo = d->begin() + pos + len; midResult.copyConstruct(srcFrom, srcTo, midResult.data()); @@ -968,37 +1048,6 @@ Q_OUTOFLINE_TEMPLATE QVector<T> QVector<T>::mid(int pos, int len) const return midResult; } -template <typename T> -Q_OUTOFLINE_TEMPLATE QList<T> QVector<T>::toList() const -{ - QList<T> result; - result.reserve(size()); - for (int i = 0; i < size(); ++i) - result.append(at(i)); - return result; -} - -template <typename T> -Q_OUTOFLINE_TEMPLATE QVector<T> QList<T>::toVector() const -{ - QVector<T> result(size()); - for (int i = 0; i < size(); ++i) - result[i] = at(i); - return result; -} - -template <typename T> -QVector<T> QVector<T>::fromList(const QList<T> &list) -{ - return list.toVector(); -} - -template <typename T> -QList<T> QList<T>::fromVector(const QVector<T> &vector) -{ - return vector.toList(); -} - Q_DECLARE_SEQUENTIAL_ITERATOR(Vector) Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(Vector) @@ -1046,20 +1095,12 @@ inline bool operator>=(const QVector<T> &lhs, const QVector<T> &rhs) ### QVector<QPointF> respectively. */ -#ifdef Q_CC_MSVC +#if defined(Q_CC_MSVC) && !defined(QT_BUILD_CORE_LIB) QT_BEGIN_INCLUDE_NAMESPACE #include <QtCore/qpoint.h> QT_END_INCLUDE_NAMESPACE - -#ifndef Q_TEMPLATE_EXTERN -#if defined(QT_BUILD_CORE_LIB) -#define Q_TEMPLATE_EXTERN -#else -#define Q_TEMPLATE_EXTERN extern -#endif -#endif -Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QPointF>; -Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QPoint>; +extern template class Q_CORE_EXPORT QVector<QPointF>; +extern template class Q_CORE_EXPORT QVector<QPoint>; #endif QVector<uint> QStringView::toUcs4() const { return QtPrivate::convertToUcs4(*this); } diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index dc28e0e0a2..995bab694e 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -39,6 +39,7 @@ HEADERS += \ tools/qmargins.h \ tools/qmessageauthenticationcode.h \ tools/qcontiguouscache.h \ + tools/qoffsetstringarray_p.h \ tools/qpair.h \ tools/qpoint.h \ tools/qqueue.h \ diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index ce799e0951..920a04315d 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -20,7 +20,7 @@ DEFINES += QT_NO_FOREACH QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf -PUB_HEADERS = qtdbusglobal.h \ +HEADERS += qtdbusglobal.h \ qdbusargument.h \ qdbusconnectioninterface.h \ qdbuserror.h \ @@ -38,8 +38,7 @@ PUB_HEADERS = qtdbusglobal.h \ qdbuscontext.h \ qdbusvirtualobject.h \ qdbusservicewatcher.h \ - qdbusunixfiledescriptor.h -HEADERS += $$PUB_HEADERS \ + qdbusunixfiledescriptor.h \ qtdbusglobal_p.h \ qdbusconnection_p.h \ qdbusconnectionmanager_p.h \ diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf index 69eaa0eec3..4ff7242b25 100644 --- a/src/dbus/doc/qtdbus.qdocconf +++ b/src/dbus/doc/qtdbus.qdocconf @@ -21,6 +21,8 @@ excludedirs += ../../../examples/widgets/doc examplesinstallpath = dbus +tagfile = qtdbus.tags + depends += qtdoc qtcore # The following parameters are for creating a qhp file, the qhelpgenerator diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index a33c4f8363..2d1373006d 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -267,7 +267,7 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d) */ /*! - \fn qdbus_cast(const QDBusArgument &arg) + \fn template<typename T> T qdbus_cast(const QDBusArgument &arg, T*) \relates QDBusArgument \since 4.2 diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index a6d4e9cd25..ac650d5f62 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -158,22 +158,14 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusArgument) QT_BEGIN_NAMESPACE -template<typename T> inline T qdbus_cast(const QDBusArgument &arg -#ifndef Q_QDOC -, T * = nullptr -#endif - ) +template<typename T> inline T qdbus_cast(const QDBusArgument &arg, T * = nullptr) { T item; arg >> item; return item; } -template<typename T> inline T qdbus_cast(const QVariant &v -#ifndef Q_QDOC -, T * = nullptr -#endif - ) +template<typename T> inline T qdbus_cast(const QVariant &v, T * = nullptr) { int id = v.userType(); if (id == qMetaTypeId<QDBusArgument>()) diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h index 559f8b1186..b678b9606f 100644 --- a/src/dbus/qdbusargument_p.h +++ b/src/dbus/qdbusargument_p.h @@ -155,7 +155,7 @@ public: bool skipSignature; private: - Q_DISABLE_COPY(QDBusMarshaller) + Q_DISABLE_COPY_MOVE(QDBusMarshaller) }; class QDBusDemarshaller: public QDBusArgumentPrivate @@ -208,7 +208,7 @@ public: QDBusDemarshaller *parent; private: - Q_DISABLE_COPY(QDBusDemarshaller) + Q_DISABLE_COPY_MOVE(QDBusDemarshaller) QString toStringUnchecked(); QDBusObjectPath toObjectPathUnchecked(); QDBusSignature toSignatureUnchecked(); diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index ca7adfaaeb..3711981f78 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -122,9 +122,7 @@ public: SubPath = 0x1 // Reserved = 0xff000000 }; -#ifndef Q_QDOC Q_DECLARE_FLAGS(VirtualObjectRegisterOptions, VirtualObjectRegisterOption) -#endif enum ConnectionCapability { UnixFileDescriptorPassing = 0x0001 diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 444d4727fd..7769b9ea71 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -94,7 +94,7 @@ class QDBusServer; class QDBusErrorInternal { mutable DBusError error; - Q_DISABLE_COPY(QDBusErrorInternal) + Q_DISABLE_COPY_MOVE(QDBusErrorInternal) public: inline QDBusErrorInternal() { q_dbus_error_init(&error); } inline ~QDBusErrorInternal() { q_dbus_error_free(&error); } @@ -121,6 +121,15 @@ public: QSocketNotifier *write; }; + struct ArgMatchRules { + QStringList args; + QString arg0namespace; + bool operator==(const ArgMatchRules &other) const { + return args == other.args && + arg0namespace == other.arg0namespace; + } + }; + struct SignalHook { inline SignalHook() : obj(0), midx(-1) { } @@ -128,7 +137,7 @@ public: QObject* obj; int midx; QVector<int> params; - QStringList argumentMatch; + ArgMatchRules argumentMatch; QByteArray matchRule; }; @@ -207,12 +216,19 @@ public: QDBusMessage sendWithReplyLocal(const QDBusMessage &message); QDBusPendingCallPrivate *sendWithReplyAsync(const QDBusMessage &message, QObject *receiver, const char *returnMethod, const char *errorMethod,int timeout = -1); + bool connectSignal(const QString &service, const QString &path, const QString& interface, const QString &name, const QStringList &argumentMatch, const QString &signature, QObject *receiver, const char *slot); bool disconnectSignal(const QString &service, const QString &path, const QString& interface, const QString &name, const QStringList &argumentMatch, const QString &signature, QObject *receiver, const char *slot); + bool connectSignal(const QString &service, const QString &path, const QString& interface, + const QString &name, const ArgMatchRules &argumentMatch, const QString &signature, + QObject *receiver, const char *slot); + bool disconnectSignal(const QString &service, const QString &path, const QString& interface, + const QString &name, const ArgMatchRules &argumentMatch, const QString &signature, + QObject *receiver, const char *slot); void registerObject(const ObjectTreeNode *node); void unregisterObject(const QString &path, QDBusConnection::UnregisterMode mode); void connectRelay(const QString &service, @@ -332,7 +348,7 @@ public: static bool prepareHook(QDBusConnectionPrivate::SignalHook &hook, QString &key, const QString &service, const QString &path, const QString &interface, const QString &name, - const QStringList &argMatch, + const ArgMatchRules &argMatch, QObject *receiver, const char *signal, int minMIdx, bool buildSignature); static DBusHandlerResult messageFilter(DBusConnection *, DBusMessage *, void *); diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index e966f9dcde..decd345ece 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -41,6 +41,7 @@ #include <qdebug.h> #include <qvarlengtharray.h> +#include <private/qoffsetstringarray_p.h> #ifndef QT_BOOTSTRAPPED #include "qdbus_symbols_p.h" @@ -52,110 +53,46 @@ QT_BEGIN_NAMESPACE -/* - * Use the following Perl script to generate the error string index list: -===== PERL SCRIPT ==== -print "static const char errorMessages_string[] =\n"; -$counter = 0; -$i = 0; -while (<STDIN>) { - chomp; - print " \"$_\\0\"\n"; - $sizes[$i++] = $counter; - $counter += 1 + length $_; -} -print " \"\\0\";\n\nstatic const int errorMessages_indices[] = {\n "; -for ($j = 0; $j < $i; ++$j) { - printf "$sizes[$j], "; -} -print "0\n};\n"; -===== PERL SCRIPT ==== - - * The input data is as follows: -other -org.freedesktop.DBus.Error.Failed -org.freedesktop.DBus.Error.NoMemory -org.freedesktop.DBus.Error.ServiceUnknown -org.freedesktop.DBus.Error.NoReply -org.freedesktop.DBus.Error.BadAddress -org.freedesktop.DBus.Error.NotSupported -org.freedesktop.DBus.Error.LimitsExceeded -org.freedesktop.DBus.Error.AccessDenied -org.freedesktop.DBus.Error.NoServer -org.freedesktop.DBus.Error.Timeout -org.freedesktop.DBus.Error.NoNetwork -org.freedesktop.DBus.Error.AddressInUse -org.freedesktop.DBus.Error.Disconnected -org.freedesktop.DBus.Error.InvalidArgs -org.freedesktop.DBus.Error.UnknownMethod -org.freedesktop.DBus.Error.TimedOut -org.freedesktop.DBus.Error.InvalidSignature -org.freedesktop.DBus.Error.UnknownInterface -org.freedesktop.DBus.Error.UnknownObject -org.freedesktop.DBus.Error.UnknownProperty -org.freedesktop.DBus.Error.PropertyReadOnly -org.qtproject.QtDBus.Error.InternalError -org.qtproject.QtDBus.Error.InvalidService -org.qtproject.QtDBus.Error.InvalidObjectPath -org.qtproject.QtDBus.Error.InvalidInterface -org.qtproject.QtDBus.Error.InvalidMember -*/ - -// in the same order as KnownErrors! -static const char errorMessages_string[] = - "other\0" - "org.freedesktop.DBus.Error.Failed\0" - "org.freedesktop.DBus.Error.NoMemory\0" - "org.freedesktop.DBus.Error.ServiceUnknown\0" - "org.freedesktop.DBus.Error.NoReply\0" - "org.freedesktop.DBus.Error.BadAddress\0" - "org.freedesktop.DBus.Error.NotSupported\0" - "org.freedesktop.DBus.Error.LimitsExceeded\0" - "org.freedesktop.DBus.Error.AccessDenied\0" - "org.freedesktop.DBus.Error.NoServer\0" - "org.freedesktop.DBus.Error.Timeout\0" - "org.freedesktop.DBus.Error.NoNetwork\0" - "org.freedesktop.DBus.Error.AddressInUse\0" - "org.freedesktop.DBus.Error.Disconnected\0" - "org.freedesktop.DBus.Error.InvalidArgs\0" - "org.freedesktop.DBus.Error.UnknownMethod\0" - "org.freedesktop.DBus.Error.TimedOut\0" - "org.freedesktop.DBus.Error.InvalidSignature\0" - "org.freedesktop.DBus.Error.UnknownInterface\0" - "org.freedesktop.DBus.Error.UnknownObject\0" - "org.freedesktop.DBus.Error.UnknownProperty\0" - "org.freedesktop.DBus.Error.PropertyReadOnly\0" - "org.qtproject.QtDBus.Error.InternalError\0" - "org.qtproject.QtDBus.Error.InvalidService\0" - "org.qtproject.QtDBus.Error.InvalidObjectPath\0" - "org.qtproject.QtDBus.Error.InvalidInterface\0" - "org.qtproject.QtDBus.Error.InvalidMember\0" - "\0"; - -static const int errorMessages_indices[] = { - 0, 6, 40, 76, 118, 153, 191, 231, - 273, 313, 349, 384, 421, 461, 501, 540, - 581, 617, 661, 705, 746, 789, 833, 874, - 916, 961, 1005 -}; - -static const int errorMessages_count = sizeof errorMessages_indices / - sizeof errorMessages_indices[0]; - -static inline const char *get(QDBusError::ErrorType code) -{ - int intcode = qBound(0, int(code) - int(QDBusError::Other), errorMessages_count); - return errorMessages_string + errorMessages_indices[intcode]; -} +static constexpr const auto errorMessages = qOffsetStringArray( + "NoError", + "other", + "org.freedesktop.DBus.Error.Failed", + "org.freedesktop.DBus.Error.NoMemory", + "org.freedesktop.DBus.Error.ServiceUnknown", + "org.freedesktop.DBus.Error.NoReply", + "org.freedesktop.DBus.Error.BadAddress", + "org.freedesktop.DBus.Error.NotSupported", + "org.freedesktop.DBus.Error.LimitsExceeded", + "org.freedesktop.DBus.Error.AccessDenied", + "org.freedesktop.DBus.Error.NoServer", + "org.freedesktop.DBus.Error.Timeout", + "org.freedesktop.DBus.Error.NoNetwork", + "org.freedesktop.DBus.Error.AddressInUse", + "org.freedesktop.DBus.Error.Disconnected", + "org.freedesktop.DBus.Error.InvalidArgs", + "org.freedesktop.DBus.Error.UnknownMethod", + "org.freedesktop.DBus.Error.TimedOut", + "org.freedesktop.DBus.Error.InvalidSignature", + "org.freedesktop.DBus.Error.UnknownInterface", + "org.freedesktop.DBus.Error.UnknownObject", + "org.freedesktop.DBus.Error.UnknownProperty", + "org.freedesktop.DBus.Error.PropertyReadOnly", + "org.qtproject.QtDBus.Error.InternalError", + "org.qtproject.QtDBus.Error.InvalidService", + "org.qtproject.QtDBus.Error.InvalidObjectPath", + "org.qtproject.QtDBus.Error.InvalidInterface", + "org.qtproject.QtDBus.Error.InvalidMember", + "" +); #ifndef QT_BOOTSTRAPPED static inline QDBusError::ErrorType get(const char *name) { if (!name || !*name) return QDBusError::NoError; - for (int i = 0; i < errorMessages_count; ++i) - if (strcmp(name, errorMessages_string + errorMessages_indices[i]) == 0) - return QDBusError::ErrorType(i + int(QDBusError::Other)); + for (int i = 0; i < errorMessages.count(); ++i) + if (strcmp(name, errorMessages.at(i)) == 0) + return QDBusError::ErrorType(i); return QDBusError::Other; } #endif @@ -301,7 +238,7 @@ QDBusError::QDBusError(const QDBusMessage &qdmsg) QDBusError::QDBusError(ErrorType error, const QString &mess) : code(error) { - nm = QLatin1String(::get(error)); + nm = QLatin1String(errorMessages[error]); msg = mess; } @@ -397,7 +334,7 @@ bool QDBusError::isValid() const */ QString QDBusError::errorString(ErrorType error) { - return QLatin1String(::get(error)); + return QLatin1String(errorMessages[error]); } #ifndef QT_NO_DEBUG_STREAM @@ -418,3 +355,11 @@ QDebug operator<<(QDebug dbg, const QDBusError &msg) QT_END_NAMESPACE #endif // QT_NO_DBUS + +/* +MSVC2015 has the warning C4503 at the end of the file: +QtPrivate::StaticStringBuilder<QtPrivate::IndexesList<...> - decorated name length exceeded, name was truncated +It is used by qOffsetStringArray in a constexpr evaulation and this code does not exist in the object file, +but we still have the warning or even error with -WX flag +*/ +QT_WARNING_DISABLE_MSVC(4503) diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index dfef25e3a8..1125480447 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -338,7 +338,7 @@ void QDBusConnectionPrivate::_q_newConnection(QDBusConnectionPrivate *newConnect static QByteArray buildMatchRule(const QString &service, const QString &objectPath, const QString &interface, - const QString &member, const QStringList &argMatch, const QString & /*signature*/) + const QString &member, const QDBusConnectionPrivate::ArgMatchRules &argMatch, const QString & /*signature*/) { QString result = QLatin1String("type='signal',"); QString keyValue = QLatin1String("%1='%2',"); @@ -353,11 +353,14 @@ static QByteArray buildMatchRule(const QString &service, result += keyValue.arg(QLatin1String("member"), member); // add the argument string-matching now - if (!argMatch.isEmpty()) { + if (!argMatch.args.isEmpty()) { keyValue = QLatin1String("arg%1='%2',"); - for (int i = 0; i < argMatch.count(); ++i) - if (!argMatch.at(i).isNull()) - result += keyValue.arg(i).arg(argMatch.at(i)); + for (int i = 0; i < argMatch.args.count(); ++i) + if (!argMatch.args.at(i).isNull()) + result += keyValue.arg(i).arg(argMatch.args.at(i)); + } + if (!argMatch.arg0namespace.isEmpty()) { + result += QStringLiteral("arg0namespace='%1',").arg(argMatch.arg0namespace); } result.chop(1); // remove ending comma @@ -456,21 +459,26 @@ static QObject *findChildObject(const QDBusConnectionPrivate::ObjectTreeNode *ro return 0; } -static QStringList matchArgsForService(const QString &service, QDBusServiceWatcher::WatchMode mode) +static QDBusConnectionPrivate::ArgMatchRules matchArgsForService(const QString &service, QDBusServiceWatcher::WatchMode mode) { - QStringList matchArgs; - matchArgs << service; + QDBusConnectionPrivate::ArgMatchRules matchArgs; + if (service.endsWith(QLatin1Char('*'))) { + matchArgs.arg0namespace = service.chopped(1); + matchArgs.args << QString(); + } + else + matchArgs.args << service; switch (mode) { case QDBusServiceWatcher::WatchForOwnerChange: break; case QDBusServiceWatcher::WatchForRegistration: - matchArgs << QString::fromLatin1("", 0); + matchArgs.args << QString::fromLatin1("", 0); break; case QDBusServiceWatcher::WatchForUnregistration: - matchArgs << QString() << QString::fromLatin1("", 0); + matchArgs.args << QString() << QString::fromLatin1("", 0); break; } return matchArgs; @@ -1311,7 +1319,7 @@ int QDBusConnectionPrivate::findSlot(QObject* obj, const QByteArray &normalizedN bool QDBusConnectionPrivate::prepareHook(QDBusConnectionPrivate::SignalHook &hook, QString &key, const QString &service, const QString &path, const QString &interface, const QString &name, - const QStringList &argMatch, + const ArgMatchRules &argMatch, QObject *receiver, const char *signal, int minMIdx, bool buildSignature) { @@ -1621,14 +1629,14 @@ void QDBusConnectionPrivate::handleSignal(const QString &key, const QDBusMessage continue; if (hook.signature.isEmpty() && !hook.signature.isNull() && !msg.signature().isEmpty()) continue; - if (!hook.argumentMatch.isEmpty()) { + if (!hook.argumentMatch.args.isEmpty()) { const QVariantList arguments = msg.arguments(); - if (hook.argumentMatch.size() > arguments.size()) + if (hook.argumentMatch.args.size() > arguments.size()) continue; bool matched = true; - for (int i = 0; i < hook.argumentMatch.size(); ++i) { - const QString ¶m = hook.argumentMatch.at(i); + for (int i = 0; i < hook.argumentMatch.args.size(); ++i) { + const QString ¶m = hook.argumentMatch.args.at(i); if (param.isNull()) continue; // don't try to match against this if (param == arguments.at(i).toString()) @@ -1639,7 +1647,15 @@ void QDBusConnectionPrivate::handleSignal(const QString &key, const QDBusMessage if (!matched) continue; } - + if (!hook.argumentMatch.arg0namespace.isEmpty()) { + const QVariantList arguments = msg.arguments(); + if (arguments.size() < 1) + continue; + const QString param = arguments.at(0).toString(); + if (param != hook.argumentMatch.arg0namespace + && !param.startsWith(hook.argumentMatch.arg0namespace + QLatin1Char('.'))) + continue; + } activateSignal(hook, msg); } } @@ -2181,11 +2197,22 @@ void QDBusConnectionPrivate::sendInternal(QDBusPendingCallPrivate *pcall, void * } } + bool QDBusConnectionPrivate::connectSignal(const QString &service, const QString &path, const QString &interface, const QString &name, const QStringList &argumentMatch, const QString &signature, QObject *receiver, const char *slot) { + ArgMatchRules rules; + rules.args = argumentMatch; + return connectSignal(service, path, interface, name, rules, signature, receiver, slot); +} + +bool QDBusConnectionPrivate::connectSignal(const QString &service, + const QString &path, const QString &interface, const QString &name, + const ArgMatchRules &argumentMatch, const QString &signature, + QObject *receiver, const char *slot) +{ // check the slot QDBusConnectionPrivate::SignalHook hook; QString key; @@ -2242,9 +2269,11 @@ bool QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook WatchedServicesHash::mapped_type &data = watchedServices[hook.service]; if (++data.refcount == 1) { // we need to watch for this service changing + ArgMatchRules rules; + rules.args << hook.service; q_dbus_bus_add_match(connection, buildMatchRule(QDBusUtil::dbusService(), QString(), QDBusUtil::dbusInterface(), - QDBusUtil::nameOwnerChanged(), QStringList() << hook.service, QString()), + QDBusUtil::nameOwnerChanged(), rules, QString()), NULL); data.owner = getNameOwnerNoCache(hook.service); qDBusDebug() << this << "Watching service" << hook.service << "for owner changes (current owner:" @@ -2257,8 +2286,18 @@ bool QDBusConnectionPrivate::addSignalHook(const QString &key, const SignalHook } bool QDBusConnectionPrivate::disconnectSignal(const QString &service, + const QString &path, const QString &interface, const QString &name, + const QStringList &argumentMatch, const QString &signature, + QObject *receiver, const char *slot) +{ + ArgMatchRules rules; + rules.args = argumentMatch; + return disconnectSignal(service, path, interface, name, rules, signature, receiver, slot); +} + +bool QDBusConnectionPrivate::disconnectSignal(const QString &service, const QString &path, const QString &interface, const QString &name, - const QStringList &argumentMatch, const QString &signature, + const ArgMatchRules &argumentMatch, const QString &signature, QObject *receiver, const char *slot) { // check the slot @@ -2289,7 +2328,7 @@ bool QDBusConnectionPrivate::removeSignalHook(const QString &key, const SignalHo entry.signature == hook.signature && entry.obj == hook.obj && entry.midx == hook.midx && - entry.argumentMatch == hook.argumentMatch) { + entry.argumentMatch.args == hook.argumentMatch.args) { // no need to compare the parameters if it's the same slot removeSignalHookNoLock(it); return true; // it was there @@ -2331,9 +2370,11 @@ QDBusConnectionPrivate::removeSignalHookNoLock(SignalHookHash::Iterator it) if (sit != watchedServices.end()) { if (--sit.value().refcount == 0) { watchedServices.erase(sit); + ArgMatchRules rules; + rules.args << hook.service; q_dbus_bus_remove_match(connection, buildMatchRule(QDBusUtil::dbusService(), QString(), QDBusUtil::dbusInterface(), - QDBusUtil::nameOwnerChanged(), QStringList() << hook.service, QString()), + QDBusUtil::nameOwnerChanged(), rules, QString()), NULL); } } @@ -2394,7 +2435,7 @@ void QDBusConnectionPrivate::connectRelay(const QString &service, QByteArray sig; sig.append(QSIGNAL_CODE + '0'); sig.append(signal.methodSignature()); - if (!prepareHook(hook, key, service, path, interface, QString(), QStringList(), receiver, sig, + if (!prepareHook(hook, key, service, path, interface, QString(), ArgMatchRules(), receiver, sig, QDBusAbstractInterface::staticMetaObject.methodCount(), true)) return; // don't connect @@ -2415,7 +2456,7 @@ void QDBusConnectionPrivate::disconnectRelay(const QString &service, QByteArray sig; sig.append(QSIGNAL_CODE + '0'); sig.append(signal.methodSignature()); - if (!prepareHook(hook, key, service, path, interface, QString(), QStringList(), receiver, sig, + if (!prepareHook(hook, key, service, path, interface, QString(), ArgMatchRules(), receiver, sig, QDBusAbstractInterface::staticMetaObject.methodCount(), true)) return; // don't disconnect @@ -2448,7 +2489,7 @@ bool QDBusConnectionPrivate::shouldWatchService(const QString &service) */ void QDBusConnectionPrivate::watchService(const QString &service, QDBusServiceWatcher::WatchMode mode, QObject *obj, const char *member) { - QStringList matchArgs = matchArgsForService(service, mode); + ArgMatchRules matchArgs = matchArgsForService(service, mode); connectSignal(QDBusUtil::dbusService(), QString(), QDBusUtil::dbusInterface(), QDBusUtil::nameOwnerChanged(), matchArgs, QString(), obj, member); } @@ -2463,7 +2504,7 @@ void QDBusConnectionPrivate::watchService(const QString &service, QDBusServiceWa */ void QDBusConnectionPrivate::unwatchService(const QString &service, QDBusServiceWatcher::WatchMode mode, QObject *obj, const char *member) { - QStringList matchArgs = matchArgsForService(service, mode); + ArgMatchRules matchArgs = matchArgsForService(service, mode); disconnectSignal(QDBusUtil::dbusService(), QString(), QDBusUtil::dbusInterface(), QDBusUtil::nameOwnerChanged(), matchArgs, QString(), obj, member); } diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index 2a31dd950a..4d0131afff 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -311,7 +311,7 @@ QDBusPendingCall &QDBusPendingCall::operator=(const QDBusPendingCall &other) \sa QDBusPendingReply::isFinished() */ /*! - \fn bool QDBusPendingReply::isFinished() const + \fn template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> bool QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::isFinished() const Returns \c true if the pending call has finished processing and the reply has been received. If this function returns \c true, the @@ -340,7 +340,7 @@ void QDBusPendingCall::waitForFinished() } /*! - \fn bool QDBusPendingReply::isValid() const + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> bool QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::isValid() const Returns \c true if the reply contains a normal reply message, false if it contains anything else. @@ -357,7 +357,7 @@ bool QDBusPendingCall::isValid() const } /*! - \fn bool QDBusPendingReply::isError() const + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> bool QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::isError() const Returns \c true if the reply contains an error message, false if it contains a normal method reply. @@ -374,7 +374,7 @@ bool QDBusPendingCall::isError() const } /*! - \fn QDBusError QDBusPendingReply::error() const + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusError QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::error() const Retrieves the error content of the reply message, if it has finished processing. If the reply message has not finished @@ -395,7 +395,7 @@ QDBusError QDBusPendingCall::error() const } /*! - \fn QDBusMessage QDBusPendingReply::reply() const + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusMessage QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::reply() const Retrieves the reply message received for the asynchronous call that was sent, if it has finished processing. If the pending call @@ -445,7 +445,7 @@ bool QDBusPendingCall::setReplyCallback(QObject *target, const char *member) \since 4.6 Creates a QDBusPendingCall object based on the error condition \a error. The resulting pending call object will be in the - "finished" state and QDBusPendingReply::isError() will return true. + "finished" state and QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::isError() will return true. \sa fromCompletedCall() */ diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index ec8ba6c541..24b1d6a7ca 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -67,7 +67,7 @@ public: void swap(QDBusPendingCall &other) Q_DECL_NOTHROW { qSwap(d, other.d); } -#ifndef Q_QDOC +#ifndef Q_CLANG_QDOC // pretend that they aren't here bool isFinished() const; void waitForFinished(); diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp index fef6f36432..6aec571563 100644 --- a/src/dbus/qdbuspendingreply.cpp +++ b/src/dbus/qdbuspendingreply.cpp @@ -94,7 +94,7 @@ */ /*! - \fn QDBusPendingReply::QDBusPendingReply() + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::QDBusPendingReply() Creates an empty QDBusPendingReply object. Without assigning a QDBusPendingCall object to this reply, QDBusPendingReply cannot do @@ -102,7 +102,7 @@ */ /*! - \fn QDBusPendingReply::QDBusPendingReply(const QDBusPendingReply &other) + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::QDBusPendingReply(const QDBusPendingReply &other) Creates a copy of the \a other QDBusPendingReply object. Just like QDBusPendingCall and QDBusPendingCallWatcher, this QDBusPendingReply @@ -111,7 +111,7 @@ */ /*! - \fn QDBusPendingReply::QDBusPendingReply(const QDBusPendingCall &call) + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::QDBusPendingReply(const QDBusPendingCall &call) Creates a QDBusPendingReply object that will take its contents from the \a call pending asynchronous call. This QDBusPendingReply object @@ -119,7 +119,7 @@ */ /*! - \fn QDBusPendingReply::QDBusPendingReply(const QDBusMessage &message) + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::QDBusPendingReply(const QDBusMessage &message) Creates a QDBusPendingReply object that will take its contents from the message \a message. In this case, this object will be already @@ -129,7 +129,7 @@ */ /*! - \fn QDBusPendingReply &QDBusPendingReply::operator=(const QDBusPendingReply &other) + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusPendingReply &QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::operator=(const QDBusPendingReply &other) Makes a copy of \a other and drops the reference to the current pending call. If the current reference is to an unfinished pending @@ -139,7 +139,7 @@ */ /*! - \fn QDBusPendingReply &QDBusPendingReply::operator=(const QDBusPendingCall &call) + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusPendingReply &QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::operator=(const QDBusPendingCall &call) Makes this object take its contents from the \a call pending call and drops the reference to the current pending call. If the @@ -149,7 +149,7 @@ */ /*! - \fn QDBusPendingReply &QDBusPendingReply::operator=(const QDBusMessage &message) + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusPendingReply &QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::operator=(const QDBusMessage &message) Makes this object take its contents from the \a message message and drops the reference to the current pending call. If the @@ -171,7 +171,7 @@ */ /*! - \fn int QDBusPendingReply::count() const + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> int QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::count() const Return the number of arguments the reply is supposed to have. This number matches the number of non-void template parameters in this @@ -183,7 +183,7 @@ */ /*! - \fn QVariant QDBusPendingReply::argumentAt(int index) const + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QVariant QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::argumentAt(int index) const Returns the argument at position \a index in the reply's contents. If the reply doesn't have that many elements, this @@ -198,12 +198,7 @@ */ /*! - \typedef QDBusPendingReply::T1 - \internal - */ - -/*! - \fn T1 QDBusPendingReply::value() const + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> T1 QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::value() const Returns the first argument in this reply, cast to type \c T1 (the first template parameter of this class). This is equivalent to @@ -221,7 +216,7 @@ */ /*! - \fn QDBusPendingReply::operator T1() const + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::operator T1() const Returns the first argument in this reply, cast to type \c T1 (the first template parameter of this class). This is equivalent to @@ -239,7 +234,7 @@ */ /*! - \fn void QDBusPendingReply::waitForFinished() + \fn template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> void QDBusPendingReply<T1, T2, T3, T4, T5, T6, T7, T8>::waitForFinished() Suspends the execution of the calling thread until the reply is received and processed. After this function returns, isFinished() diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 4d2c3a7c5a..bc5cd92c84 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -108,10 +108,8 @@ namespace QDBusPendingReplyTypes { template <> struct NotVoid<void> { typedef TypeIsVoid Type; }; } // namespace QDBusPendingReplyTypes -#ifndef Q_CLANG_QDOC template<typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void, typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void> -#endif class QDBusPendingReply: #ifdef Q_CLANG_QDOC public QDBusPendingCall @@ -171,7 +169,6 @@ public: QDBusError error() const; QDBusMessage reply() const; - typedef QVariant T1; inline T1 value() const; inline operator T1() const; #else diff --git a/src/dbus/qdbusreply.cpp b/src/dbus/qdbusreply.cpp index ab361f1674..6abfaf174c 100644 --- a/src/dbus/qdbusreply.cpp +++ b/src/dbus/qdbusreply.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn template<typename T> QDBusReply<T>::QDBusReply(const QDBusPendingReply &reply) + \fn template<typename T> QDBusReply<T>::QDBusReply(const QDBusPendingReply<T> &reply) Constructs a QDBusReply object from the pending reply message, \a reply. */ diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 177b6c6e89..869687ac85 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -82,14 +82,10 @@ public: other.waitForFinished(); return *this = other.reply(); } -#if defined(Q_CLANG_QDOC) - inline QDBusReply(const QDBusPendingReply &reply) { } -#else inline QDBusReply(const QDBusPendingReply<T> &reply) { *this = static_cast<QDBusPendingCall>(reply); } -#endif inline QDBusReply(const QDBusError &dbusError = QDBusError()) : m_error(dbusError), m_data(Type()) diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp index 0c2fb9118f..b0bfe7254d 100644 --- a/src/dbus/qdbusservicewatcher.cpp +++ b/src/dbus/qdbusservicewatcher.cpp @@ -139,6 +139,17 @@ void QDBusServiceWatcherPrivate::removeService(const QString &service) QDBusConnectionInterface::serviceOwnerChanged() signal because it allows one to receive only the signals for which the class is interested in. + Ending a service name with the character '*' will match all service names + within the specified namespace. + + For example "com.example.backend1*" will match + \list + \li com.example.backend1 + \li com.example.backend1.foo + \li com.example.backend1.foo.bar + \endlist + Substrings in the same domain will not be matched, i.e "com.example.backend12". + \sa QDBusConnection */ diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index 28341a71a8..dc94897ac4 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.cpp @@ -331,8 +331,8 @@ namespace QDBusUtil /*! \internal - \fn bool QDBusUtil::isValidPartOfObjectPath(const QStringRef &part) - See QDBusUtil::isValidObjectPath + \fn bool isValidPartOfObjectPath(const QStringRef &part) + See isValidObjectPath */ bool isValidPartOfObjectPath(const QStringRef &part) { @@ -349,13 +349,13 @@ namespace QDBusUtil /*! \internal - \fn bool QDBusUtil::isValidPartOfObjectPath(const QString &part) + \fn bool isValidPartOfObjectPath(const QString &part) \overload */ /*! - \fn bool QDBusUtil::isValidInterfaceName(const QString &ifaceName) + \fn bool isValidInterfaceName(const QString &ifaceName) Returns \c true if this is \a ifaceName is a valid interface name. Valid interface names must: @@ -384,7 +384,7 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidUniqueConnectionName(const QStringRef &connName) + \fn bool isValidUniqueConnectionName(const QStringRef &connName) Returns \c true if \a connName is a valid unique connection name. Unique connection names start with a colon (":") and are followed by a list of dot-separated @@ -414,13 +414,13 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidUniqueConnectionName(const QString &connName) + \fn bool isValidUniqueConnectionName(const QString &connName) \overload */ /*! - \fn bool QDBusUtil::isValidBusName(const QString &busName) + \fn bool isValidBusName(const QString &busName) Returns \c true if \a busName is a valid bus name. A valid bus name is either a valid unique connection name or follows the rules: @@ -462,7 +462,7 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidMemberName(const QStringRef &memberName) + \fn bool isValidMemberName(const QStringRef &memberName) Returns \c true if \a memberName is a valid member name. A valid member name does not exceed 255 characters in length, is not empty, is composed only of ASCII letters, digits and underscores, but does not start with a digit. @@ -482,13 +482,13 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidMemberName(const QString &memberName) + \fn bool isValidMemberName(const QString &memberName) \overload */ /*! - \fn bool QDBusUtil::isValidErrorName(const QString &errorName) + \fn bool isValidErrorName(const QString &errorName) Returns \c true if \a errorName is a valid error name. Valid error names are valid interface names and vice-versa, so this function is actually an alias for isValidInterfaceName. */ @@ -498,7 +498,7 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidObjectPath(const QString &path) + \fn bool isValidObjectPath(const QString &path) Returns \c true if \a path is valid object path. Valid object paths follow the rules: @@ -529,7 +529,7 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidBasicType(int type) + \fn bool isValidBasicType(int type) Returns \c true if \a c is a valid, basic D-Bus type. */ bool isValidBasicType(int c) @@ -538,7 +538,7 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidFixedType(int type) + \fn bool isValidFixedType(int type) Returns \c true if \a c is a valid, fixed D-Bus type. */ bool isValidFixedType(int c) @@ -548,7 +548,7 @@ namespace QDBusUtil /*! - \fn bool QDBusUtil::isValidSignature(const QString &signature) + \fn bool isValidSignature(const QString &signature) Returns \c true if \a signature is a valid D-Bus type signature for one or more types. This function returns \c true if it can all of \a signature into valid, individual types and no characters remain in \a signature. @@ -569,7 +569,7 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidSingleSignature(const QString &signature) + \fn bool isValidSingleSignature(const QString &signature) Returns \c true if \a signature is a valid D-Bus type signature for exactly one full type. This function tries to convert the type signature into a D-Bus type and, if it succeeds and no characters remain in the signature, it returns \c true. diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 1309f17efd..e2163b06d0 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -966,8 +966,10 @@ protected: int m_lastColumn; }; +#ifndef Q_CLANG_QDOC #define QAccessibleInterface_iid "org.qt-project.Qt.QAccessibleInterface" Q_DECLARE_INTERFACE(QAccessibleInterface, QAccessibleInterface_iid) +#endif Q_GUI_EXPORT const char *qAccessibleRoleString(QAccessible::Role role); Q_GUI_EXPORT const char *qAccessibleEventString(QAccessible::Event event); diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h index 81479c32ab..fd07d33a18 100644 --- a/src/gui/accessible/qaccessibleobject.h +++ b/src/gui/accessible/qaccessibleobject.h @@ -65,7 +65,7 @@ public: QAccessibleInterface *childAt(int x, int y) const override; protected: - virtual ~QAccessibleObject(); + ~QAccessibleObject(); private: QAccessibleObjectPrivate *d; diff --git a/src/gui/doc/snippets/clipboard/clipwindow.cpp b/src/gui/doc/snippets/clipboard/clipwindow.cpp index bf1b2d904b..d1b39070fa 100644 --- a/src/gui/doc/snippets/clipboard/clipwindow.cpp +++ b/src/gui/doc/snippets/clipboard/clipwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "clipwindow.h" @@ -67,10 +67,11 @@ ClipWindow::ClipWindow(QWidget *parent) previousItems = new QListWidget(centralWidget); //! [0] - connect(clipboard, SIGNAL(dataChanged()), this, SLOT(updateClipboard())); + connect(clipboard, &QClipboard::dataChanged, + this, &ClipWindow::updateClipboard); //! [0] - connect(mimeTypeCombo, SIGNAL(activated(QString)), - this, SLOT(updateData(QString))); + connect(mimeTypeCombo, QOverload<QString>::of(&QComboBox::activated), + this, &ClipWindow::updateData); QVBoxLayout *currentLayout = new QVBoxLayout(currentItem); currentLayout->addWidget(mimeTypeLabel); diff --git a/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp b/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp index 40893fae87..4266da0a11 100644 --- a/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp +++ b/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp @@ -73,8 +73,8 @@ for (int i = 0; i < 4; ++i) { //! [2] QTreeView *treeView = new QTreeView(this); treeView->setModel(myStandardItemModel); -connect(treeView, SIGNAL(clicked(QModelIndex)), - this, SLOT(clicked(QModelIndex))); +connect(treeView, &QTreeView::clicked, + this, &MyWidget::clicked); //! [2] diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp index 7c5c387a5a..a399d444e1 100644 --- a/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp +++ b/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp @@ -64,7 +64,8 @@ MyMainWidget::MyMainWidget(QWidget *parent) :QWidget(parent) { QGuiApplication::setFallbackSessionManagementEnabled(false); - connect(qApp, SIGNAL(commitDataRequest(QSessionManager)), SLOT(commitData(QSessionManager))); + connect(qApp, &QGuiApplication::commitDataRequest, + this, &MyMainWidget::commitData); } void MyMainWidget::commitData(QSessionManager& manager) @@ -102,12 +103,14 @@ appname -session id //! [3] -foreach (const QString &command, mySession.restartCommand()) +const QStringList commands = mySession.restartCommand(); +for (const QString &command : commands) do_something(command); //! [3] //! [4] -foreach (const QString &command, mySession.discardCommand()) +const QStringList commands = mySession.discardCommand(); +for (const QString &command : mySession.discardCommand()) do_something(command); //! [4] diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp index e91aa3d548..961ecd6cde 100644 --- a/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp +++ b/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ //! [0] -QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); +QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); calculateHugeMandelbrot(); // lunch time... -QApplication::restoreOverrideCursor(); +QGuiApplication::restoreOverrideCursor(); //! [0] diff --git a/src/gui/doc/snippets/draganddrop/mainwindow.cpp b/src/gui/doc/snippets/draganddrop/mainwindow.cpp index 551114856e..11311a0b57 100644 --- a/src/gui/doc/snippets/draganddrop/mainwindow.cpp +++ b/src/gui/doc/snippets/draganddrop/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "dragwidget.h" #include "mainwindow.h" @@ -64,10 +64,10 @@ MainWindow::MainWindow(QWidget *parent) QLabel *dataLabel = new QLabel(tr("Amount of data (bytes):"), centralWidget); dragWidget = new DragWidget(centralWidget); - connect(dragWidget, SIGNAL(mimeTypes(QStringList)), - this, SLOT(setMimeTypes(QStringList))); - connect(dragWidget, SIGNAL(dragResult(QString)), - this, SLOT(setDragResult(QString))); + connect(dragWidget, &DragWidget::mimeTypes, + this, &MainWindow::setMimeTypes); + connect(dragWidget, &DragWidget:dragResult, + this, &MainWindow::setDragResult); QVBoxLayout *mainLayout = new QVBoxLayout(centralWidget); mainLayout->addWidget(mimeTypeLabel); diff --git a/src/gui/doc/snippets/picture/picture.cpp b/src/gui/doc/snippets/picture/picture.cpp index 3a7676f60a..863476fdbf 100644 --- a/src/gui/doc/snippets/picture/picture.cpp +++ b/src/gui/doc/snippets/picture/picture.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> void myProcessing(const QString &) { @@ -85,8 +85,8 @@ int main() { // FORMATS //! [2] - QStringList list = QPicture::inputFormatList(); - foreach (const QString &string, list) + const QStringList list = QPicture::inputFormatList(); + for (const QString &string : list) myProcessing(string); //! [2] } @@ -94,8 +94,8 @@ int main() { // OUTPUT //! [3] - QStringList list = QPicture::outputFormatList(); - foreach (const QString &string, list) + const QStringList list = QPicture::outputFormatList(); + for (const QString &string : list) myProcessing(string); //! [3] } diff --git a/src/gui/doc/snippets/qfontdatabase/main.cpp b/src/gui/doc/snippets/qfontdatabase/main.cpp index ae078f374d..5a5aa7b485 100644 --- a/src/gui/doc/snippets/qfontdatabase/main.cpp +++ b/src/gui/doc/snippets/qfontdatabase/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> int main(int argc, char **argv) { @@ -60,16 +60,19 @@ int main(int argc, char **argv) fontTree.setColumnCount(2); fontTree.setHeaderLabels(QStringList() << "Font" << "Smooth Sizes"); - foreach (const QString &family, database.families()) { + const QStringList fontFamilies = database.families(); + for (const QString &family : fontFamilies) { QTreeWidgetItem *familyItem = new QTreeWidgetItem(&fontTree); familyItem->setText(0, family); - foreach (const QString &style, database.styles(family)) { + const QStringList fontStyles = database.styles(family); + for (const QString &style : fontStyles) { QTreeWidgetItem *styleItem = new QTreeWidgetItem(familyItem); styleItem->setText(0, style); QString sizes; - foreach (int points, database.smoothSizes(family, style)) + const QList<int> smoothSizes = database.smoothSizes(family, style) + for (int points : smoothSizes) sizes += QString::number(points) + ' '; styleItem->setText(1, sizes.trimmed()); diff --git a/src/gui/doc/snippets/separations/screenwidget.cpp b/src/gui/doc/snippets/separations/screenwidget.cpp index 6f8be49bfa..d562991d26 100644 --- a/src/gui/doc/snippets/separations/screenwidget.cpp +++ b/src/gui/doc/snippets/separations/screenwidget.cpp @@ -105,8 +105,8 @@ ScreenWidget::ScreenWidget(QWidget *parent, QColor initialColor, //invertButton->setOn(inverted); invertButton->setEnabled(false); - connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor())); - connect(invertButton, SIGNAL(clicked()), this, SLOT(invertImage())); + connect(colorButton, &QPushButton::clicked, this, &ScreenWidget::setColor); + connect(invertButton, &QPushButton::clicked, this, &ScreenWidget::invertImage); QGridLayout *gridLayout = new QGridLayout; gridLayout->addWidget(imageLabel, 0, 0, 1, 2); diff --git a/src/gui/doc/snippets/separations/viewer.cpp b/src/gui/doc/snippets/separations/viewer.cpp index 641294ea35..018b397f1a 100644 --- a/src/gui/doc/snippets/separations/viewer.cpp +++ b/src/gui/doc/snippets/separations/viewer.cpp @@ -58,7 +58,7 @@ A main menu provides entries for selecting files, and adjusting the brightness of the separations. */ -#include <QtGui> +#include <QtWidgets> #include "finalwidget.h" #include "screenwidget.h" @@ -126,11 +126,11 @@ void Viewer::createMenus() menuBar()->addMenu(fileMenu); menuBar()->addMenu(brightnessMenu); - connect(openAction, SIGNAL(triggered()), this, SLOT(chooseFile())); - connect(saveAction, SIGNAL(triggered()), this, SLOT(saveImage())); - connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); - connect(brightnessMenu, SIGNAL(triggered(QAction*)), this, - SLOT(setBrightness(QAction*))); + connect(openAction, &QAction::triggered, this, &Viewer::chooseFile); + connect(saveAction, &QAction::triggered, this, &Viewer::saveImage); + connect(quitAction, &QAction::triggered, qApp, QApplication::quit); + connect(brightnessMenu, &QMenu::triggered, + this, &Viewer::setBrightness); } /* @@ -160,9 +160,9 @@ QFrame* Viewer::createCentralWidget() yellowWidget = new ScreenWidget(frame, Qt::yellow, tr("Yellow"), ScreenWidget::Yellow, labelSize); - connect(cyanWidget, SIGNAL(imageChanged()), this, SLOT(createImage())); - connect(magentaWidget, SIGNAL(imageChanged()), this, SLOT(createImage())); - connect(yellowWidget, SIGNAL(imageChanged()), this, SLOT(createImage())); + connect(cyanWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage); + connect(magentaWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage); + connect(yellowWidget, &ScreenWidget::imageChanged, this, &Viewer::createImage); grid->addWidget(finalWidget, 0, 0, Qt::AlignTop | Qt::AlignHCenter); grid->addWidget(cyanWidget, 0, 1, Qt::AlignTop | Qt::AlignHCenter); diff --git a/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp b/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp index bcc5c7dc30..bf864ce48d 100644 --- a/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp +++ b/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" #include "xmlwriter.h" @@ -73,9 +73,9 @@ MainWindow::MainWindow() editor = new QTextEdit(this); - connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile())); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(calendarAction, SIGNAL(triggered()), this, SLOT(insertCalendar())); + connect(saveAction, &QAction::triggered, this, &MainWindow::saveFile); + connect(quitAction, &QAction::triggered, this, &MainWindow::close); + connect(calendarAction, &QAction::triggered, this, &MainWindow::insertCalendar); setCentralWidget(editor); setWindowTitle(tr("Text Document Writer")); diff --git a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp index f512cf0dc6..a5801da67e 100644 --- a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" #include "xmlwriter.h" @@ -75,9 +75,9 @@ MainWindow::MainWindow() editor = new QTextEdit(this); //! [0] - connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile())); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(calendarAction, SIGNAL(triggered()), this, SLOT(insertCalendar())); + connect(saveAction, &QAction::triggered, this, &MainWindow::saveFile); + connect(quitAction, &QAction::triggered, this, &MainWindow::close); + connect(calendarAction, &QAction::triggered, this, &MainWindow::insertCalendar); setCentralWidget(editor); setWindowTitle(tr("Text Document Writer")); diff --git a/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp b/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp index f15ad45f2e..edfadb4c77 100644 --- a/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" #include "xmlwriter.h" @@ -64,7 +64,7 @@ MainWindow::MainWindow() quitAction->setShortcut(tr("Ctrl+Q")); menuBar()->addMenu(fileMenu); - editor = new QTextEdit(); + editor = new QTextEdit; QTextCursor cursor(editor->textCursor()); cursor.movePosition(QTextCursor::Start); @@ -130,8 +130,8 @@ MainWindow::MainWindow() plainCharFormat); - connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile())); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); + connect(saveAction, &QAction::triggered, this, &MainWindow::saveFile); + connect(quitAction, &QAction::triggered, this, &MainWindow::close); setCentralWidget(editor); setWindowTitle(tr("Text Document Frames")); diff --git a/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp b/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp index 15a2752c8b..785f7ebcc9 100644 --- a/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" @@ -88,7 +88,8 @@ MainWindow::MainWindow() document = new QTextDocument(this); editor->setDocument(document); - connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus())); + connect(editor, &QTextEdit::selectionChanged, + this, &MainWindow::updateMenus); updateMenus(); diff --git a/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp b/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp index 40459b49da..a7bd90a9f1 100644 --- a/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp @@ -74,7 +74,7 @@ MainWindow::MainWindow() document = new QTextDocument(this); editor->setDocument(document); - connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus())); + connect(editor, &QTextEdit::selectionChanged, this, &MainWindow::updateMenus); setCentralWidget(editor); setWindowTitle(tr("Text Document Writer")); diff --git a/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp b/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp index 8ac3913f3c..9253e87670 100644 --- a/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" @@ -90,7 +90,8 @@ MainWindow::MainWindow() document = new QTextDocument(this); editor->setDocument(document); - connect(editor, SIGNAL(selectionChanged()), this, SLOT(updateMenus())); + connect(editor, &QTextEdit::selectionChanged, + this, &MainWindow::updateMenus); setCentralWidget(editor); setWindowTitle(tr("Text Document Writer")); diff --git a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp index 061c191f1c..bd976a8ce4 100644 --- a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" #include "xmlwriter.h" @@ -132,9 +132,9 @@ MainWindow::MainWindow() } //! [8] - connect(saveAction, SIGNAL(triggered()), this, SLOT(saveFile())); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(showTableAction, SIGNAL(triggered()), this, SLOT(showTable())); + connect(saveAction, &QAction:triggered, this, &MainWindow::saveFile); + connect(quitAction, &QAction:triggered, this, &MainWindow::close); + connect(showTableAction, &QAction:triggered, this, &MainWindow::showTable); setCentralWidget(editor); setWindowTitle(tr("Text Document Tables")); diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc index a0f739d418..a8ba076e3d 100644 --- a/src/gui/doc/src/richtext.qdoc +++ b/src/gui/doc/src/richtext.qdoc @@ -1197,6 +1197,9 @@ \row \li \c text-transform \li [ uppercase | lowercase ] \li Select the transformation that will be performed on the text prior to displaying it. + \row \li \c font-kerning + \li [ normal | none ] + \li Enables or disables kerning between text characters. \row \li \c font-variant \li small-caps \li Perform the smallcaps transformation on the text prior to displaying it. diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 06c9cd3939..edf8124081 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -48,6 +48,7 @@ include(opengl/opengl.pri) qtConfig(animation): include(animation/animation.pri) include(itemmodels/itemmodels.pri) include(vulkan/vulkan.pri) +include(platform/platform.pri) QMAKE_LIBS += $$QMAKE_LIBS_GUI diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index 2453242fa8..455045eb57 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -310,6 +310,7 @@ QBitmap QBitmap::transformed(const QTransform &matrix) const return bm; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \overload \obsolete @@ -321,5 +322,6 @@ QBitmap QBitmap::transformed(const QMatrix &matrix) const { return transformed(QTransform(matrix)); } +#endif QT_END_NAMESPACE diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h index 188064fccf..f7895bb1e0 100644 --- a/src/gui/image/qbitmap.h +++ b/src/gui/image/qbitmap.h @@ -76,7 +76,10 @@ public: static QBitmap fromData(const QSize &size, const uchar *bits, QImage::Format monoFormat = QImage::Format_MonoLSB); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QBitmap::transformed(QTransform) instead") QBitmap transformed(const QMatrix &) const; +#endif QBitmap transformed(const QTransform &matrix) const; typedef QExplicitlySharedDataPointer<QPlatformPixmap> DataPtr; diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index c362d0dc3f..c3c4b24678 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -315,9 +315,9 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St % HexString<uint>(actualSize.height()); if (mode == QIcon::Active) { - if (QPixmapCache::find(key % HexString<uint>(mode), pm)) + if (QPixmapCache::find(key % HexString<uint>(mode), &pm)) return pm; // horray - if (QPixmapCache::find(key % HexString<uint>(QIcon::Normal), pm)) { + if (QPixmapCache::find(key % HexString<uint>(QIcon::Normal), &pm)) { QPixmap active = pm; if (QGuiApplication *guiApp = qobject_cast<QGuiApplication *>(qApp)) active = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(guiApp))->applyQIconStyleHelper(QIcon::Active, pm); @@ -326,7 +326,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St } } - if (!QPixmapCache::find(key % HexString<uint>(mode), pm)) { + if (!QPixmapCache::find(key % HexString<uint>(mode), &pm)) { if (pm.size() != actualSize) pm = pm.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); if (pe->mode != mode && mode != QIcon::Normal) { @@ -1080,11 +1080,12 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State if (!d) { QFileInfo info(fileName); - QIconEngine *engine = iconEngineFromSuffix(fileName, info.suffix()); + QString suffix = info.suffix(); #if QT_CONFIG(mimetype) - if (!engine) - engine = iconEngineFromSuffix(fileName, QMimeDatabase().mimeTypeForFile(info).preferredSuffix()); + if (suffix.isEmpty()) + suffix = QMimeDatabase().mimeTypeForFile(info).preferredSuffix(); // determination from contents #endif // mimetype + QIconEngine *engine = iconEngineFromSuffix(fileName, suffix); d = new QIconPrivate(engine ? engine : new QPixmapIconEngine); } diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 9897c3aa6f..16de045cf0 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -117,7 +117,7 @@ QImageData::QImageData() */ QImageData * QImageData::create(const QSize &size, QImage::Format format) { - if (!size.isValid() || format == QImage::Format_Invalid) + if (size.isEmpty() || format == QImage::Format_Invalid) return nullptr; // invalid parameter(s) int width = size.width(); @@ -288,6 +288,7 @@ bool QImageData::checkForAlphaPixels() const case QImage::Format_BGR30: case QImage::Format_RGB30: case QImage::Format_Grayscale8: + case QImage::Format_Grayscale16: case QImage::Format_RGBX64: break; case QImage::Format_Invalid: @@ -710,6 +711,7 @@ bool QImageData::checkForAlphaPixels() const \value Format_A2RGB30_Premultiplied The image is stored using a 32-bit premultiplied ARGB format (2-10-10-10). (added in Qt 5.4) \value Format_Alpha8 The image is stored using an 8-bit alpha only format. (added in Qt 5.5) \value Format_Grayscale8 The image is stored using an 8-bit grayscale format. (added in Qt 5.5) + \value Format_Grayscale16 The image is stored using an 16-bit grayscale format. (added in Qt 5.13) \value Format_RGBX64 The image is stored using a 64-bit halfword-ordered RGB(x) format (16-16-16-16). This is the same as the Format_RGBX64 except alpha must always be 65535. (added in Qt 5.12) \value Format_RGBA64 The image is stored using a 64-bit halfword-ordered RGBA format (16-16-16-16). (added in Qt 5.12) @@ -2038,6 +2040,7 @@ static bool highColorPrecision(QImage::Format format) case QImage::Format_RGBX64: case QImage::Format_RGBA64: case QImage::Format_RGBA64_Premultiplied: + case QImage::Format_Grayscale16: return true; default: break; @@ -2059,13 +2062,7 @@ QImage QImage::convertToFormat_helper(Format format, Qt::ImageConversionFlags fl Image_Converter converter = qimage_converter_map[d->format][format]; if (!converter && format > QImage::Format_Indexed8 && d->format > QImage::Format_Indexed8) { if (highColorPrecision(format) && highColorPrecision(d->format)) { - // Convert over RGBA64_Premultiplied - if (format == QImage::Format_RGBA64_Premultiplied) - converter = convert_generic_to_rgb64; - else { - Q_ASSERT(d->format != QImage::Format_RGBA64_Premultiplied); - return convertToFormat(Format_RGBA64_Premultiplied, flags).convertToFormat(format, flags); - } + converter = convert_generic_to_rgb64; } else converter = convert_generic; } @@ -2246,6 +2243,29 @@ bool QImage::reinterpretAsFormat(Format format) } /*! + \since 5.13 + + Detach and convert the image to the given \a format in place. + + The specified image conversion \a flags control how the image data + is handled during the conversion process. + + \sa convertToFormat() +*/ + +void QImage::convertTo(Format f, Qt::ImageConversionFlags flags) +{ + if (!d || f == QImage::Format_Invalid) + return; + + detach(); + if (convertToFormat_inplace(f, flags)) + return; + + *this = convertToFormat_helper(f, flags); +} + +/*! \fn bool QImage::valid(const QPoint &pos) const Returns \c true if \a pos is a valid coordinate pair within the @@ -2531,6 +2551,10 @@ QColor QImage::pixelColor(int x, int y) const case Format_RGBA64_Premultiplied: c = reinterpret_cast<const QRgba64 *>(s)[x]; break; + case Format_Grayscale16: { + quint16 v = reinterpret_cast<const quint16 *>(s)[x]; + return QColor(qRgba64(v, v, v, 0xffff)); + } default: c = QRgba64::fromArgb32(pixel(x, y)); break; @@ -2641,6 +2665,7 @@ bool QImage::allGray() const case Format_Alpha8: return false; case Format_Grayscale8: + case Format_Grayscale16: return true; case Format_RGB32: case Format_ARGB32: @@ -2707,7 +2732,7 @@ bool QImage::isGrayscale() const if (d->format == QImage::Format_Alpha8) return false; - if (d->format == QImage::Format_Grayscale8) + if (d->format == QImage::Format_Grayscale8 || d->format == QImage::Format_Grayscale16) return true; switch (depth()) { @@ -3341,6 +3366,7 @@ QImage QImage::rgbSwapped_helper() const break; case Format_Alpha8: case Format_Grayscale8: + case Format_Grayscale16: return *this; case Format_Mono: case Format_MonoLSB: @@ -3452,6 +3478,7 @@ void QImage::rgbSwapped_inplace() break; case Format_Alpha8: case Format_Grayscale8: + case Format_Grayscale16: return; case Format_Mono: case Format_MonoLSB: @@ -5349,6 +5376,19 @@ static Q_CONSTEXPR QPixelFormat pixelformats[] = { /*PREMULTIPLIED*/ QPixelFormat::Premultiplied, /*INTERPRETATION*/ QPixelFormat::UnsignedShort, /*BYTE ORDER*/ QPixelFormat::CurrentSystemEndian), + //QImage::Format_Grayscale16: + QPixelFormat(QPixelFormat::Grayscale, + /*GRAY*/ 16, + /*SECOND*/ 0, + /*THIRD*/ 0, + /*FOURTH*/ 0, + /*FIFTH*/ 0, + /*ALPHA*/ 0, + /*ALPHA USAGE*/ QPixelFormat::IgnoresAlpha, + /*ALPHA POSITION*/ QPixelFormat::AtBeginning, + /*PREMULTIPLIED*/ QPixelFormat::NotPremultiplied, + /*INTERPRETATION*/ QPixelFormat::UnsignedShort, + /*BYTE ORDER*/ QPixelFormat::CurrentSystemEndian), }; Q_STATIC_ASSERT(sizeof(pixelformats) / sizeof(*pixelformats) == QImage::NImageFormats); diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 4b7a3b1ead..45f571807c 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -128,10 +128,7 @@ public: Format_RGBX64, Format_RGBA64, Format_RGBA64_Premultiplied, -#if 0 - // reserved for future use Format_Grayscale16, -#endif #ifndef Q_QDOC NImageFormats #endif @@ -199,6 +196,8 @@ public: Q_REQUIRED_RESULT QImage convertToFormat(Format f, const QVector<QRgb> &colorTable, Qt::ImageConversionFlags flags = Qt::AutoColor) const; bool reinterpretAsFormat(Format f); + void convertTo(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor); + int width() const; int height() const; QSize size() const; diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp index 215dd33499..82ffb8af8b 100644 --- a/src/gui/image/qimage_conversions.cpp +++ b/src/gui/image/qimage_conversions.cpp @@ -223,18 +223,29 @@ void convert_generic(QImageData *dest, const QImageData *src, Qt::ImageConversio void convert_generic_to_rgb64(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) { - Q_ASSERT(dest->format == QImage::Format_RGBA64_Premultiplied); + Q_ASSERT(dest->format > QImage::Format_Indexed8); Q_ASSERT(src->format > QImage::Format_Indexed8); + QRgba64 buf[BufferSize]; + QRgba64 *buffer = buf; const QPixelLayout *srcLayout = &qPixelLayouts[src->format]; + const QPixelLayout *destLayout = &qPixelLayouts[dest->format]; const uchar *srcData = src->data; uchar *destData = dest->data; const FetchAndConvertPixelsFunc64 fetch = srcLayout->fetchToRGBA64PM; + const ConvertAndStorePixelsFunc64 store = qStoreFromRGBA64PM[dest->format]; for (int y = 0; y < src->height; ++y) { - const QRgba64 *ptr = fetch((QRgba64*)destData, srcData, 0, src->width, nullptr, nullptr); - if (ptr != (const QRgba64*)destData) { - memcpy(destData, ptr, dest->bytes_per_line); + int x = 0; + while (x < src->width) { + int l = src->width - x; + if (destLayout->bpp == QPixelLayout::BPP64) + buffer = reinterpret_cast<QRgba64 *>(destData) + x; + else + l = qMin(l, BufferSize); + const QRgba64 *ptr = fetch(buffer, srcData, x, l, nullptr, nullptr); + store(destData, ptr, x, l, nullptr, nullptr); + x += l; } srcData += src->bytes_per_line; destData += dest->bytes_per_line; @@ -1205,33 +1216,6 @@ static void convert_RGBA64_to_ARGB32(QImageData *dest, const QImageData *src, Qt } template<bool RGBA> -static void convert_RGBA64PM_to_ARGB32(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) -{ - Q_ASSERT(src->format == QImage::Format_RGBA64_Premultiplied); - Q_ASSERT(RGBA || dest->format == QImage::Format_ARGB32); - Q_ASSERT(!RGBA || dest->format == QImage::Format_RGBA8888); - Q_ASSERT(src->width == dest->width); - Q_ASSERT(src->height == dest->height); - - const int src_pad = (src->bytes_per_line >> 3) - src->width; - const int dest_pad = (dest->bytes_per_line >> 2) - dest->width; - const QRgba64 *src_data = reinterpret_cast<const QRgba64 *>(src->data); - uint *dest_data = reinterpret_cast<uint *>(dest->data); - - for (int i = 0; i < src->height; ++i) { - const QRgba64 *end = src_data + src->width; - while (src_data < end) { - QRgba64 s = src_data->unpremultiplied(); - *dest_data = RGBA ? ARGB2RGBA(s.toArgb32()) : s.toArgb32(); - ++src_data; - ++dest_data; - } - src_data += src_pad; - dest_data += dest_pad; - } -} - -template<bool RGBA> static void convert_ARGB32_to_RGBA64(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) { Q_ASSERT(RGBA || src->format == QImage::Format_ARGB32); @@ -1240,74 +1224,14 @@ static void convert_ARGB32_to_RGBA64(QImageData *dest, const QImageData *src, Qt Q_ASSERT(src->width == dest->width); Q_ASSERT(src->height == dest->height); - const int src_pad = (src->bytes_per_line >> 2) - src->width; - const int dest_pad = (dest->bytes_per_line >> 3) - dest->width; - const uint *src_data = reinterpret_cast<const uint *>(src->data); - QRgba64 *dest_data = reinterpret_cast<QRgba64 *>(dest->data); - - for (int i = 0; i < src->height; ++i) { - const uint *end = src_data + src->width; - while (src_data < end) { - if (RGBA) - *dest_data = QRgba64::fromArgb32(RGBA2ARGB(*src_data)); - else - *dest_data = QRgba64::fromArgb32(*src_data); - ++src_data; - ++dest_data; - } - src_data += src_pad; - dest_data += dest_pad; - } -} - -template<QtPixelOrder PixelOrder> -static void convert_RGBA64PM_to_RGB30(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) -{ - Q_ASSERT(src->format == QImage::Format_RGBA64_Premultiplied); - Q_ASSERT(dest->format == QImage::Format_RGB30 || dest->format == QImage::Format_BGR30); - Q_ASSERT(src->width == dest->width); - Q_ASSERT(src->height == dest->height); - - const int src_pad = (src->bytes_per_line >> 3) - src->width; - const int dest_pad = (dest->bytes_per_line >> 2) - dest->width; - const QRgba64 *src_data = reinterpret_cast<const QRgba64 *>(src->data); - uint *dest_data = reinterpret_cast<uint *>(dest->data); - - for (int i = 0; i < src->height; ++i) { - const QRgba64 *end = src_data + src->width; - while (src_data < end) { - *dest_data = 0xc0000000 | qConvertRgb64ToRgb30<PixelOrder>(src_data->unpremultiplied()); - ++src_data; - ++dest_data; - } - src_data += src_pad; - dest_data += dest_pad; - } -} - -template<QtPixelOrder PixelOrder> -static void convert_RGBA64PM_to_A2RGB30(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) -{ - Q_ASSERT(src->format == QImage::Format_RGBA64_Premultiplied); - Q_ASSERT(dest->format == QImage::Format_A2RGB30_Premultiplied - || dest->format == QImage::Format_A2BGR30_Premultiplied); - Q_ASSERT(src->width == dest->width); - Q_ASSERT(src->height == dest->height); - - const int src_pad = (src->bytes_per_line >> 3) - src->width; - const int dest_pad = (dest->bytes_per_line >> 2) - dest->width; - const QRgba64 *src_data = reinterpret_cast<const QRgba64 *>(src->data); - uint *dest_data = reinterpret_cast<uint *>(dest->data); + const uchar *src_data = src->data; + uchar *dest_data = dest->data; + const FetchAndConvertPixelsFunc64 fetch = qPixelLayouts[src->format + 1].fetchToRGBA64PM; for (int i = 0; i < src->height; ++i) { - const QRgba64 *end = src_data + src->width; - while (src_data < end) { - *dest_data = qConvertRgb64ToRgb30<PixelOrder>(*src_data); - ++src_data; - ++dest_data; - } - src_data += src_pad; - dest_data += dest_pad; + fetch(reinterpret_cast<QRgba64 *>(dest_data), src_data, 0, src->width, nullptr, nullptr); + src_data += src->bytes_per_line;; + dest_data += dest->bytes_per_line; } } @@ -1447,6 +1371,56 @@ static bool convert_RGBA64PM_to_RGBA64_inplace(QImageData *data, Qt::ImageConver return true; } +static void convert_gray16_to_RGBA64(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) +{ + Q_ASSERT(src->format == QImage::Format_Grayscale16); + Q_ASSERT(dest->format == QImage::Format_RGBA64 || dest->format == QImage::Format_RGBX64 || + dest->format == QImage::Format_RGBA64_Premultiplied); + Q_ASSERT(src->width == dest->width); + Q_ASSERT(src->height == dest->height); + + const qsizetype sbpl = src->bytes_per_line; + const qsizetype dbpl = dest->bytes_per_line; + const uchar *src_data = src->data; + uchar *dest_data = dest->data; + + for (int i = 0; i < src->height; ++i) { + const quint16 *src_line = reinterpret_cast<const quint16 *>(src_data); + QRgba64 *dest_line = reinterpret_cast<QRgba64 *>(dest_data); + for (int j = 0; j < src->width; ++j) { + quint16 s = src_line[j]; + dest_line[j] = qRgba64(s, s, s, 0xFFFF); + } + src_data += sbpl; + dest_data += dbpl; + } +} + +static void convert_RGBA64_to_gray16(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags) +{ + Q_ASSERT(dest->format == QImage::Format_Grayscale16); + Q_ASSERT(src->format == QImage::Format_RGBX64 || + src->format == QImage::Format_RGBA64_Premultiplied); + Q_ASSERT(src->width == dest->width); + Q_ASSERT(src->height == dest->height); + + const qsizetype sbpl = src->bytes_per_line; + const qsizetype dbpl = dest->bytes_per_line; + const uchar *src_data = src->data; + uchar *dest_data = dest->data; + + for (int i = 0; i < src->height; ++i) { + const QRgba64 *src_line = reinterpret_cast<const QRgba64 *>(src_data); + quint16 *dest_line = reinterpret_cast<quint16 *>(dest_data); + for (int j = 0; j < src->width; ++j) { + QRgba64 s = src_line[j].unpremultiplied(); + dest_line[j] = qGray(s.red(), s.green(), s.blue()); + } + src_data += sbpl; + dest_data += dbpl; + } +} + static QVector<QRgb> fix_color_table(const QVector<QRgb> &ctbl, QImage::Format format) { QVector<QRgb> colorTable = ctbl; @@ -2291,7 +2265,7 @@ static bool convert_Grayscale8_to_Indexed8_inplace(QImageData *data, Qt::ImageCo Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormats] = { { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, @@ -2312,7 +2286,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_Mono { @@ -2334,7 +2308,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_MonoLSB { @@ -2359,7 +2333,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, 0, 0, convert_Indexed8_to_Alpha8, convert_Indexed8_to_Grayscale8, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_Indexed8 { @@ -2387,7 +2361,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat convert_RGB_to_RGB30<PixelOrderRGB, false>, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_RGB32 { @@ -2417,7 +2391,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, convert_ARGB32_to_RGBA64<false>, - 0 + 0, 0 }, // Format_ARGB32 { @@ -2442,7 +2416,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat convert_ARGB_to_RGBA, 0, 0, 0, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_ARGB32_Premultiplied { @@ -2464,7 +2438,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB16 { @@ -2486,7 +2460,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_ARGB8565_Premultiplied { @@ -2508,7 +2482,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB666 { @@ -2530,7 +2504,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_ARGB6666_Premultiplied { @@ -2552,7 +2526,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB555 { @@ -2574,7 +2548,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_ARGB8555_Premultiplied { @@ -2597,7 +2571,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat convert_RGB888_to_RGB<true>, convert_RGB888_to_RGB<true>, convert_RGB888_to_RGB<true>, - 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB888 { @@ -2619,7 +2593,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB444 { @@ -2640,7 +2614,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_ARGB4444_Premultiplied { 0, @@ -2667,7 +2641,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat convert_RGB_to_RGB30<PixelOrderRGB, true>, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_RGBX8888 { 0, @@ -2696,7 +2670,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, convert_ARGB32_to_RGBA64<true>, - 0 + 0, 0 }, // Format_RGBA8888 { @@ -2718,7 +2692,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGBA8888_Premultiplied { @@ -2746,7 +2720,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat convert_BGR30_to_RGB30, convert_BGR30_to_RGB30, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_BGR30 { 0, @@ -2773,8 +2747,8 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat convert_A2RGB30_PM_to_RGB30<true>, convert_BGR30_to_RGB30, 0, 0, - 0, 0, 0 - }, // Format_BGR30A2_Premultiplied + 0, 0, 0, 0 + }, // Format_A2BGR30_Premultiplied { 0, 0, @@ -2799,7 +2773,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat convert_BGR30_to_RGB30, 0, convert_passthrough, - 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0 }, // Format_RGB30 { 0, @@ -2826,8 +2800,8 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat convert_A2RGB30_PM_to_RGB30<false>, 0, 0, 0, - 0, 0, 0 - }, // Format_RGB30A2_Premultiplied + 0, 0, 0, 0 + }, // Format_A2RGB30_Premultiplied { 0, 0, @@ -2846,7 +2820,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_Alpha8 { 0, @@ -2872,7 +2846,8 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // self convert_passthrough, - convert_passthrough + convert_passthrough, + convert_RGBA64_to_gray16 }, // Format_RGBX64 { 0, @@ -2898,7 +2873,8 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, convert_RGBA64_to_RGBx64, 0, // self - convert_RGBA64_to_RGBA64PM + convert_RGBA64_to_RGBA64PM, + 0 }, // Format_RGBA64 { 0, @@ -2906,7 +2882,6 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - convert_RGBA64PM_to_ARGB32<false>, 0, 0, 0, @@ -2918,29 +2893,58 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, - convert_RGBA64PM_to_ARGB32<true>, 0, - convert_RGBA64PM_to_RGB30<PixelOrderBGR>, - convert_RGBA64PM_to_A2RGB30<PixelOrderBGR>, - convert_RGBA64PM_to_RGB30<PixelOrderRGB>, - convert_RGBA64PM_to_A2RGB30<PixelOrderRGB>, + 0, + 0, + 0, 0, 0, 0, 0, 0, convert_RGBA64PM_to_RGBA64<true>, convert_RGBA64PM_to_RGBA64<false>, - 0 // self - } // Format_RGBA64_Premultiplied + 0, // self + convert_RGBA64_to_gray16 + }, // Format_RGBA64_Premultiplied + { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 0, + convert_gray16_to_RGBA64, + convert_gray16_to_RGBA64, + convert_gray16_to_RGBA64, + 0 // self + }, // Format_Grayscale16 }; InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QImage::NImageFormats] = { { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_Mono { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_MonoLSB { 0, @@ -2964,7 +2968,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma 0, 0, 0, 0, 0, convert_Indexed8_to_Alpha8_inplace, convert_Indexed8_to_Grayscale8_inplace, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_Indexed8 { 0, @@ -2991,7 +2995,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma convert_RGB_to_RGB30_inplace<PixelOrderRGB, false>, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_RGB32 { 0, @@ -3018,7 +3022,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma convert_RGB_to_RGB30_inplace<PixelOrderRGB, false>, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_ARGB32 { 0, @@ -3042,34 +3046,34 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma convert_ARGB_to_RGBA_inplace<QImage::Format_RGBA8888_Premultiplied>, 0, 0, 0, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_ARGB32_Premultiplied { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB16 { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_ARGB8565_Premultiplied { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB666 { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_ARGB6666_Premultiplied { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB555 { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_ARGB8555_Premultiplied { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB888 { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGB444 { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_ARGB4444_Premultiplied { 0, @@ -3096,7 +3100,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma convert_RGB_to_RGB30_inplace<PixelOrderRGB, true>, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_RGBX8888 { 0, @@ -3123,7 +3127,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma convert_RGB_to_RGB30_inplace<PixelOrderRGB, true>, 0, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_RGBA8888 { 0, @@ -3145,7 +3149,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // Format_RGBA8888_Premultiplied { 0, @@ -3172,7 +3176,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma convert_BGR30_to_RGB30_inplace, convert_BGR30_to_A2RGB30_inplace, 0, 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_BGR30 { 0, @@ -3198,8 +3202,8 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma 0, // self convert_A2RGB30_PM_to_RGB30_inplace<true>, convert_BGR30_to_RGB30_inplace, - 0, 0, 0, 0, 0 - }, // Format_BGR30A2_Premultiplied + 0, 0, 0, 0, 0, 0 + }, // Format_A2BGR30_Premultiplied { 0, 0, @@ -3224,7 +3228,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma convert_BGR30_to_A2RGB30_inplace, 0, // self convert_passthrough_inplace<QImage::Format_A2RGB30_Premultiplied>, - 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0 }, // Format_RGB30 { 0, @@ -3251,8 +3255,8 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma convert_A2RGB30_PM_to_RGB30_inplace<false>, 0, // self 0, 0, - 0, 0, 0 - }, // Format_RGB30A2_Premultiplied + 0, 0, 0, 0 + }, // Format_A2RGB30_Premultiplied { 0, 0, @@ -3276,7 +3280,7 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma 0, 0, 0, 0, 0, // self 0, - 0, 0, 0 + 0, 0, 0, 0 }, // Format_Alpha8 { 0, @@ -3301,26 +3305,32 @@ InPlace_Image_Converter qimage_inplace_converter_map[QImage::NImageFormats][QIma 0, 0, 0, 0, 0, 0, // self - 0, 0, 0 + 0, 0, 0, 0 }, // Format_Grayscale8 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // self convert_passthrough_inplace<QImage::Format_RGBA64>, convert_passthrough_inplace<QImage::Format_RGBA64_Premultiplied>, + 0 }, // Format_RGBX64 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, convert_RGBA64_to_RGBx64_inplace, 0, // self - convert_RGBA64_to_RGBA64PM_inplace + convert_RGBA64_to_RGBA64PM_inplace, + 0 }, // Format_RGBA64 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, convert_RGBA64PM_to_RGBA64_inplace<true>, convert_RGBA64PM_to_RGBA64_inplace<false>, - 0 // self - } // Format_RGBA64_Premultiplied + 0, // self + 0 + }, // Format_RGBA64_Premultiplied + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }, // Format_Grayscale16 }; static void qInitImageConversions() diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h index e3a6c53833..de12a313e8 100644 --- a/src/gui/image/qimage_p.h +++ b/src/gui/image/qimage_p.h @@ -189,6 +189,7 @@ inline int qt_depthForFormat(QImage::Format format) case QImage::Format_RGB16: case QImage::Format_RGB444: case QImage::Format_ARGB4444_Premultiplied: + case QImage::Format_Grayscale16: depth = 16; break; case QImage::Format_RGB666: diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp index 5d1f8fa91f..0e7b541cf2 100644 --- a/src/gui/image/qimageiohandler.cpp +++ b/src/gui/image/qimageiohandler.cpp @@ -340,7 +340,7 @@ void QImageIOHandler::setDevice(QIODevice *device) /*! Returns the device currently assigned to the QImageIOHandler. If - not device has been assigned, 0 is returned. + not device has been assigned, \nullptr is returned. */ QIODevice *QImageIOHandler::device() const { @@ -416,6 +416,7 @@ QByteArray QImageIOHandler::format() const \sa read(), QIODevice::peek() */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -426,6 +427,7 @@ QByteArray QImageIOHandler::name() const { return format(); } +#endif /*! Writes the image \a image to the assigned device. Returns \c true on diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index 35984dd6a5..c20b84afbb 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -69,7 +69,10 @@ public: void setFormat(const QByteArray &format) const; QByteArray format() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QImageIOHandler::format() instead") virtual QByteArray name() const; +#endif virtual bool canRead() const = 0; virtual bool read(QImage *image) = 0; @@ -141,7 +144,7 @@ class Q_GUI_EXPORT QImageIOPlugin : public QObject Q_OBJECT public: explicit QImageIOPlugin(QObject *parent = nullptr); - virtual ~QImageIOPlugin(); + ~QImageIOPlugin(); enum Capability { CanRead = 0x1, diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 0fb1d808e5..61f20e0c65 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -526,7 +526,7 @@ bool QImageReaderPrivate::initHandler() // Try the most probable extension first int currentFormatIndex = extensions.indexOf(format.toLower()); if (currentFormatIndex > 0) - extensions.swap(0, currentFormatIndex); + extensions.swapItemsAt(0, currentFormatIndex); } int currentExtension = 0; @@ -756,13 +756,13 @@ void QImageReader::setDevice(QIODevice *device) d->device = device; d->deleteDevice = false; delete d->handler; - d->handler = 0; + d->handler = nullptr; d->text.clear(); } /*! - Returns the device currently assigned to QImageReader, or 0 if no - device has been assigned. + Returns the device currently assigned to QImageReader, or \nullptr + if no device has been assigned. */ QIODevice *QImageReader::device() const { diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index d3f9a9b881..ec66588ddf 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -407,8 +407,8 @@ void QImageWriter::setDevice(QIODevice *device) } /*! - Returns the device currently assigned to QImageWriter, or 0 if no - device has been assigned. + Returns the device currently assigned to QImageWriter, or \nullptr + if no device has been assigned. */ QIODevice *QImageWriter::device() const { @@ -648,6 +648,7 @@ QImageIOHandler::Transformations QImageWriter::transformation() const return d->transformation; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -679,6 +680,7 @@ QString QImageWriter::description() const { return d->description; } +#endif /*! \since 4.1 diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h index 29c06ccdd2..ef84a59b7c 100644 --- a/src/gui/image/qimagewriter.h +++ b/src/gui/image/qimagewriter.h @@ -100,9 +100,12 @@ public: QImageIOHandler::Transformations transformation() const; void setTransformation(QImageIOHandler::Transformations orientation); - // Obsolete as of 4.1 +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QImageWriter::setText() instead") void setDescription(const QString &description); + QT_DEPRECATED_X("Use QImageReader::text() instead") QString description() const; +#endif void setText(const QString &key, const QString &text); diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index 7d17b7d5ef..79203c7b98 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -659,7 +659,7 @@ void QMovie::setDevice(QIODevice *device) /*! Returns the device QMovie reads image data from. If no device has - currently been assigned, 0 is returned. + currently been assigned, \nullptr is returned. \sa setDevice(), fileName() */ diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h index c3044796ad..c9e4b43197 100644 --- a/src/gui/image/qpaintengine_pic_p.h +++ b/src/gui/image/qpaintengine_pic_p.h @@ -103,7 +103,7 @@ protected: QPicturePaintEngine(QPaintEnginePrivate &dptr); private: - Q_DISABLE_COPY(QPicturePaintEngine) + Q_DISABLE_COPY_MOVE(QPicturePaintEngine) void writeCmdLength(int pos, const QRectF &r, bool corr); }; diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 2f2f85f68d..56b82abcfa 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -858,7 +858,7 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords) break; case QPicturePrivate::PdcSetWXform: s >> i_8; - painter->setMatrixEnabled(i_8); + painter->setWorldMatrixEnabled(i_8); break; case QPicturePrivate::PdcSetWMatrix: if (d->formatMajor >= 8) { @@ -1200,8 +1200,8 @@ QT_END_INCLUDE_NAMESPACE \obsolete Returns a string that specifies the picture format of the file \a - fileName, or 0 if the file cannot be read or if the format is not - recognized. + fileName, or \nullptr if the file cannot be read or if the format + is not recognized. \sa load(), save() */ @@ -1543,7 +1543,7 @@ const QPicture &QPictureIO::picture() const { return d->pi; } int QPictureIO::status() const { return d->iostat; } /*! - Returns the picture format string or 0 if no format has been + Returns the picture format string or \nullptr if no format has been explicitly set. */ const char *QPictureIO::format() const { return d->frmt; } diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index ea6697cc39..2ef1d09422 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -858,6 +858,7 @@ bool QPixmap::doImageIO(QImageWriter *writer, int quality) const } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -878,6 +879,14 @@ void QPixmap::fill(const QPaintDevice *device, const QPoint &p) Use QPainter or the fill(QColor) overload instead. */ +void QPixmap::fill(const QPaintDevice *device, int xofs, int yofs) +{ + Q_UNUSED(device) + Q_UNUSED(xofs) + Q_UNUSED(yofs) + qWarning("this function is deprecated, ignored"); +} +#endif /*! @@ -961,6 +970,7 @@ static void sendResizeEvents(QWidget *target) } #endif +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -984,6 +994,14 @@ QPixmap QPixmap::grabWidget(QObject *widget, const QRect &rectangle) Use QWidget::grab() instead. */ +QPixmap QPixmap::grabWidget(QObject *widget, int x, int y, int w, int h) +{ +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + return grabWidget(widget, QRect(x, y, w, h)); +QT_WARNING_POP +} +#endif /***************************************************************************** QPixmap stream functions @@ -1358,12 +1376,6 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) The cacheKey() function returns a number that uniquely identifies the contents of the QPixmap object. - The x11Info() function returns information about the configuration - of the X display used by the screen to which the pixmap currently - belongs. The x11PictureHandle() function returns the X11 Picture - handle of the pixmap for XRender support. Note that the two latter - functions are only available on x11. - \endtable \section1 Pixmap Conversion @@ -1394,9 +1406,6 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) function returns the actual matrix used for transforming the pixmap. - \note When using the native X11 graphics system, the pixmap - becomes invalid when the QApplication instance is destroyed. - \sa QBitmap, QImage, QImageReader, QImageWriter */ @@ -1589,6 +1598,7 @@ QPixmap QPixmap::fromImageReader(QImageReader *imageReader, Qt::ImageConversionF return QPixmap(data.take()); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn QPixmap QPixmap::grabWindow(WId window, int x, int y, int width, int height) @@ -1642,6 +1652,7 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h) " Defaulting to primary screen."); return QGuiApplication::primaryScreen()->grabWindow(window, x, y, w, h); } +#endif /*! \internal diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 55cca7a766..2a7393225e 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -94,8 +94,12 @@ public: static int defaultDepth(); void fill(const QColor &fillColor = Qt::white); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X(" Use QPainter or the fill(QColor)") void fill(const QPaintDevice *device, const QPoint &ofs); - inline void fill(const QPaintDevice *device, int xofs, int yofs) { fill(device, QPoint(xofs, yofs)); } + QT_DEPRECATED_X(" Use QPainter or the fill(QColor)") + void fill(const QPaintDevice *device, int xofs, int yofs); +#endif QBitmap mask() const; void setMask(const QBitmap &); @@ -111,10 +115,14 @@ public: #endif QBitmap createMaskFromColor(const QColor &maskColor, Qt::MaskMode mode = Qt::MaskInColor) const; - static QPixmap grabWindow(WId, int x=0, int y=0, int w=-1, int h=-1); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QScreen::grabWindow() instead") + static QPixmap grabWindow(WId, int x = 0, int y = 0, int w = -1, int h = -1); + QT_DEPRECATED_X("Use QWidget::grab() instead") static QPixmap grabWidget(QObject *widget, const QRect &rect); - static inline QPixmap grabWidget(QObject *widget, int x=0, int y=0, int w=-1, int h=-1) - { return grabWidget(widget, QRect(x, y, w, h)); } + QT_DEPRECATED_X("Use QWidget::grab() instead") + static QPixmap grabWidget(QObject *widget, int x = 0, int y = 0, int w = -1, int h = -1); +#endif inline QPixmap scaled(int w, int h, Qt::AspectRatioMode aspectMode = Qt::IgnoreAspectRatio, Qt::TransformationMode mode = Qt::FastTransformation) const diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 13c1c29d5b..2732bbd197 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -203,6 +203,9 @@ void QRasterPlatformPixmap::fill(const QColor &color) pixel = qAlpha(color.rgba()); } else if (image.format() == QImage::Format_Grayscale8) { pixel = qGray(color.rgba()); + } else if (image.format() == QImage::Format_Grayscale16) { + QRgba64 c = color.rgba64(); + pixel = qGray(c.red(), c.green(), c.blue()); } else { pixel = 0; diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp index b5f8d43041..3a2db74098 100644 --- a/src/gui/image/qpixmap_win.cpp +++ b/src/gui/image/qpixmap_win.cpp @@ -210,7 +210,7 @@ static QImage copyImageData(const BITMAPINFOHEADER &header, const RGBQUAD *color class DisplayHdc { - Q_DISABLE_COPY(DisplayHdc) + Q_DISABLE_COPY_MOVE(DisplayHdc) public: DisplayHdc() : m_displayDc(GetDC(nullptr)) {} ~DisplayHdc() { ReleaseDC(nullptr, m_displayDc); } diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 3d1652f68b..66907bebd7 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -469,10 +469,13 @@ QPixmapCacheEntry::~QPixmapCacheEntry() pm_cache()->releaseKey(key); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete \overload + Use bool find(const QString &, QPixmap *) instead. + Returns the pixmap associated with the \a key in the cache, or null if there is no such pixmap. @@ -494,13 +497,14 @@ QPixmap *QPixmapCache::find(const QString &key) /*! \obsolete - Use bool find(const QString&, QPixmap*) instead. + Use bool find(const QString &, QPixmap *) instead. */ -bool QPixmapCache::find(const QString &key, QPixmap& pixmap) +bool QPixmapCache::find(const QString &key, QPixmap &pixmap) { return find(key, &pixmap); } +#endif /*! Looks for a cached pixmap associated with the given \a key in the cache. @@ -513,7 +517,7 @@ bool QPixmapCache::find(const QString &key, QPixmap& pixmap) \snippet code/src_gui_image_qpixmapcache.cpp 1 */ -bool QPixmapCache::find(const QString &key, QPixmap* pixmap) +bool QPixmapCache::find(const QString &key, QPixmap *pixmap) { QPixmap *ptr = pm_cache()->object(key); if (ptr && pixmap) @@ -530,7 +534,7 @@ bool QPixmapCache::find(const QString &key, QPixmap* pixmap) \since 4.6 */ -bool QPixmapCache::find(const Key &key, QPixmap* pixmap) +bool QPixmapCache::find(const Key &key, QPixmap *pixmap) { //The key is not valid anymore, a flush happened before probably if (!key.d || !key.d->isValid) diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h index ea10ab1b76..12d05b00f3 100644 --- a/src/gui/image/qpixmapcache.h +++ b/src/gui/image/qpixmapcache.h @@ -76,8 +76,12 @@ public: static int cacheLimit(); static void setCacheLimit(int); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use bool find(const QString &, QPixmap *) instead") static QPixmap *find(const QString &key); + QT_DEPRECATED_X("Use bool find(const QString &, QPixmap *) instead") static bool find(const QString &key, QPixmap &pixmap); +#endif static bool find(const QString &key, QPixmap *pixmap); static bool find(const Key &key, QPixmap *pixmap); static bool insert(const QString &key, const QPixmap &pixmap); diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index 808037f434..1a5e7718eb 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -266,6 +266,18 @@ void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, QSize scal else if (g == 1) image.setColor(0, qRgba(255, 255, 255, 0)); } + } else if (bit_depth == 16 + && png_get_channels(png_ptr, info_ptr) == 1 + && !png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { + if (image.size() != QSize(width, height) || image.format() != QImage::Format_Grayscale16) { + image = QImage(width, height, QImage::Format_Grayscale16); + if (image.isNull()) + return; + } + + png_read_update_info(png_ptr, info_ptr); + if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) + png_set_swap(png_ptr); } else if (bit_depth == 16) { bool hasMask = png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS); if (!hasMask) @@ -687,7 +699,7 @@ QImage::Format QPngHandlerPrivate::readImageFormat() if (bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1) { format = QImage::Format_Mono; } else if (bit_depth == 16) { - format = png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ? QImage::Format_RGBA64 : QImage::Format_RGBX64; + format = png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ? QImage::Format_RGBA64 : QImage::Format_Grayscale16; } else if (bit_depth == 8 && !png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { format = QImage::Format_Grayscale8; } else { @@ -861,7 +873,8 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i else color_type = PNG_COLOR_TYPE_PALETTE; } - else if (image.format() == QImage::Format_Grayscale8) + else if (image.format() == QImage::Format_Grayscale8 + || image.format() == QImage::Format_Grayscale16) color_type = PNG_COLOR_TYPE_GRAY; else if (image.hasAlphaChannel()) color_type = PNG_COLOR_TYPE_RGB_ALPHA; @@ -877,6 +890,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i case QImage::Format_RGBX64: case QImage::Format_RGBA64: case QImage::Format_RGBA64_Premultiplied: + case QImage::Format_Grayscale16: bpc = 16; break; default: @@ -988,6 +1002,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i case QImage::Format_RGBX64: case QImage::Format_RGBA64: case QImage::Format_RGBA64_Premultiplied: + case QImage::Format_Grayscale16: png_set_swap(png_ptr); break; default: @@ -1018,6 +1033,7 @@ bool QPNGImageWriter::writeImage(const QImage& image, volatile int compression_i case QImage::Format_MonoLSB: case QImage::Format_Indexed8: case QImage::Format_Grayscale8: + case QImage::Format_Grayscale16: case QImage::Format_RGB32: case QImage::Format_ARGB32: case QImage::Format_RGB888: diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp index 53e3fa293d..bfde0aa76e 100644 --- a/src/gui/image/qppmhandler.cpp +++ b/src/gui/image/qppmhandler.cpp @@ -68,13 +68,19 @@ static int read_pbm_int(QIODevice *d) char c; int val = -1; bool digit; + bool hasOverflow = false; for (;;) { if (!d->getChar(&c)) // end of file break; digit = isdigit((uchar) c); if (val != -1) { if (digit) { - val = 10*val + c - '0'; + const int cValue = c - '0'; + if (val <= (INT_MAX - cValue) / 10) { + val = 10*val + cValue; + } else { + hasOverflow = true; + } continue; } else { if (c == '#') // comment @@ -91,7 +97,7 @@ static int read_pbm_int(QIODevice *d) else break; } - return val; + return hasOverflow ? -1 : val; } static bool read_pbm_header(QIODevice *device, char& type, int& w, int& h, int& mcc) @@ -123,7 +129,7 @@ static bool read_pbm_header(QIODevice *device, char& type, int& w, int& h, int& static inline QRgb scale_pbm_color(quint16 mx, quint16 rv, quint16 gv, quint16 bv) { - return QRgba64::fromRgba64((rv * 0xffff) / mx, (gv * 0xffff) / mx, (bv * 0xffff) / mx, 0xffff).toArgb32(); + return QRgba64::fromRgba64((rv * 0xffffu) / mx, (gv * 0xffffu) / mx, (bv * 0xffffu) / mx, 0xffff).toArgb32(); } static bool read_pbm_body(QIODevice *device, char type, int w, int h, int mcc, QImage *outImage) @@ -252,7 +258,7 @@ static bool read_pbm_body(QIODevice *device, char type, int w, int h, int mcc, Q } } else { while (n--) { - *p++ = read_pbm_int(device) * 255 / mcc; + *p++ = (read_pbm_int(device) & 0xffff) * 255 / mcc; } } } else { // 32 bits diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 7afad95bd9..97cbf5f9d3 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -3010,6 +3010,11 @@ bool QStandardItemModel::setData(const QModelIndex &index, const QVariant &value return true; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +/*! + \reimp + */ +#else /*! \since 5.12 Removes the data stored in all the roles for the given \a index. @@ -3018,6 +3023,7 @@ bool QStandardItemModel::setData(const QModelIndex &index, const QVariant &value \sa setData(), data() */ +#endif bool QStandardItemModel::clearItemData(const QModelIndex &index) { if (!checkIndex(index, CheckIndexOption::IndexIsValid)) diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h index 00e83f7b08..23d2938bc4 100644 --- a/src/gui/itemmodels/qstandarditemmodel_p.h +++ b/src/gui/itemmodels/qstandarditemmodel_p.h @@ -207,7 +207,7 @@ class QStandardItemModelPrivate : public QAbstractItemModelPrivate public: QStandardItemModelPrivate(); - virtual ~QStandardItemModelPrivate(); + ~QStandardItemModelPrivate(); void init(); diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index bb81ca109a..9e4787589f 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -564,8 +564,8 @@ void QCursor::setShape(Qt::CursorShape shape) } /*! - Returns the cursor bitmap, or 0 if it is one of the standard - cursors. + Returns the cursor bitmap, or \nullptr if it is one of the + standard cursors. */ const QBitmap *QCursor::bitmap() const { @@ -575,8 +575,8 @@ const QBitmap *QCursor::bitmap() const } /*! - Returns the cursor bitmap mask, or 0 if it is one of the standard - cursors. + Returns the cursor bitmap mask, or \nullptr if it is one of the + standard cursors. */ const QBitmap *QCursor::mask() const diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h index 5f6db07987..8f8eb03f87 100644 --- a/src/gui/kernel/qdnd_p.h +++ b/src/gui/kernel/qdnd_p.h @@ -110,7 +110,7 @@ private: QDrag *m_object; static QDragManager *m_instance; - Q_DISABLE_COPY(QDragManager) + Q_DISABLE_COPY_MOVE(QDragManager) }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index bb0e490aa0..dcd0d13d5c 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -284,6 +284,7 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions, Qt::DropAction defa return d->executed_action; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -311,6 +312,7 @@ Qt::DropAction QDrag::start(Qt::DropActions request) d->executed_action = QDragManager::self()->drag(this); return d->executed_action; } +#endif /*! Sets the drag \a cursor for the \a action. This allows you diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h index 27b9c2c88f..7acd5088bd 100644 --- a/src/gui/kernel/qdrag.h +++ b/src/gui/kernel/qdrag.h @@ -74,7 +74,10 @@ public: QObject *source() const; QObject *target() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDrag::exec() instead") Qt::DropAction start(Qt::DropActions supportedActions = Qt::CopyAction); +#endif Qt::DropAction exec(Qt::DropActions supportedActions = Qt::MoveAction); Qt::DropAction exec(Qt::DropActions supportedActions, Qt::DropAction defaultAction); diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index fd01f8bb7b..4a0febc615 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -208,6 +208,8 @@ bool QGuiApplicationPrivate::obey_desktop_settings = true; QInputDeviceManager *QGuiApplicationPrivate::m_inputDeviceManager = 0; +qreal QGuiApplicationPrivate::m_maxDevicePixelRatio = 0.0; + static qreal fontSmoothingGamma = 1.7; extern void qRegisterGuiVariant(); @@ -1093,17 +1095,19 @@ QScreen *QGuiApplication::screenAt(const QPoint &point) */ qreal QGuiApplication::devicePixelRatio() const { - // Cache topDevicePixelRatio, iterate through the screen list once only. - static qreal topDevicePixelRatio = 0.0; - if (!qFuzzyIsNull(topDevicePixelRatio)) { - return topDevicePixelRatio; - } + if (!qFuzzyIsNull(QGuiApplicationPrivate::m_maxDevicePixelRatio)) + return QGuiApplicationPrivate::m_maxDevicePixelRatio; - topDevicePixelRatio = 1.0; // make sure we never return 0. + QGuiApplicationPrivate::m_maxDevicePixelRatio = 1.0; // make sure we never return 0. for (QScreen *screen : qAsConst(QGuiApplicationPrivate::screen_list)) - topDevicePixelRatio = qMax(topDevicePixelRatio, screen->devicePixelRatio()); + QGuiApplicationPrivate::m_maxDevicePixelRatio = qMax(QGuiApplicationPrivate::m_maxDevicePixelRatio, screen->devicePixelRatio()); - return topDevicePixelRatio; + return QGuiApplicationPrivate::m_maxDevicePixelRatio; +} + +void QGuiApplicationPrivate::resetCachedDevicePixelRatio() +{ + m_maxDevicePixelRatio = 0.0; } /*! @@ -1168,7 +1172,7 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString QStringList plugins = pluginNamesWithArguments.split(QLatin1Char(';')); QStringList platformArguments; QStringList availablePlugins = QPlatformIntegrationFactory::keys(platformPluginPath); - for (auto pluginArgument : plugins) { + for (const auto &pluginArgument : plugins) { // Split into platform name and arguments QStringList arguments = pluginArgument.split(QLatin1Char(':')); const QString name = arguments.takeFirst().toLower(); @@ -3000,6 +3004,8 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP for (QScreen* sibling : siblings) emit sibling->virtualGeometryChanged(sibling->virtualGeometry()); } + + resetCachedDevicePixelRatio(); } void QGuiApplicationPrivate::processScreenLogicalDotsPerInchChange(QWindowSystemInterfacePrivate::ScreenLogicalDotsPerInchEvent *e) @@ -3015,6 +3021,8 @@ void QGuiApplicationPrivate::processScreenLogicalDotsPerInchChange(QWindowSystem s->d_func()->logicalDpi = QDpi(e->dpiX, e->dpiY); emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch()); + + resetCachedDevicePixelRatio(); } void QGuiApplicationPrivate::processScreenRefreshRateChange(QWindowSystemInterfacePrivate::ScreenRefreshRateEvent *e) diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 02dffef0fe..5ea72fa0f6 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -86,7 +86,7 @@ public: #else QGuiApplication(int &argc, char **argv, int = ApplicationFlags); #endif - virtual ~QGuiApplication(); + ~QGuiApplication(); static void setApplicationDisplayName(const QString &name); static QString applicationDisplayName(); diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 042a36c31f..63646dcd50 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -311,6 +311,8 @@ public: static void setApplicationState(Qt::ApplicationState state, bool forcePropagate = false); + static void resetCachedDevicePixelRatio(); + protected: virtual void notifyThemeChanged(); virtual void sendApplicationPaletteChange(bool toAllWidgets = false, const char *className = nullptr); @@ -331,6 +333,10 @@ private: bool ownGlobalShareContext; static QInputDeviceManager *m_inputDeviceManager; + + // Cache the maximum device pixel ratio, to iterate through the screen list + // only the first time it's required, or when devices are added or removed. + static qreal m_maxDevicePixelRatio; }; Q_GUI_EXPORT uint qHash(const QGuiApplicationPrivate::ActiveTouchPointsKey &k); diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index aeec7b7414..8364557020 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -76,7 +76,7 @@ public: private: friend QKeyMapperPrivate *qt_keymapper_private(); Q_DECLARE_PRIVATE(QKeyMapper) - Q_DISABLE_COPY(QKeyMapper) + Q_DISABLE_COPY_MOVE(QKeyMapper) }; struct KeyboardLayoutItem; diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index a428da8ca4..74bf6e6b47 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1221,10 +1221,12 @@ QString QKeySequence::encodeString(int key) static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format) { if (!str.isEmpty()) { - if (format == QKeySequence::NativeText) + if (format == QKeySequence::NativeText) { + //: Key separator in shortcut string str += QCoreApplication::translate("QShortcut", "+"); - else + } else { str += QLatin1Char('+'); + } } str += theKey; diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h index 9d4839cb25..1b9e7c00ca 100644 --- a/src/gui/kernel/qoffscreensurface.h +++ b/src/gui/kernel/qoffscreensurface.h @@ -60,7 +60,7 @@ public: // ### Qt 6: merge overloads explicit QOffscreenSurface(QScreen *screen, QObject *parent); explicit QOffscreenSurface(QScreen *screen = nullptr); - virtual ~QOffscreenSurface(); + ~QOffscreenSurface(); SurfaceType surfaceType() const override; diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index be04513de6..4847a62b0f 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -414,15 +414,14 @@ int QOpenGLContextPrivate::maxTextureSize() /*! Returns the last context which called makeCurrent in the current thread, - or 0, if no context is current. + or \nullptr, if no context is current. */ QOpenGLContext* QOpenGLContext::currentContext() { QGuiGLThreadContext *threadContext = qwindow_context_storage()->localData(); - if (threadContext) { + if (threadContext) return threadContext->context; - } - return 0; + return nullptr; } /*! diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h index 4f2f951d61..2849d0c58e 100644 --- a/src/gui/kernel/qopenglcontext_p.h +++ b/src/gui/kernel/qopenglcontext_p.h @@ -97,7 +97,7 @@ private: friend class QOpenGLContextGroupPrivate; friend class QOpenGLMultiGroupSharedResource; - Q_DISABLE_COPY(QOpenGLSharedResource) + Q_DISABLE_COPY_MOVE(QOpenGLSharedResource) }; class Q_GUI_EXPORT QOpenGLSharedResourceGuard : public QOpenGLSharedResource @@ -219,7 +219,7 @@ public: requestedFormat = QSurfaceFormat::defaultFormat(); } - virtual ~QOpenGLContextPrivate() + ~QOpenGLContextPrivate() { //do not delete the QOpenGLContext handle here as it is deleted in //QWidgetPrivate::deleteTLSysExtra() diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 9ccfb9b819..b4383c5bfc 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -941,7 +941,8 @@ qint64 QPalette::cacheKey() const } /*! - Returns a new QPalette that has attributes copied from \a other. + Returns a new QPalette that is a union of this instance and \a other. + Color roles set in this instance take precedence. */ QPalette QPalette::resolve(const QPalette &other) const { @@ -959,6 +960,7 @@ QPalette QPalette::resolve(const QPalette &other) const if (!(data.resolve_mask & (1<<role))) for(int grp = 0; grp < (int)NColorGroups; grp++) palette.d->br[grp][role] = other.d->br[grp][role]; + palette.data.resolve_mask |= other.data.resolve_mask; return palette; } @@ -981,7 +983,7 @@ QPalette QPalette::resolve(const QPalette &other) const #ifndef QT_NO_DATASTREAM static const int NumOldRoles = 7; -static const int oldRoles[7] = { QPalette::Foreground, QPalette::Background, QPalette::Light, +static const int oldRoles[7] = { QPalette::WindowText, QPalette::Window, QPalette::Light, QPalette::Dark, QPalette::Mid, QPalette::Text, QPalette::Base }; /*! diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h index 071eddbc4d..e931e01480 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/kernel/qpalette.h @@ -98,7 +98,10 @@ public: ToolTipBase, ToolTipText, PlaceholderText, NColorRoles = PlaceholderText + 1, - Foreground = WindowText, Background = Window +#if QT_DEPRECATED_SINCE(5, 13) + Foreground Q_DECL_ENUMERATOR_DEPRECATED_X("Use QPalette::WindowText instead") = WindowText, + Background Q_DECL_ENUMERATOR_DEPRECATED_X("Use QPalette::Window instead") = Window +#endif }; Q_ENUM(ColorRole) @@ -121,7 +124,6 @@ public: inline const QColor &color(ColorRole cr) const { return color(Current, cr); } inline const QBrush &brush(ColorRole cr) const { return brush(Current, cr); } - inline const QBrush &foreground() const { return brush(WindowText); } inline const QBrush &windowText() const { return brush(WindowText); } inline const QBrush &button() const { return brush(Button); } inline const QBrush &light() const { return brush(Light); } @@ -132,7 +134,6 @@ public: inline const QBrush &alternateBase() const { return brush(AlternateBase); } inline const QBrush &toolTipBase() const { return brush(ToolTipBase); } inline const QBrush &toolTipText() const { return brush(ToolTipText); } - inline const QBrush &background() const { return brush(Window); } inline const QBrush &window() const { return brush(Window); } inline const QBrush &midlight() const { return brush(Midlight); } inline const QBrush &brightText() const { return brush(BrightText); } @@ -143,6 +144,12 @@ public: inline const QBrush &link() const { return brush(Link); } inline const QBrush &linkVisited() const { return brush(LinkVisited); } inline const QBrush &placeholderText() const { return brush(PlaceholderText); } +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QPalette::windowText() instead") + inline const QBrush &foreground() const { return windowText(); } + QT_DEPRECATED_X("Use QPalette::window() instead") + inline const QBrush &background() const { return window(); } +#endif bool operator==(const QPalette &p) const; inline bool operator!=(const QPalette &p) const { return !(operator==(p)); } diff --git a/src/gui/kernel/qplatformclipboard.h b/src/gui/kernel/qplatformclipboard.h index 60733b0a9f..3220201720 100644 --- a/src/gui/kernel/qplatformclipboard.h +++ b/src/gui/kernel/qplatformclipboard.h @@ -61,6 +61,9 @@ QT_BEGIN_NAMESPACE class Q_GUI_EXPORT QPlatformClipboard { public: + Q_DISABLE_COPY_MOVE(QPlatformClipboard) + + QPlatformClipboard() = default; virtual ~QPlatformClipboard(); virtual QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard); diff --git a/src/gui/kernel/qplatformcursor.h b/src/gui/kernel/qplatformcursor.h index 40e8a562f8..f36a73c861 100644 --- a/src/gui/kernel/qplatformcursor.h +++ b/src/gui/kernel/qplatformcursor.h @@ -78,6 +78,8 @@ private: class Q_GUI_EXPORT QPlatformCursor : public QObject { public: + Q_DISABLE_COPY_MOVE(QPlatformCursor) + enum Capability { OverrideCursor = 0x1 }; diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 628ad06478..d14d575056 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -41,6 +41,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QVariant> +#include <QtCore/QRegularExpression> #include <QtCore/QSharedData> #if QT_CONFIG(settings) #include <QtCore/QSettings> @@ -63,6 +64,18 @@ QT_BEGIN_NAMESPACE */ +/*! + \enum QPlatformDialogHelper::StyleHint + + This enum type specifies platform-specific style hints. + + \value DialogIsQtWindow Indicates that a platform-specific dialog is implemented + as in-process Qt window. It allows to prevent blocking the + dialog by an invisible proxy Qt dialog. + + \sa styleHint() +*/ + static const int buttonRoleLayouts[2][6][14] = { // Qt::Horizontal @@ -767,18 +780,19 @@ void QPlatformFileDialogHelper::setOptions(const QSharedPointer<QFileDialogOptio m_options = options; } -const char *QPlatformFileDialogHelper::filterRegExp = +const char QPlatformFileDialogHelper::filterRegExp[] = "^(.*)\\(([a-zA-Z0-9_.,*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$"; // Makes a list of filters from a normal filter string "Image Files (*.png *.jpg)" QStringList QPlatformFileDialogHelper::cleanFilterList(const QString &filter) { - QRegExp regexp(QString::fromLatin1(filterRegExp)); + QRegularExpression regexp(QString::fromLatin1(filterRegExp)); Q_ASSERT(regexp.isValid()); QString f = filter; - int i = regexp.indexIn(f); - if (i >= 0) - f = regexp.cap(2); + QRegularExpressionMatch match; + filter.indexOf(regexp, 0, &match); + if (match.hasMatch()) + f = match.captured(2); return f.split(QLatin1Char(' '), QString::SkipEmptyParts); } diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h index bfcb658172..f09bec12da 100644 --- a/src/gui/kernel/qplatformdialoghelper.h +++ b/src/gui/kernel/qplatformdialoghelper.h @@ -80,6 +80,7 @@ class Q_GUI_EXPORT QPlatformDialogHelper : public QObject Q_OBJECT public: enum StyleHint { + DialogIsQtWindow }; enum DialogCode { Rejected, Accepted }; @@ -153,7 +154,7 @@ public: Q_ENUM(ButtonLayout) QPlatformDialogHelper(); - virtual ~QPlatformDialogHelper(); + ~QPlatformDialogHelper(); virtual QVariant styleHint(StyleHint hint) const; @@ -413,7 +414,7 @@ public: void setOptions(const QSharedPointer<QFileDialogOptions> &options); static QStringList cleanFilterList(const QString &filter); - static const char *filterRegExp; + static const char filterRegExp[]; Q_SIGNALS: void fileSelected(const QUrl &file); diff --git a/src/gui/kernel/qplatformdrag.h b/src/gui/kernel/qplatformdrag.h index 9d4e352b4b..0c99539357 100644 --- a/src/gui/kernel/qplatformdrag.h +++ b/src/gui/kernel/qplatformdrag.h @@ -91,6 +91,8 @@ class Q_GUI_EXPORT QPlatformDrag { Q_DECLARE_PRIVATE(QPlatformDrag) public: + Q_DISABLE_COPY_MOVE(QPlatformDrag) + QPlatformDrag(); virtual ~QPlatformDrag(); @@ -108,8 +110,6 @@ public: private: QPlatformDragPrivate *d_ptr; - - Q_DISABLE_COPY(QPlatformDrag) }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformgraphicsbuffer.h b/src/gui/kernel/qplatformgraphicsbuffer.h index 0aeef946e6..65c24bebc9 100644 --- a/src/gui/kernel/qplatformgraphicsbuffer.h +++ b/src/gui/kernel/qplatformgraphicsbuffer.h @@ -78,7 +78,7 @@ public: OriginTopLeft }; - virtual ~QPlatformGraphicsBuffer(); + ~QPlatformGraphicsBuffer(); AccessTypes isLocked() const { return m_lock_access; } bool lock(AccessTypes access, const QRect &rect = QRect()); diff --git a/src/gui/kernel/qplatforminputcontext.h b/src/gui/kernel/qplatforminputcontext.h index 26d40cd2c6..ad0e5bcf35 100644 --- a/src/gui/kernel/qplatforminputcontext.h +++ b/src/gui/kernel/qplatforminputcontext.h @@ -67,7 +67,7 @@ public: }; QPlatformInputContext(); - virtual ~QPlatformInputContext(); + ~QPlatformInputContext(); virtual bool isValid() const; virtual bool hasCapability(Capability capability) const; diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index 7d1fcd4eeb..bb20a160db 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -482,6 +482,9 @@ void QPlatformIntegration::screenAdded(QPlatformScreen *ps, bool isPrimary) } else { QGuiApplicationPrivate::screen_list.append(screen); } + + QGuiApplicationPrivate::resetCachedDevicePixelRatio(); + emit qGuiApp->screenAdded(screen); if (isPrimary) @@ -499,6 +502,8 @@ void QPlatformIntegration::removeScreen(QScreen *screen) const bool wasPrimary = (!QGuiApplicationPrivate::screen_list.isEmpty() && QGuiApplicationPrivate::screen_list.at(0) == screen); QGuiApplicationPrivate::screen_list.removeOne(screen); + QGuiApplicationPrivate::resetCachedDevicePixelRatio(); + if (wasPrimary && qGuiApp && !QGuiApplicationPrivate::screen_list.isEmpty()) emit qGuiApp->primaryScreenChanged(QGuiApplicationPrivate::screen_list.at(0)); } @@ -534,7 +539,7 @@ void QPlatformIntegration::setPrimaryScreen(QPlatformScreen *newPrimary) if (idx == 0) return; - QGuiApplicationPrivate::screen_list.swap(0, idx); + QGuiApplicationPrivate::screen_list.swapItemsAt(0, idx); emit qGuiApp->primaryScreenChanged(newPrimaryScreen); } diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index efb1481f6d..de5f9c1c9a 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -84,6 +84,8 @@ class QVulkanInstance; class Q_GUI_EXPORT QPlatformIntegration { public: + Q_DISABLE_COPY_MOVE(QPlatformIntegration) + enum Capability { ThreadedPixmaps = 1, OpenGL, @@ -199,6 +201,8 @@ public: #endif protected: + QPlatformIntegration() = default; + void screenAdded(QPlatformScreen *screen, bool isPrimary = false); void destroyScreen(QPlatformScreen *screen); void setPrimaryScreen(QPlatformScreen *newPrimary); diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index e9d64c8a29..b9ecc80320 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -80,6 +80,8 @@ class Q_GUI_EXPORT QPlatformScreen Q_DECLARE_PRIVATE(QPlatformScreen) public: + Q_DISABLE_COPY_MOVE(QPlatformScreen) + enum SubpixelAntialiasingType { // copied from qfontengine_p.h since we can't include private headers Subpixel_None, Subpixel_RGB, @@ -164,8 +166,6 @@ protected: QScopedPointer<QPlatformScreenPrivate> d_ptr; private: - Q_DISABLE_COPY(QPlatformScreen) - friend class QScreenPrivate; }; diff --git a/src/gui/kernel/qplatformservices.h b/src/gui/kernel/qplatformservices.h index 339bbfde3f..5de96cfa7d 100644 --- a/src/gui/kernel/qplatformservices.h +++ b/src/gui/kernel/qplatformservices.h @@ -58,6 +58,8 @@ class QUrl; class Q_GUI_EXPORT QPlatformServices { public: + Q_DISABLE_COPY_MOVE(QPlatformServices) + QPlatformServices(); virtual ~QPlatformServices() { } diff --git a/src/gui/kernel/qplatformsessionmanager.h b/src/gui/kernel/qplatformsessionmanager.h index ca7cab389b..c6c3984816 100644 --- a/src/gui/kernel/qplatformsessionmanager.h +++ b/src/gui/kernel/qplatformsessionmanager.h @@ -64,6 +64,8 @@ QT_BEGIN_NAMESPACE class Q_GUI_EXPORT QPlatformSessionManager { public: + Q_DISABLE_COPY_MOVE(QPlatformSessionManager) + explicit QPlatformSessionManager(const QString &id, const QString &key); virtual ~QPlatformSessionManager(); @@ -101,8 +103,6 @@ private: QStringList m_restartCommand; QStringList m_discardCommand; QSessionManager::RestartHint m_restartHint; - - Q_DISABLE_COPY(QPlatformSessionManager) }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformsurface.h b/src/gui/kernel/qplatformsurface.h index 4d8854fb40..475f3ef330 100644 --- a/src/gui/kernel/qplatformsurface.h +++ b/src/gui/kernel/qplatformsurface.h @@ -65,6 +65,8 @@ class QDebug; class Q_GUI_EXPORT QPlatformSurface { public: + Q_DISABLE_COPY_MOVE(QPlatformSurface) + virtual ~QPlatformSurface(); virtual QSurfaceFormat format() const = 0; diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h index 1d6049a98d..54c8c70025 100644 --- a/src/gui/kernel/qplatformtheme.h +++ b/src/gui/kernel/qplatformtheme.h @@ -76,6 +76,8 @@ class Q_GUI_EXPORT QPlatformTheme { Q_DECLARE_PRIVATE(QPlatformTheme) public: + Q_DISABLE_COPY_MOVE(QPlatformTheme) + enum ThemeHint { CursorFlashTime, KeyboardInputInterval, @@ -324,8 +326,6 @@ public: protected: explicit QPlatformTheme(QPlatformThemePrivate *priv); QScopedPointer<QPlatformThemePrivate> d_ptr; -private: - Q_DISABLE_COPY(QPlatformTheme) }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 50f05721f7..d6f90c9254 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -90,11 +90,11 @@ QWindow *QPlatformWindow::window() const } /*! - Returns the parent platform window (or 0 if orphan). + Returns the parent platform window (or \nullptr if orphan). */ QPlatformWindow *QPlatformWindow::parent() const { - return window()->parent() ? window()->parent()->handle() : 0; + return window()->parent() ? window()->parent()->handle() : nullptr; } /*! diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h index 075ac0f82b..4d48cc2f13 100644 --- a/src/gui/kernel/qplatformwindow.h +++ b/src/gui/kernel/qplatformwindow.h @@ -71,6 +71,8 @@ class Q_GUI_EXPORT QPlatformWindow : public QPlatformSurface { Q_DECLARE_PRIVATE(QPlatformWindow) public: + Q_DISABLE_COPY_MOVE(QPlatformWindow) + explicit QPlatformWindow(QWindow *window); ~QPlatformWindow() override; @@ -164,8 +166,6 @@ protected: static QSize constrainWindowSize(const QSize &size); QScopedPointer<QPlatformWindowPrivate> d_ptr; -private: - Q_DISABLE_COPY(QPlatformWindow) }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qsessionmanager_p.h b/src/gui/kernel/qsessionmanager_p.h index 954443430e..d07d9b5eb8 100644 --- a/src/gui/kernel/qsessionmanager_p.h +++ b/src/gui/kernel/qsessionmanager_p.h @@ -69,7 +69,7 @@ public: QSessionManagerPrivate(const QString &id, const QString &key); - virtual ~QSessionManagerPrivate(); + ~QSessionManagerPrivate(); QPlatformSessionManager *platformSessionManager; }; diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h index f9e8a83a39..8638b05155 100644 --- a/src/gui/kernel/qsimpledrag_p.h +++ b/src/gui/kernel/qsimpledrag_p.h @@ -71,7 +71,7 @@ class QScreen; class Q_GUI_EXPORT QBasicDrag : public QPlatformDrag, public QObject { public: - virtual ~QBasicDrag(); + ~QBasicDrag(); virtual Qt::DropAction drag(QDrag *drag) override; void cancelDrag() override; diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp index 48060a2c37..9b5b7a6f1e 100644 --- a/src/gui/kernel/qstylehints.cpp +++ b/src/gui/kernel/qstylehints.cpp @@ -69,29 +69,17 @@ class QStyleHintsPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QStyleHints) public: - inline QStyleHintsPrivate() - : m_mouseDoubleClickInterval(-1) - , m_mousePressAndHoldInterval(-1) - , m_startDragDistance(-1) - , m_startDragTime(-1) - , m_keyboardInputInterval(-1) - , m_cursorFlashTime(-1) - , m_tabFocusBehavior(-1) - , m_uiEffects(-1) - , m_wheelScrollLines(-1) - , m_mouseQuickSelectionThreshold(-1) - {} - - int m_mouseDoubleClickInterval; - int m_mousePressAndHoldInterval; - int m_startDragDistance; - int m_startDragTime; - int m_keyboardInputInterval; - int m_cursorFlashTime; - int m_tabFocusBehavior; - int m_uiEffects; - int m_wheelScrollLines; - int m_mouseQuickSelectionThreshold; + int m_mouseDoubleClickInterval = -1; + int m_mousePressAndHoldInterval = -1; + int m_startDragDistance = -1; + int m_startDragTime = -1; + int m_keyboardInputInterval = -1; + int m_cursorFlashTime = -1; + int m_tabFocusBehavior = -1; + int m_uiEffects = -1; + int m_showShortcutsInContextMenus = -1; + int m_wheelScrollLines = -1; + int m_mouseQuickSelectionThreshold = -1; }; /*! @@ -371,10 +359,25 @@ bool QStyleHints::showIsMaximized() const \since 5.10 \brief \c true if the platform normally shows shortcut key sequences in context menus, otherwise \c false. + + Since Qt 5.13, the setShowShortcutsInContextMenus() function can be used to + override the platform default. */ bool QStyleHints::showShortcutsInContextMenus() const { - return themeableHint(QPlatformTheme::ShowShortcutsInContextMenus, QPlatformIntegration::ShowShortcutsInContextMenus).toBool(); + Q_D(const QStyleHints); + return d->m_showShortcutsInContextMenus >= 0 + ? d->m_showShortcutsInContextMenus != 0 + : themeableHint(QPlatformTheme::ShowShortcutsInContextMenus, QPlatformIntegration::ShowShortcutsInContextMenus).toBool(); +} + +void QStyleHints::setShowShortcutsInContextMenus(bool s) +{ + Q_D(QStyleHints); + if (s != showShortcutsInContextMenus()) { + d->m_showShortcutsInContextMenus = s ? 1 : 0; + emit showShortcutsInContextMenusChanged(s); + } } /*! diff --git a/src/gui/kernel/qstylehints.h b/src/gui/kernel/qstylehints.h index 7b0683e9b1..9091db9624 100644 --- a/src/gui/kernel/qstylehints.h +++ b/src/gui/kernel/qstylehints.h @@ -64,7 +64,7 @@ class Q_GUI_EXPORT QStyleHints : public QObject Q_PROPERTY(bool setFocusOnTouchRelease READ setFocusOnTouchRelease STORED false CONSTANT FINAL) Q_PROPERTY(bool showIsFullScreen READ showIsFullScreen STORED false CONSTANT FINAL) Q_PROPERTY(bool showIsMaximized READ showIsMaximized STORED false CONSTANT FINAL) - Q_PROPERTY(bool showShortcutsInContextMenus READ showShortcutsInContextMenus STORED false CONSTANT FINAL) + Q_PROPERTY(bool showShortcutsInContextMenus READ showShortcutsInContextMenus WRITE setShowShortcutsInContextMenus NOTIFY showShortcutsInContextMenusChanged FINAL) Q_PROPERTY(int startDragDistance READ startDragDistance NOTIFY startDragDistanceChanged FINAL) Q_PROPERTY(int startDragTime READ startDragTime NOTIFY startDragTimeChanged FINAL) Q_PROPERTY(int startDragVelocity READ startDragVelocity STORED false CONSTANT FINAL) @@ -93,6 +93,7 @@ public: bool showIsFullScreen() const; bool showIsMaximized() const; bool showShortcutsInContextMenus() const; + void setShowShortcutsInContextMenus(bool showShortcutsInContextMenus); int passwordMaskDelay() const; QChar passwordMaskCharacter() const; qreal fontSmoothingGamma() const; @@ -117,6 +118,7 @@ Q_SIGNALS: void startDragTimeChanged(int startDragTime); void tabFocusBehaviorChanged(Qt::TabFocusBehavior tabFocusBehavior); void useHoverEffectsChanged(bool useHoverEffects); + void showShortcutsInContextMenusChanged(bool); void wheelScrollLinesChanged(int scrollLines); void mouseQuickSelectionThresholdChanged(int threshold); diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index f1e08826a8..0b833cfbc7 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -1330,16 +1330,18 @@ Qt::WindowStates QWindow::windowStates() const */ /*! - Sets the transient \a parent + \property QWindow::transientParent + \brief the window for which this window is a transient pop-up + \since 5.13 This is a hint to the window manager that this window is a dialog or pop-up - on behalf of the given window. + on behalf of the transient parent. In order to cause the window to be centered above its transient parent by default, depending on the window manager, it may also be necessary to call setFlags() with a suitable \l Qt::WindowType (such as \c Qt::Dialog). - \sa transientParent(), parent() + \sa parent() */ void QWindow::setTransientParent(QWindow *parent) { @@ -1356,19 +1358,28 @@ void QWindow::setTransientParent(QWindow *parent) d->transientParent = parent; QGuiApplicationPrivate::updateBlockedStatus(this); + emit transientParentChanged(parent); } -/*! - Returns the transient parent of the window. - - \sa setTransientParent(), parent() -*/ QWindow *QWindow::transientParent() const { Q_D(const QWindow); return d->transientParent.data(); } +/* + The setter for the QWindow::transientParent property. + The only reason this exists is to set the transientParentPropertySet flag + so that Qt Quick knows whether it was set programmatically (because of + Window declaration context) or because the user set the property. +*/ +void QWindowPrivate::setTransientParent(QWindow *parent) +{ + Q_Q(QWindow); + q->setTransientParent(parent); + transientParentPropertySet = true; +} + /*! \enum QWindow::AncestorMode diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 439e62d0bd..1be3c845fe 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -123,6 +123,7 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged REVISION 1) Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged) Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged REVISION 1) + Q_PRIVATE_PROPERTY(QWindow::d_func(), QWindow* transientParent MEMBER transientParent WRITE setTransientParent NOTIFY transientParentChanged REVISION 13) public: enum Visibility { @@ -143,7 +144,7 @@ public: explicit QWindow(QScreen *screen = nullptr); explicit QWindow(QWindow *parent); - virtual ~QWindow(); + ~QWindow(); void setSurfaceType(SurfaceType surfaceType); SurfaceType surfaceType() const override; @@ -336,6 +337,8 @@ Q_SIGNALS: Q_REVISION(1) void opacityChanged(qreal opacity); + Q_REVISION(13) void transientParentChanged(QWindow *transientParent); + protected: virtual void exposeEvent(QExposeEvent *); virtual void resizeEvent(QResizeEvent *); diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index bf5e645114..25f9a8a9b2 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -148,6 +148,7 @@ public: void disconnectFromScreen(); void emitScreenChangedRecursion(QScreen *newScreen); QScreen *screenForGeometry(const QRect &rect); + void setTransientParent(QWindow *parent); virtual void clearFocusObject(); virtual QRectF closestAcceptableGeometry(const QRectF &rect) const; @@ -191,6 +192,7 @@ public: bool blockedByModalWindow; bool updateRequestPending; + bool transientParentPropertySet = false; QPointer<QWindow> transientParent; QPointer<QScreen> topLevelScreen; diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h index 9cb4e191cc..563ca8f922 100644 --- a/src/gui/kernel/qwindowsysteminterface_p.h +++ b/src/gui/kernel/qwindowsysteminterface_p.h @@ -508,7 +508,7 @@ public: } } private: - Q_DISABLE_COPY(WindowSystemEventList) + Q_DISABLE_COPY_MOVE(WindowSystemEventList) }; static WindowSystemEventList windowSystemEventQueue; diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index 987cbe7c12..2b1e57a4bb 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -54,8 +54,6 @@ #include <QtCore/QFile> #include <QtCore/QDir> -#include <set> - QT_BEGIN_NAMESPACE #if defined(QT_OPENGL_3) @@ -536,13 +534,4 @@ QOpenGLConfig::Gpu QOpenGLConfig::Gpu::fromContext() return gpu; } -Q_GUI_EXPORT std::set<QByteArray> *qgpu_features(const QString &filename) -{ - const QSet<QString> features = QOpenGLConfig::gpuFeatures(QOpenGLConfig::Gpu::fromContext(), filename); - std::set<QByteArray> *result = new std::set<QByteArray>; - for (const QString &feature : features) - result->insert(feature.toUtf8()); - return result; -} - QT_END_NAMESPACE diff --git a/src/gui/opengl/qopenglcustomshaderstage_p.h b/src/gui/opengl/qopenglcustomshaderstage_p.h index f4a71af88e..ce3e9efd23 100644 --- a/src/gui/opengl/qopenglcustomshaderstage_p.h +++ b/src/gui/opengl/qopenglcustomshaderstage_p.h @@ -80,7 +80,7 @@ protected: private: QOpenGLCustomShaderStagePrivate* d_ptr; - Q_DISABLE_COPY(QOpenGLCustomShaderStage) + Q_DISABLE_COPY_MOVE(QOpenGLCustomShaderStage) }; diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h index 856adb679e..63873476e4 100644 --- a/src/gui/opengl/qopenglext.h +++ b/src/gui/opengl/qopenglext.h @@ -468,9 +468,14 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode); #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 -#include <stddef.h> -typedef ptrdiff_t GLsizeiptr; -typedef ptrdiff_t GLintptr; +#ifdef _WIN64 +typedef signed long long int GLsizeiptr; +typedef signed long long int GLintptr; +#else +typedef signed long int GLsizeiptr; +typedef signed long int GLintptr; +#endif + #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 #define GL_QUERY_COUNTER_BITS 0x8864 diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 00287b0665..4554291bbd 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -228,26 +228,8 @@ struct QOpenGLFunctionsPrivate; #undef glTexLevelParameteriv #if defined(Q_CLANG_QDOC) -#undef GLint -typedef int GLint; -#undef GLsizei -typedef int GLsizei; -#undef GLuint -typedef unsigned int GLuint; -#undef GLubyte -typedef unsigned int GLubyte; -#undef GLenum -typedef unsigned int GLenum; #undef GLbitfield typedef unsigned int GLbitfield; -#undef GLfloat -typedef float GLfloat; -#undef GLclampf -typedef float GLclampf; -#undef GLboolean -typedef bool GLboolean; -#undef GLvoid -typedef void GLvoid; #undef GLchar typedef char GLchar; #endif diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h index 300002a9c1..54118f2926 100644 --- a/src/gui/opengl/qopenglpaintdevice.h +++ b/src/gui/opengl/qopenglpaintdevice.h @@ -59,7 +59,7 @@ public: QOpenGLPaintDevice(); explicit QOpenGLPaintDevice(const QSize &size); QOpenGLPaintDevice(int width, int height); - virtual ~QOpenGLPaintDevice(); + ~QOpenGLPaintDevice(); int devType() const override { return QInternal::OpenGL; } QPaintEngine *paintEngine() const override; diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp index 001cb839fa..042b9ebd79 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -1574,14 +1574,15 @@ void QOpenGL2PaintEngineEx::drawImage(const QRectF& dest, const QImage& image, c case QImage::Format_Alpha8: if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats)) { d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::AlphaImageSrc); - bindOption = QOpenGLTextureUploader::UseRedFor8BitBindOption; + bindOption = QOpenGLTextureUploader::UseRedForAlphaAndLuminanceBindOption; } else d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc); break; case QImage::Format_Grayscale8: + case QImage::Format_Grayscale16: if (ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::TextureRGFormats)) { d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::GrayscaleImageSrc); - bindOption = QOpenGLTextureUploader::UseRedFor8BitBindOption; + bindOption = QOpenGLTextureUploader::UseRedForAlphaAndLuminanceBindOption; } else d->shaderManager->setSrcPixelType(QOpenGLEngineShaderManager::ImageSrc); break; diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h index 0541ce6168..15ac240b89 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h @@ -166,7 +166,7 @@ public: bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override; private: - Q_DISABLE_COPY(QOpenGL2PaintEngineEx) + Q_DISABLE_COPY_MOVE(QOpenGL2PaintEngineEx) friend class QOpenGLEngineShaderManager; }; diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h index 84eb8d6956..c79101fd4d 100644 --- a/src/gui/opengl/qopenglshaderprogram.h +++ b/src/gui/opengl/qopenglshaderprogram.h @@ -50,13 +50,6 @@ #include <QtGui/qvector4d.h> #include <QtGui/qmatrix4x4.h> -#if defined(Q_CLANG_QDOC) -#undef GLint -typedef int GLint; -#undef GLfloat -typedef double GLfloat; -#endif - QT_BEGIN_NAMESPACE @@ -80,7 +73,7 @@ public: Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit) explicit QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent = nullptr); - virtual ~QOpenGLShader(); + ~QOpenGLShader(); QOpenGLShader::ShaderType shaderType() const; @@ -115,7 +108,7 @@ class Q_GUI_EXPORT QOpenGLShaderProgram : public QObject Q_OBJECT public: explicit QOpenGLShaderProgram(QObject *parent = nullptr); - virtual ~QOpenGLShaderProgram(); + ~QOpenGLShaderProgram(); bool addShader(QOpenGLShader *shader); void removeShader(QOpenGLShader *shader); diff --git a/src/gui/opengl/qopengltextureuploader.cpp b/src/gui/opengl/qopengltextureuploader.cpp index 42e309b733..90253546c8 100644 --- a/src/gui/opengl/qopengltextureuploader.cpp +++ b/src/gui/opengl/qopengltextureuploader.cpp @@ -104,7 +104,7 @@ qsizetype QOpenGLTextureUploader::textureImage(GLenum target, const QImage &imag const bool isOpenGLES3orBetter = context->isOpenGLES() && context->format().majorVersion() >= 3; const bool sRgbBinding = (options & SRgbBindOption); Q_ASSERT(isOpenGL12orBetter || context->isOpenGLES()); - Q_ASSERT((options & (SRgbBindOption | UseRedFor8BitBindOption)) != (SRgbBindOption | UseRedFor8BitBindOption)); + Q_ASSERT((options & (SRgbBindOption | UseRedForAlphaAndLuminanceBindOption)) != (SRgbBindOption | UseRedForAlphaAndLuminanceBindOption)); switch (image.format()) { case QImage::Format_RGB32: @@ -213,7 +213,7 @@ qsizetype QOpenGLTextureUploader::textureImage(GLenum target, const QImage &imag if (sRgbBinding) { // Always needs conversion break; - } else if (options & UseRedFor8BitBindOption) { + } else if (options & UseRedForAlphaAndLuminanceBindOption) { externalFormat = internalFormat = GL_RED; pixelType = GL_UNSIGNED_BYTE; targetFormat = image.format(); @@ -223,7 +223,7 @@ qsizetype QOpenGLTextureUploader::textureImage(GLenum target, const QImage &imag if (sRgbBinding) { // Always needs conversion break; - } else if (options & UseRedFor8BitBindOption) { + } else if (options & UseRedForAlphaAndLuminanceBindOption) { externalFormat = internalFormat = GL_RED; pixelType = GL_UNSIGNED_BYTE; targetFormat = image.format(); @@ -243,7 +243,7 @@ qsizetype QOpenGLTextureUploader::textureImage(GLenum target, const QImage &imag if (sRgbBinding) { // Always needs conversion break; - } else if (options & UseRedFor8BitBindOption) { + } else if (options & UseRedForAlphaAndLuminanceBindOption) { externalFormat = internalFormat = GL_RED; pixelType = GL_UNSIGNED_BYTE; targetFormat = image.format(); @@ -259,6 +259,26 @@ qsizetype QOpenGLTextureUploader::textureImage(GLenum target, const QImage &imag targetFormat = image.format(); } break; + case QImage::Format_Grayscale16: + if (sRgbBinding) { + // Always needs conversion + break; + } else if (options & UseRedForAlphaAndLuminanceBindOption) { + externalFormat = internalFormat = GL_RED; + pixelType = GL_UNSIGNED_SHORT; + targetFormat = image.format(); + } else if (context->isOpenGLES() || context->format().profile() != QSurfaceFormat::CoreProfile) { + externalFormat = internalFormat = GL_LUMINANCE; + pixelType = GL_UNSIGNED_SHORT; + targetFormat = image.format(); + } else if (funcs->hasOpenGLExtension(QOpenGLExtensions::TextureSwizzle)) { + GLint swizzle[4] = { GL_RED, GL_RED, GL_RED, GL_ONE }; + funcs->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + externalFormat = internalFormat = GL_RED; + pixelType = GL_UNSIGNED_SHORT; + targetFormat = image.format(); + } + break; default: break; } diff --git a/src/gui/opengl/qopengltextureuploader_p.h b/src/gui/opengl/qopengltextureuploader_p.h index d758b3787b..0dcf709d7e 100644 --- a/src/gui/opengl/qopengltextureuploader_p.h +++ b/src/gui/opengl/qopengltextureuploader_p.h @@ -65,7 +65,7 @@ public: enum BindOption { NoBindOption = 0x0000, PremultipliedAlphaBindOption = 0x0001, - UseRedFor8BitBindOption = 0x0002, + UseRedForAlphaAndLuminanceBindOption = 0x0002, SRgbBindOption = 0x0004, PowerOfTwoBindOption = 0x0008 }; diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h index 3af1ed0466..f828e5668b 100644 --- a/src/gui/opengl/qopenglversionfunctions.h +++ b/src/gui/opengl/qopenglversionfunctions.h @@ -214,6 +214,7 @@ public: virtual bool initializeOpenGLFunctions(); + Q_DISABLE_COPY(QAbstractOpenGLFunctions) Q_DECLARE_PRIVATE(QAbstractOpenGLFunctions) protected: diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index 2dd5144e40..348eceb47f 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -187,19 +187,11 @@ void qt_blend_rgb16_on_rgb16(uchar *dst, int dbpl, #endif if (const_alpha == 256) { - if (w <= 64) { - while (h--) { - QT_MEMCPY_USHORT(dst, src, w); - dst += dbpl; - src += sbpl; - } - } else { - int length = w << 1; - while (h--) { - memcpy(dst, src, length); - dst += dbpl; - src += sbpl; - } + int length = w << 1; + while (h--) { + memcpy(dst, src, length); + dst += dbpl; + src += sbpl; } } else if (const_alpha != 0) { quint16 *d = (quint16 *) dst; diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 860653cc4c..abfa8d41bb 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -111,7 +111,7 @@ Q_GUI_EXPORT QPixmap qt_pixmapForBrush(int brushStyle, bool invert) QString key = QLatin1String("$qt-brush$") % HexString<uint>(brushStyle) % QLatin1Char(invert ? '1' : '0'); - if (!QPixmapCache::find(key, pm)) { + if (!QPixmapCache::find(key, &pm)) { pm = QBitmap::fromData(QSize(8, 8), qt_patternForBrush(brushStyle, invert), QImage::Format_MonoLSB); QPixmapCache::insert(key, pm); diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index e5bac84df9..07202f5b1c 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -2500,6 +2500,15 @@ QColor QColor::fromHslF(qreal h, qreal s, qreal l, qreal a) return color; } +/*! + \obsolete + + Use the \c const overload instead. +*/ +void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a) +{ + const_cast<const QColor *>(this)->getCmyk(c, m, y, k, a); +} /*! Sets the contents pointed to by \a c, \a m, \a y, \a k, and \a a, to the @@ -2511,7 +2520,7 @@ QColor QColor::fromHslF(qreal h, qreal s, qreal l, qreal a) \sa setCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ -void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a) +void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a) const { if (!c || !m || !y || !k) return; @@ -2531,6 +2540,16 @@ void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a) } /*! + \obsolete + + Use the \c const overload instead. +*/ +void QColor::getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a) +{ + const_cast<const QColor *>(this)->getCmykF(c, m, y, k, a); +} + +/*! Sets the contents pointed to by \a c, \a m, \a y, \a k, and \a a, to the cyan, magenta, yellow, black, and alpha-channel (transparency) components of the color's CMYK value. @@ -2540,7 +2559,7 @@ void QColor::getCmyk(int *c, int *m, int *y, int *k, int *a) \sa setCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model} */ -void QColor::getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a) +void QColor::getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a) const { if (!c || !m || !y || !k) return; @@ -2689,18 +2708,13 @@ QColor QColor::fromCmykF(qreal c, qreal m, qreal y, qreal k, qreal a) recommend using the darker() function for this purpose. If the \a factor is 0 or negative, the return value is unspecified. - The function converts the current RGB color to HSV, multiplies the value - (V) component by \a factor and converts the color back to RGB. + The function converts the current color to HSV, multiplies the value + (V) component by \a factor and converts the color back to it's original + color spec. \sa darker(), isValid() */ - -/*! - \obsolete - - Use lighter(\a factor) instead. -*/ -QColor QColor::light(int factor) const Q_DECL_NOTHROW +QColor QColor::lighter(int factor) const Q_DECL_NOTHROW { if (factor <= 0) // invalid lightness factor return *this; @@ -2739,18 +2753,13 @@ QColor QColor::light(int factor) const Q_DECL_NOTHROW but we recommend using the lighter() function for this purpose. If the \a factor is 0 or negative, the return value is unspecified. - The function converts the current RGB color to HSV, divides the value (V) - component by \a factor and converts the color back to RGB. + The function converts the current color to HSV, divides the value (V) + component by \a factor and converts the color back to it's original + color spec. \sa lighter(), isValid() */ - -/*! - \obsolete - - Use darker(\a factor) instead. -*/ -QColor QColor::dark(int factor) const Q_DECL_NOTHROW +QColor QColor::darker(int factor) const Q_DECL_NOTHROW { if (factor <= 0) // invalid darkness factor return *this; @@ -2764,6 +2773,28 @@ QColor QColor::dark(int factor) const Q_DECL_NOTHROW return hsv.convertTo(cspec); } +#if QT_DEPRECATED_SINCE(5, 13) +/*! + \obsolete + + Use lighter(\a factor) instead. +*/ +QColor QColor::light(int factor) const Q_DECL_NOTHROW +{ + return lighter(factor); +} + +/*! + \obsolete + + Use darker(\a factor) instead. +*/ +QColor QColor::dark(int factor) const Q_DECL_NOTHROW +{ + return darker(factor); +} +#endif + #if QT_VERSION < QT_VERSION_CHECK(6,0,0) /*! Assigns a copy of \a color to this color, and returns a reference to it. diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index f7a9e9db59..4822612cf8 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -172,10 +172,12 @@ public: qreal yellowF() const Q_DECL_NOTHROW; qreal blackF() const Q_DECL_NOTHROW; - void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr); + void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr); // ### Qt 6: remove + void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr) const; void setCmyk(int c, int m, int y, int k, int a = 255); - void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr); + void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr); // ### Qt 6: remove + void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr) const; void setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a = 1.0); int hslHue() const Q_DECL_NOTHROW; // 0 <= hue < 360 @@ -217,9 +219,13 @@ public: static QColor fromHsl(int h, int s, int l, int a = 255); static QColor fromHslF(qreal h, qreal s, qreal l, qreal a = 1.0); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QColor::lighter() instead") Q_REQUIRED_RESULT QColor light(int f = 150) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT QColor lighter(int f = 150) const Q_DECL_NOTHROW; + QT_DEPRECATED_X("Use QColor::darker() instead") Q_REQUIRED_RESULT QColor dark(int f = 200) const Q_DECL_NOTHROW; +#endif + Q_REQUIRED_RESULT QColor lighter(int f = 150) const Q_DECL_NOTHROW; Q_REQUIRED_RESULT QColor darker(int f = 200) const Q_DECL_NOTHROW; bool operator==(const QColor &c) const Q_DECL_NOTHROW; @@ -306,12 +312,6 @@ inline QColor::QColor(const QColor &acolor) Q_DECL_NOTHROW inline bool QColor::isValid() const Q_DECL_NOTHROW { return cspec != Invalid; } -inline QColor QColor::lighter(int f) const Q_DECL_NOTHROW -{ return light(f); } - -inline QColor QColor::darker(int f) const Q_DECL_NOTHROW -{ return dark(f); } - QT_END_NAMESPACE #endif // QCOLOR_H diff --git a/src/gui/painting/qcompositionfunctions.cpp b/src/gui/painting/qcompositionfunctions.cpp index 027bf23115..5c1afe8425 100644 --- a/src/gui/painting/qcompositionfunctions.cpp +++ b/src/gui/painting/qcompositionfunctions.cpp @@ -1107,7 +1107,7 @@ static inline uint multiply_op_rgb64(uint dst, uint src, uint da, uint sa) } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Multiply_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_Multiply_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -1130,7 +1130,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Multiply_impl(uint *dest, } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Multiply_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_Multiply_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -1169,7 +1169,7 @@ void QT_FASTCALL comp_func_solid_Multiply_rgb64(QRgba64 *dest, int length, QRgba } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Multiply_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Multiply_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -1190,7 +1190,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Multiply_impl(uint *Q_DECL_REST } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Multiply_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Multiply_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -1231,7 +1231,7 @@ void QT_FASTCALL comp_func_Multiply_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const Q = Sca + Dca - Sca.Dca */ template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Screen_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_Screen_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -1254,7 +1254,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Screen_impl(uint *dest, i } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Screen_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_Screen_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -1293,7 +1293,7 @@ void QT_FASTCALL comp_func_solid_Screen_rgb64(QRgba64 *dest, int length, QRgba64 } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Screen_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Screen_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -1314,7 +1314,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Screen_impl(uint *Q_DECL_RESTRI } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Screen_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Screen_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -1375,7 +1375,7 @@ static inline uint overlay_op_rgb64(uint dst, uint src, uint da, uint sa) } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Overlay_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_Overlay_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -1398,7 +1398,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Overlay_impl(uint *dest, } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Overlay_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_Overlay_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -1437,7 +1437,7 @@ void QT_FASTCALL comp_func_solid_Overlay_rgb64(QRgba64 *dest, int length, QRgba6 } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Overlay_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Overlay_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -1458,7 +1458,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Overlay_impl(uint *Q_DECL_RESTR } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Overlay_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Overlay_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -1509,7 +1509,7 @@ static inline uint darken_op_rgb64(uint dst, uint src, uint da, uint sa) } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Darken_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_Darken_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -1532,7 +1532,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Darken_impl(uint *dest, i } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Darken_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_Darken_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -1571,7 +1571,7 @@ void QT_FASTCALL comp_func_solid_Darken_rgb64(QRgba64 *dest, int length, QRgba64 } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Darken_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Darken_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -1592,7 +1592,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Darken_impl(uint *Q_DECL_RESTRI } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Darken_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Darken_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -1643,7 +1643,7 @@ static inline uint lighten_op_rgb64(uint dst, uint src, uint da, uint sa) } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Lighten_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_Lighten_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -1666,7 +1666,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Lighten_impl(uint *dest, } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Lighten_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_Lighten_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -1705,7 +1705,7 @@ void QT_FASTCALL comp_func_solid_Lighten_rgb64(QRgba64 *dest, int length, QRgba6 } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Lighten_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Lighten_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -1726,7 +1726,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Lighten_impl(uint *Q_DECL_RESTR } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Lighten_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Lighten_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -1795,7 +1795,7 @@ static inline uint color_dodge_op_rgb64(qint64 dst, qint64 src, qint64 da, qint6 } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorDodge_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_ColorDodge_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -1818,7 +1818,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorDodge_impl(uint *des } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorDodge_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_ColorDodge_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -1857,7 +1857,7 @@ void QT_FASTCALL comp_func_solid_ColorDodge_rgb64(QRgba64 *dest, int length, QRg } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_ColorDodge_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_ColorDodge_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -1878,7 +1878,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_ColorDodge_impl(uint *Q_DECL_RE } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_ColorDodge_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_ColorDodge_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -1947,7 +1947,7 @@ static inline uint color_burn_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorBurn_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_ColorBurn_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -1970,7 +1970,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorBurn_impl(uint *dest } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_ColorBurn_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_ColorBurn_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -2009,7 +2009,7 @@ void QT_FASTCALL comp_func_solid_ColorBurn_rgb64(QRgba64 *dest, int length, QRgb } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_ColorBurn_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_ColorBurn_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -2030,7 +2030,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_ColorBurn_impl(uint *Q_DECL_RES } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_ColorBurn_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_ColorBurn_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -2093,7 +2093,7 @@ static inline uint hardlight_op_rgb64(uint dst, uint src, uint da, uint sa) } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_HardLight_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_HardLight_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -2116,7 +2116,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_HardLight_impl(uint *dest } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_HardLight_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_HardLight_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -2155,7 +2155,7 @@ void QT_FASTCALL comp_func_solid_HardLight_rgb64(QRgba64 *dest, int length, QRgb } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_HardLight_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_HardLight_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -2176,7 +2176,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_HardLight_impl(uint *Q_DECL_RES } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_HardLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_HardLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -2252,7 +2252,7 @@ static inline uint soft_light_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_SoftLight_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_SoftLight_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -2275,7 +2275,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_SoftLight_impl(uint *dest } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_SoftLight_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_SoftLight_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -2314,7 +2314,7 @@ void QT_FASTCALL comp_func_solid_SoftLight_rgb64(QRgba64 *dest, int length, QRgb } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_SoftLight_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_SoftLight_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -2335,7 +2335,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_SoftLight_impl(uint *Q_DECL_RES } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_SoftLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_SoftLight_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -2386,7 +2386,7 @@ static inline uint difference_op_rgb64(qint64 dst, qint64 src, qint64 da, qint64 } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Difference_impl(uint *dest, int length, uint color, const T &coverage) +static inline void comp_func_solid_Difference_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -2409,7 +2409,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Difference_impl(uint *des } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_solid_Difference_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void comp_func_solid_Difference_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -2448,7 +2448,7 @@ void QT_FASTCALL comp_func_solid_Difference_rgb64(QRgba64 *dest, int length, QRg } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Difference_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Difference_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -2469,7 +2469,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Difference_impl(uint *Q_DECL_RE } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Difference_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Difference_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; @@ -2509,7 +2509,7 @@ void QT_FASTCALL comp_func_Difference_rgb64(QRgba64 *Q_DECL_RESTRICT dest, const Dca' = (Sca.Da + Dca.Sa - 2.Sca.Dca) + Sca.(1 - Da) + Dca.(1 - Sa) */ template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void QT_FASTCALL comp_func_solid_Exclusion_impl(uint *dest, int length, uint color, const T &coverage) +static inline void QT_FASTCALL comp_func_solid_Exclusion_impl(uint *dest, int length, uint color, const T &coverage) { int sa = qAlpha(color); int sr = qRed(color); @@ -2532,7 +2532,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void QT_FASTCALL comp_func_solid_Exclusion_imp } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void QT_FASTCALL comp_func_solid_Exclusion_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) +static inline void QT_FASTCALL comp_func_solid_Exclusion_impl(QRgba64 *dest, int length, QRgba64 color, const T &coverage) { uint sa = color.alpha(); uint sr = color.red(); @@ -2572,7 +2572,7 @@ void QT_FASTCALL comp_func_solid_Exclusion_rgb64(QRgba64 *dest, int length, QRgb } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Exclusion_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Exclusion_impl(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { uint d = dest[i]; @@ -2593,7 +2593,7 @@ Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Exclusion_impl(uint *Q_DECL_RES } template <typename T> -Q_STATIC_TEMPLATE_FUNCTION inline void comp_func_Exclusion_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) +static inline void comp_func_Exclusion_impl(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, const T &coverage) { for (int i = 0; i < length; ++i) { QRgba64 d = dest[i]; diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp index 436a62d486..0fb89a75b5 100644 --- a/src/gui/painting/qcosmeticstroker.cpp +++ b/src/gui/painting/qcosmeticstroker.cpp @@ -289,7 +289,7 @@ void QCosmeticStroker::setup() drawCaps = state->lastPen.capStyle() != Qt::FlatCap; if (strokeSelection & FastDraw) { - color = multiplyAlpha256(state->penData.solid.color, opacity).toArgb32(); + color = multiplyAlpha256(state->penData.solidColor, opacity).toArgb32(); QRasterBuffer *buffer = state->penData.rasterBuffer; pixels = (uint *)buffer->buffer(); ppl = buffer->stride<quint32>(); diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h index 7cac2ac358..28d5f6d6c5 100644 --- a/src/gui/painting/qdatabuffer_p.h +++ b/src/gui/painting/qdatabuffer_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE template <typename Type> class QDataBuffer { - Q_DISABLE_COPY(QDataBuffer) + Q_DISABLE_COPY_MOVE(QDataBuffer) public: QDataBuffer(int res) { diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index ca3590e280..2dd18f6dfc 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2018 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -55,6 +55,7 @@ #endif #include <private/qguiapplication_p.h> #include <private/qrgba64_p.h> +#include <qendian.h> #include <qloggingcategory.h> #include <qmath.h> @@ -856,6 +857,44 @@ static const QRgba64 *QT_FASTCALL fetchGrayscale8ToRGB64(QRgba64 *buffer, const return buffer; } +static void QT_FASTCALL convertGrayscale16ToRGB32(uint *buffer, int count, const QVector<QRgb> *) +{ + for (int i = 0; i < count; ++i) { + const uint x = qt_div_257(buffer[i]); + buffer[i] = qRgb(x, x, x); + } +} + +static const uint *QT_FASTCALL fetchGrayscale16ToRGB32(uint *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + const unsigned short *s = reinterpret_cast<const unsigned short *>(src) + index; + for (int i = 0; i < count; ++i) { + const uint x = qt_div_257(s[i]); + buffer[i] = qRgb(x, x, x); + } + return buffer; +} + +static const QRgba64 *QT_FASTCALL convertGrayscale16ToRGBA64(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + const unsigned short *s = reinterpret_cast<const unsigned short *>(src); + for (int i = 0; i < count; ++i) + buffer[i] = QRgba64::fromRgba64(s[i], s[i], s[i], 65535); + return buffer; +} + +static const QRgba64 *QT_FASTCALL fetchGrayscale16ToRGBA64(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + const unsigned short *s = reinterpret_cast<const unsigned short *>(src) + index; + for (int i = 0; i < count; ++i) { + buffer[i] = QRgba64::fromRgba64(s[i], s[i], s[i], 65535); + } + return buffer; +} + static void QT_FASTCALL storeARGB32FromARGB32PM(uchar *dest, const uint *src, int index, int count, const QVector<QRgb> *, QDitherInfo *) { @@ -1047,18 +1086,8 @@ static const QRgba64 *QT_FASTCALL fetchRGB32ToRGB64(QRgba64 *buffer, const uchar static const QRgba64 *QT_FASTCALL convertARGB32ToRGBA64PM(QRgba64 *buffer, const uint *src, int count, const QVector<QRgb> *, QDitherInfo *) { -#ifdef __SSE2__ - qConvertARGB32PMToRGBA64PM_sse2<false, false>(buffer, src, count); - for (int i = 0; i < count; ++i) - buffer[i] = buffer[i].premultiplied(); -#elif defined(__ARM_NEON__) - qConvertARGB32PMToRGBA64PM_neon<false, false>(buffer, src, count); - for (int i = 0; i < count; ++i) - buffer[i] = buffer[i].premultiplied(); -#else for (int i = 0; i < count; ++i) buffer[i] = QRgba64::fromArgb32(src[i]).premultiplied(); -#endif return buffer; } @@ -1110,18 +1139,8 @@ static const QRgba64 *QT_FASTCALL fetchRGBA64ToRGBA64PM(QRgba64 *buffer, const u static const QRgba64 *QT_FASTCALL convertRGBA8888ToRGBA64PM(QRgba64 *buffer, const uint *src, int count, const QVector<QRgb> *, QDitherInfo *) { -#ifdef __SSE2__ - qConvertARGB32PMToRGBA64PM_sse2<true, false>(buffer, src, count); - for (int i = 0; i < count; ++i) - buffer[i] = buffer[i].premultiplied(); -#elif defined(__ARM_NEON__) - qConvertARGB32PMToRGBA64PM_neon<true, false>(buffer, src, count); - for (int i = 0; i < count; ++i) - buffer[i] = buffer[i].premultiplied(); -#else for (int i = 0; i < count; ++i) buffer[i] = QRgba64::fromArgb32(RGBA2ARGB(src[i])).premultiplied(); -#endif return buffer; } @@ -1361,6 +1380,22 @@ static void QT_FASTCALL storeGrayscale8FromARGB32PM(uchar *dest, const uint *src dest[index + i] = qGray(qUnpremultiply(src[i])); } +static void QT_FASTCALL storeGrayscale16FromRGB32(uchar *dest, const uint *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + unsigned short *d = reinterpret_cast<unsigned short *>(dest) + index; + for (int i = 0; i < count; ++i) + d[i] = qGray(src[i]) * 257; +} + +static void QT_FASTCALL storeGrayscale16FromARGB32PM(uchar *dest, const uint *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + unsigned short *d = reinterpret_cast<unsigned short *>(dest) + index; + for (int i = 0; i < count; ++i) + d[i] = qGray(qUnpremultiply(src[i])) * 257; +} + static const uint *QT_FASTCALL fetchRGB64ToRGB32(uint *buffer, const uchar *src, int index, int count, const QVector<QRgb> *, QDitherInfo *) { @@ -1487,7 +1522,11 @@ QPixelLayout qPixelLayouts[QImage::NImageFormats] = { { true, true, QPixelLayout::BPP64, nullptr, convertPassThrough, nullptr, fetchRGB64ToRGB32, fetchPassThrough64, - storeRGB64FromRGB32, storeRGB64FromRGB32 } // Format_RGBA64_Premultiplied + storeRGB64FromRGB32, storeRGB64FromRGB32 }, // Format_RGBA64_Premultiplied + { false, false, QPixelLayout::BPP16, nullptr, + convertGrayscale16ToRGB32, convertGrayscale16ToRGBA64, + fetchGrayscale16ToRGB32, fetchGrayscale16ToRGBA64, + storeGrayscale16FromARGB32PM, storeGrayscale16FromRGB32 } // Format_Grayscale16 }; Q_STATIC_ASSERT(sizeof(qPixelLayouts) / sizeof(*qPixelLayouts) == QImage::NImageFormats); @@ -1563,6 +1602,16 @@ static void QT_FASTCALL storeRGBA64PMFromRGBA64PM(uchar *dest, const QRgba64 *sr memcpy(d, src, count * sizeof(QRgba64)); } +static void QT_FASTCALL storeGray16FromRGBA64PM(uchar *dest, const QRgba64 *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + quint16 *d = reinterpret_cast<quint16*>(dest) + index; + for (int i = 0; i < count; ++i) { + QRgba64 s = src[i].unpremultiplied(); + d[i] = qGray(s.red(), s.green(), s.blue()); + } +} + ConvertAndStorePixelsFunc64 qStoreFromRGBA64PM[QImage::NImageFormats] = { nullptr, nullptr, @@ -1591,7 +1640,8 @@ ConvertAndStorePixelsFunc64 qStoreFromRGBA64PM[QImage::NImageFormats] = { storeGenericFromRGBA64PM<QImage::Format_Grayscale8>, storeRGBX64FromRGBA64PM, storeRGBA64FromRGBA64PM, - storeRGBA64PMFromRGBA64PM + storeRGBA64PMFromRGBA64PM, + storeGray16FromRGBA64PM }; /* @@ -1695,6 +1745,7 @@ static DestFetchProc destFetchProc[QImage::NImageFormats] = destFetch, // Format_RGBX64 destFetch, // Format_RGBA64 destFetch, // Format_RGBA64_Premultiplied + destFetch, // Format_Grayscale16 }; static DestFetchProc64 destFetchProc64[QImage::NImageFormats] = @@ -1727,6 +1778,7 @@ static DestFetchProc64 destFetchProc64[QImage::NImageFormats] = destFetchRGB64, // Format_RGBX64 destFetch64, // Format_RGBA64 destFetchRGB64, // Format_RGBA64_Premultiplied + destFetch64, // Format_Grayscale16 }; /* @@ -1880,6 +1932,7 @@ static DestStoreProc destStoreProc[QImage::NImageFormats] = destStore, // Format_RGBX64 destStore, // Format_RGBA64 destStore, // Format_RGBA64_Premultiplied + destStore, // Format_Grayscale16 }; static DestStoreProc64 destStoreProc64[QImage::NImageFormats] = @@ -1911,7 +1964,8 @@ static DestStoreProc64 destStoreProc64[QImage::NImageFormats] = destStore64, // Format_Grayscale8 0, // Format_RGBX64 destStore64RGBA64, // Format_RGBA64 - 0 // Format_RGBA64_Premultiplied + 0, // Format_RGBA64_Premultiplied + destStore64, // Format_Grayscale16 }; /* @@ -3838,6 +3892,7 @@ static SourceFetchProc sourceFetchUntransformed[QImage::NImageFormats] = { fetchUntransformed, // RGBX64 fetchUntransformed, // RGBA64 fetchUntransformed, // RGBA64_Premultiplied + fetchUntransformed, // Grayscale16 }; static const SourceFetchProc sourceFetchGeneric[NBlendTypes] = { @@ -4232,7 +4287,7 @@ static inline Operator getOperator(const QSpanData *data, const QSpan *spans, in switch(data->type) { case QSpanData::Solid: - solidSource = data->solid.color.isOpaque(); + solidSource = data->solidColor.isOpaque(); op.srcFetch = 0; op.srcFetch64 = 0; break; @@ -4280,7 +4335,7 @@ static inline Operator getOperator(const QSpanData *data, const QSpan *spans, in } ++spans; } - if (!alphaSpans) { + if (!alphaSpans && spanCount > 0) { // If all spans are opaque we do not need to fetch dest. // But don't clear passthrough destFetch as they are just as fast and save destStore. if (op.destFetch != destFetchARGB32P) @@ -4301,23 +4356,62 @@ static inline Operator getOperator(const QSpanData *data, const QSpan *spans, in return op; } +static void spanfill_from_first(QRasterBuffer *rasterBuffer, QPixelLayout::BPP bpp, int x, int y, int length) +{ + switch (bpp) { + case QPixelLayout::BPP64: { + quint64 *dest = reinterpret_cast<quint64 *>(rasterBuffer->scanLine(y)) + x; + qt_memfill_template(dest + 1, dest[0], length - 1); + break; + } + case QPixelLayout::BPP32: { + quint32 *dest = reinterpret_cast<quint32 *>(rasterBuffer->scanLine(y)) + x; + qt_memfill_template(dest + 1, dest[0], length - 1); + break; + } + case QPixelLayout::BPP24: { + quint24 *dest = reinterpret_cast<quint24 *>(rasterBuffer->scanLine(y)) + x; + qt_memfill_template(dest + 1, dest[0], length - 1); + break; + } + case QPixelLayout::BPP16: { + quint16 *dest = reinterpret_cast<quint16 *>(rasterBuffer->scanLine(y)) + x; + qt_memfill_template(dest + 1, dest[0], length - 1); + break; + } + case QPixelLayout::BPP8: { + uchar *dest = rasterBuffer->scanLine(y) + x; + memset(dest + 1, dest[0], length - 1); + break; + } + default: + Q_UNREACHABLE(); + } +} // -------------------- blend methods --------------------- -#if !defined(Q_CC_SUN) -static -#endif -void blend_color_generic(int count, const QSpan *spans, void *userData) +static void blend_color_generic(int count, const QSpan *spans, void *userData) { QSpanData *data = reinterpret_cast<QSpanData *>(userData); uint buffer[BufferSize]; - Operator op = getOperator(data, spans, count); - const uint color = data->solid.color.toArgb32(); + Operator op = getOperator(data, nullptr, 0); + const uint color = data->solidColor.toArgb32(); + bool solidFill = data->rasterBuffer->compositionMode == QPainter::CompositionMode_Source + || (data->rasterBuffer->compositionMode == QPainter::CompositionMode_SourceOver && qAlpha(color) == 255); + QPixelLayout::BPP bpp = qPixelLayouts[data->rasterBuffer->format].bpp; while (count--) { int x = spans->x; int length = spans->len; + if (solidFill && bpp >= QPixelLayout::BPP8 && spans->coverage == 255 && length) { + // If dest doesn't matter we don't need to bother with blending or converting all the identical pixels + op.destStore(data->rasterBuffer, x, spans->y, &color, 1); + spanfill_from_first(data->rasterBuffer, bpp, x, spans->y, length); + length = 0; + } + while (length) { int l = qMin(BufferSize, length); uint *dest = op.destFetch(buffer, data->rasterBuffer, x, spans->y, l); @@ -4335,15 +4429,15 @@ static void blend_color_argb(int count, const QSpan *spans, void *userData) { QSpanData *data = reinterpret_cast<QSpanData *>(userData); - const Operator op = getOperator(data, spans, count); - const uint color = data->solid.color.toArgb32(); + const Operator op = getOperator(data, nullptr, 0); + const uint color = data->solidColor.toArgb32(); if (op.mode == QPainter::CompositionMode_Source) { // inline for performance while (count--) { uint *target = ((uint *)data->rasterBuffer->scanLine(spans->y)) + spans->x; if (spans->coverage == 255) { - QT_MEMFILL_UINT(target, spans->len, color); + qt_memfill(target, color, spans->len); } else { uint c = BYTE_MUL(color, spans->coverage); int ialpha = 255 - spans->coverage; @@ -4365,29 +4459,26 @@ static void blend_color_argb(int count, const QSpan *spans, void *userData) void blend_color_generic_rgb64(int count, const QSpan *spans, void *userData) { QSpanData *data = reinterpret_cast<QSpanData *>(userData); - Operator op = getOperator(data, spans, count); + Operator op = getOperator(data, nullptr, 0); if (!op.funcSolid64) { qCDebug(lcQtGuiDrawHelper, "blend_color_generic_rgb64: unsupported 64bit blend attempted, falling back to 32-bit"); return blend_color_generic(count, spans, userData); } alignas(8) QRgba64 buffer[BufferSize]; - const QRgba64 color = data->solid.color; + const QRgba64 color = data->solidColor; bool solidFill = data->rasterBuffer->compositionMode == QPainter::CompositionMode_Source || (data->rasterBuffer->compositionMode == QPainter::CompositionMode_SourceOver && color.isOpaque()); - bool isBpp32 = qPixelLayouts[data->rasterBuffer->format].bpp == QPixelLayout::BPP32; + QPixelLayout::BPP bpp = qPixelLayouts[data->rasterBuffer->format].bpp; while (count--) { int x = spans->x; int length = spans->len; - if (solidFill && isBpp32 && spans->coverage == 255) { + if (solidFill && bpp >= QPixelLayout::BPP8 && spans->coverage == 255 && length) { // If dest doesn't matter we don't need to bother with blending or converting all the identical pixels - if (length > 0) { - op.destStore64(data->rasterBuffer, x, spans->y, &color, 1); - uint *dest = (uint*)data->rasterBuffer->scanLine(spans->y) + x; - qt_memfill32(dest + 1, dest[0], length - 1); - length = 0; - } + op.destStore64(data->rasterBuffer, x, spans->y, &color, 1); + spanfill_from_first(data->rasterBuffer, bpp, x, spans->y, length); + length = 0; } while (length) { @@ -4413,16 +4504,16 @@ static void blend_color_rgb16(int count, const QSpan *spans, void *userData) from qt_gradient_quint16 with minimal overhead. */ QPainter::CompositionMode mode = data->rasterBuffer->compositionMode; - if (mode == QPainter::CompositionMode_SourceOver && data->solid.color.isOpaque()) + if (mode == QPainter::CompositionMode_SourceOver && data->solidColor.isOpaque()) mode = QPainter::CompositionMode_Source; if (mode == QPainter::CompositionMode_Source) { // inline for performance - ushort c = data->solid.color.toRgb16(); + ushort c = data->solidColor.toRgb16(); while (count--) { ushort *target = ((ushort *)data->rasterBuffer->scanLine(spans->y)) + spans->x; if (spans->coverage == 255) { - QT_MEMFILL_USHORT(target, spans->len, c); + qt_memfill(target, c, spans->len); } else { ushort color = BYTE_MUL_RGB16(c, spans->coverage); int ialpha = 255 - spans->coverage; @@ -4439,7 +4530,7 @@ static void blend_color_rgb16(int count, const QSpan *spans, void *userData) if (mode == QPainter::CompositionMode_SourceOver) { while (count--) { - uint color = BYTE_MUL(data->solid.color.toArgb32(), spans->coverage); + uint color = BYTE_MUL(data->solidColor.toArgb32(), spans->coverage); int ialpha = qAlpha(~color); ushort c = qConvertRgb32To16(color); ushort *target = ((ushort *)data->rasterBuffer->scanLine(spans->y)) + spans->x; @@ -5216,6 +5307,7 @@ void qBlendTexture(int count, const QSpan *spans, void *userData) case QImage::Format_RGBX64: case QImage::Format_RGBA64: case QImage::Format_RGBA64_Premultiplied: + case QImage::Format_Grayscale16: proc = processTextureSpansGeneric64[blendType]; break; case QImage::Format_Invalid: @@ -5228,7 +5320,111 @@ void qBlendTexture(int count, const QSpan *spans, void *userData) proc(count, spans, userData); } -template <class DST> Q_STATIC_TEMPLATE_FUNCTION +static void blend_vertical_gradient_argb(int count, const QSpan *spans, void *userData) +{ + QSpanData *data = reinterpret_cast<QSpanData *>(userData); + + LinearGradientValues linear; + getLinearGradientValues(&linear, data); + + CompositionFunctionSolid funcSolid = + functionForModeSolid[data->rasterBuffer->compositionMode]; + + /* + The logic for vertical gradient calculations is a mathematically + reduced copy of that in fetchLinearGradient() - which is basically: + + qreal ry = data->m22 * (y + 0.5) + data->dy; + qreal t = linear.dy*ry + linear.off; + t *= (GRADIENT_STOPTABLE_SIZE - 1); + quint32 color = + qt_gradient_pixel_fixed(&data->gradient, + int(t * FIXPT_SIZE)); + + This has then been converted to fixed point to improve performance. + */ + const int gss = GRADIENT_STOPTABLE_SIZE - 1; + int yinc = int((linear.dy * data->m22 * gss) * FIXPT_SIZE); + int off = int((((linear.dy * (data->m22 * qreal(0.5) + data->dy) + linear.off) * gss) * FIXPT_SIZE)); + + while (count--) { + int y = spans->y; + int x = spans->x; + + quint32 *dst = (quint32 *)(data->rasterBuffer->scanLine(y)) + x; + quint32 color = + qt_gradient_pixel_fixed(&data->gradient, yinc * y + off); + + funcSolid(dst, spans->len, color, spans->coverage); + ++spans; + } +} + +template<ProcessSpans blend_color> +static void blend_vertical_gradient(int count, const QSpan *spans, void *userData) +{ + QSpanData *data = reinterpret_cast<QSpanData *>(userData); + + LinearGradientValues linear; + getLinearGradientValues(&linear, data); + + // Based on the same logic as blend_vertical_gradient_argb. + + const int gss = GRADIENT_STOPTABLE_SIZE - 1; + int yinc = int((linear.dy * data->m22 * gss) * FIXPT_SIZE); + int off = int((((linear.dy * (data->m22 * qreal(0.5) + data->dy) + linear.off) * gss) * FIXPT_SIZE)); + + while (count--) { + int y = spans->y; + + data->solidColor = qt_gradient_pixel64_fixed(&data->gradient, yinc * y + off); + blend_color(1, spans, userData); + ++spans; + } +} + +void qBlendGradient(int count, const QSpan *spans, void *userData) +{ + QSpanData *data = reinterpret_cast<QSpanData *>(userData); + bool isVerticalGradient = + data->txop <= QTransform::TxScale && + data->type == QSpanData::LinearGradient && + data->gradient.linear.end.x == data->gradient.linear.origin.x; + switch (data->rasterBuffer->format) { + case QImage::Format_RGB16: + if (isVerticalGradient) + return blend_vertical_gradient<blend_color_rgb16>(count, spans, userData); + return blend_src_generic(count, spans, userData); + case QImage::Format_RGB32: + case QImage::Format_ARGB32_Premultiplied: + if (isVerticalGradient) + return blend_vertical_gradient_argb(count, spans, userData); + return blend_src_generic(count, spans, userData); +#if defined(__SSE2__) || defined(__ARM_NEON__) || (Q_PROCESSOR_WORDSIZE == 8) + case QImage::Format_ARGB32: + case QImage::Format_RGBA8888: +#endif + case QImage::Format_BGR30: + case QImage::Format_A2BGR30_Premultiplied: + case QImage::Format_RGB30: + case QImage::Format_A2RGB30_Premultiplied: + case QImage::Format_RGBX64: + case QImage::Format_RGBA64: + case QImage::Format_RGBA64_Premultiplied: + if (isVerticalGradient) + return blend_vertical_gradient<blend_color_generic_rgb64>(count, spans, userData); + return blend_src_generic_rgb64(count, spans, userData); + case QImage::Format_Invalid: + break; + default: + if (isVerticalGradient) + return blend_vertical_gradient<blend_color_generic>(count, spans, userData); + return blend_src_generic(count, spans, userData); + } + Q_UNREACHABLE(); +} + +template <class DST> static inline void qt_bitmapblit_template(QRasterBuffer *rasterBuffer, int x, int y, DST color, const uchar *map, @@ -5290,103 +5486,6 @@ inline void qt_bitmapblit_template(QRasterBuffer *rasterBuffer, } } -static void qt_gradient_argb32(int count, const QSpan *spans, void *userData) -{ - QSpanData *data = reinterpret_cast<QSpanData *>(userData); - - bool isVerticalGradient = - data->txop <= QTransform::TxScale && - data->type == QSpanData::LinearGradient && - data->gradient.linear.end.x == data->gradient.linear.origin.x; - - if (isVerticalGradient) { - LinearGradientValues linear; - getLinearGradientValues(&linear, data); - - CompositionFunctionSolid funcSolid = - functionForModeSolid[data->rasterBuffer->compositionMode]; - - /* - The logic for vertical gradient calculations is a mathematically - reduced copy of that in fetchLinearGradient() - which is basically: - - qreal ry = data->m22 * (y + 0.5) + data->dy; - qreal t = linear.dy*ry + linear.off; - t *= (GRADIENT_STOPTABLE_SIZE - 1); - quint32 color = - qt_gradient_pixel_fixed(&data->gradient, - int(t * FIXPT_SIZE)); - - This has then been converted to fixed point to improve performance. - */ - const int gss = GRADIENT_STOPTABLE_SIZE - 1; - int yinc = int((linear.dy * data->m22 * gss) * FIXPT_SIZE); - int off = int((((linear.dy * (data->m22 * qreal(0.5) + data->dy) + linear.off) * gss) * FIXPT_SIZE)); - - while (count--) { - int y = spans->y; - int x = spans->x; - - quint32 *dst = (quint32 *)(data->rasterBuffer->scanLine(y)) + x; - quint32 color = - qt_gradient_pixel_fixed(&data->gradient, yinc * y + off); - - funcSolid(dst, spans->len, color, spans->coverage); - ++spans; - } - - } else { - blend_src_generic(count, spans, userData); - } -} - -static void qt_gradient_quint16(int count, const QSpan *spans, void *userData) -{ - QSpanData *data = reinterpret_cast<QSpanData *>(userData); - - bool isVerticalGradient = - data->txop <= QTransform::TxScale && - data->type == QSpanData::LinearGradient && - data->gradient.linear.end.x == data->gradient.linear.origin.x; - - if (isVerticalGradient) { - - LinearGradientValues linear; - getLinearGradientValues(&linear, data); - - /* - The logic for vertical gradient calculations is a mathematically - reduced copy of that in fetchLinearGradient() - which is basically: - - qreal ry = data->m22 * (y + 0.5) + data->dy; - qreal t = linear.dy*ry + linear.off; - t *= (GRADIENT_STOPTABLE_SIZE - 1); - quint32 color = - qt_gradient_pixel_fixed(&data->gradient, - int(t * FIXPT_SIZE)); - - This has then been converted to fixed point to improve performance. - */ - const int gss = GRADIENT_STOPTABLE_SIZE - 1; - int yinc = int((linear.dy * data->m22 * gss) * FIXPT_SIZE); - int off = int((((linear.dy * (data->m22 * qreal(0.5) + data->dy) + linear.off) * gss) * FIXPT_SIZE)); - - // Save the fillData since we overwrite it when setting solid.color. - QGradientData gradient = data->gradient; - while (count--) { - int y = spans->y; - - data->solid.color = QRgba64::fromArgb32(qt_gradient_pixel_fixed(&gradient, yinc * y + off)); - blend_color_rgb16(1, spans, userData); - ++spans; - } - data->gradient = gradient; - - } else { - blend_src_generic(count, spans, userData); - } -} - inline static void qt_bitmapblit_argb32(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 &color, const uchar *map, @@ -6007,29 +6106,25 @@ static void qt_rectfill_quint64(QRasterBuffer *rasterBuffer, DrawHelper qDrawHelper[QImage::NImageFormats] = { // Format_Invalid, - { 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, // Format_Mono, { blend_color_generic, - blend_src_generic, 0, 0, 0, 0 }, // Format_MonoLSB, { blend_color_generic, - blend_src_generic, 0, 0, 0, 0 }, // Format_Indexed8, { blend_color_generic, - blend_src_generic, 0, 0, 0, 0 }, // Format_RGB32, { blend_color_argb, - qt_gradient_argb32, qt_bitmapblit_argb32, qt_alphamapblit_argb32, qt_alphargbblit_argb32, @@ -6038,7 +6133,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_ARGB32, { blend_color_generic, - blend_src_generic, qt_bitmapblit_argb32, qt_alphamapblit_argb32, qt_alphargbblit_argb32, @@ -6047,7 +6141,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_ARGB32_Premultiplied { blend_color_argb, - qt_gradient_argb32, qt_bitmapblit_argb32, qt_alphamapblit_argb32, qt_alphargbblit_argb32, @@ -6056,7 +6149,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGB16 { blend_color_rgb16, - qt_gradient_quint16, qt_bitmapblit_quint16, qt_alphamapblit_quint16, qt_alphargbblit_generic, @@ -6065,7 +6157,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_ARGB8565_Premultiplied { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6074,7 +6165,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGB666 { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6083,7 +6173,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_ARGB6666_Premultiplied { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6092,7 +6181,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGB555 { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6101,7 +6189,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_ARGB8555_Premultiplied { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6110,7 +6197,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGB888 { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6119,7 +6205,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGB444 { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6128,7 +6213,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_ARGB4444_Premultiplied { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6137,7 +6221,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGBX8888 { blend_color_generic, - blend_src_generic, qt_bitmapblit_rgba8888, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6146,7 +6229,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGBA8888 { blend_color_generic, - blend_src_generic, qt_bitmapblit_rgba8888, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6155,7 +6237,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGB8888_Premultiplied { blend_color_generic, - blend_src_generic, qt_bitmapblit_rgba8888, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6164,7 +6245,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_BGR30 { blend_color_generic_rgb64, - blend_src_generic_rgb64, qt_bitmapblit_rgb30<PixelOrderBGR>, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6173,7 +6253,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_A2BGR30_Premultiplied { blend_color_generic_rgb64, - blend_src_generic_rgb64, qt_bitmapblit_rgb30<PixelOrderBGR>, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6182,7 +6261,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGB30 { blend_color_generic_rgb64, - blend_src_generic_rgb64, qt_bitmapblit_rgb30<PixelOrderRGB>, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6191,7 +6269,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_A2RGB30_Premultiplied { blend_color_generic_rgb64, - blend_src_generic_rgb64, qt_bitmapblit_rgb30<PixelOrderRGB>, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6200,7 +6277,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_Alpha8 { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6209,7 +6285,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_Grayscale8 { blend_color_generic, - blend_src_generic, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6218,7 +6293,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGBX64 { blend_color_generic_rgb64, - blend_src_generic_rgb64, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6227,7 +6301,6 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGBA64 { blend_color_generic_rgb64, - blend_src_generic_rgb64, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, @@ -6236,82 +6309,98 @@ DrawHelper qDrawHelper[QImage::NImageFormats] = // Format_RGBA64_Premultiplied { blend_color_generic_rgb64, - blend_src_generic_rgb64, 0, qt_alphamapblit_generic, qt_alphargbblit_generic, qt_rectfill_quint64 }, + // Format_Grayscale16 + { + blend_color_generic_rgb64, + 0, + qt_alphamapblit_generic, + qt_alphargbblit_generic, + qt_rectfill_quint16 + }, }; -#if defined(Q_CC_MSVC) && !defined(_MIPS_) -template <class T> -inline void qt_memfill_template(T *dest, T color, int count) +#if !defined(__SSE2__) +void qt_memfill64(quint64 *dest, quint64 color, qsizetype count) { - while (count--) - *dest++ = color; + qt_memfill_template<quint64>(dest, color, count); } +#endif -#else - -template <class T> -inline void qt_memfill_template(T *dest, T color, int count) +#if defined(QT_COMPILER_SUPPORTS_SSSE3) && defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) +__attribute__((optimize("no-tree-vectorize"))) +#endif +void qt_memfill24(quint24 *dest, quint24 color, qsizetype count) { - int n = (count + 7) / 8; - switch (count & 0x07) - { - case 0: do { *dest++ = color; Q_FALLTHROUGH(); - case 7: *dest++ = color; Q_FALLTHROUGH(); - case 6: *dest++ = color; Q_FALLTHROUGH(); - case 5: *dest++ = color; Q_FALLTHROUGH(); - case 4: *dest++ = color; Q_FALLTHROUGH(); - case 3: *dest++ = color; Q_FALLTHROUGH(); - case 2: *dest++ = color; Q_FALLTHROUGH(); - case 1: *dest++ = color; - } while (--n > 0); - } -} +# ifdef QT_COMPILER_SUPPORTS_SSSE3 + extern void qt_memfill24_ssse3(quint24 *, quint24, qsizetype); + if (qCpuHasFeature(SSSE3)) + return qt_memfill24_ssse3(dest, color, count); +# endif -template <> -inline void qt_memfill_template(quint16 *dest, quint16 value, int count) -{ - if (count < 3) { - switch (count) { - case 2: *dest++ = value; Q_FALLTHROUGH(); - case 1: *dest = value; - } + const quint32 v = color; + quint24 *end = dest + count; + + // prolog: align dest to 32bit + while ((quintptr(dest) & 0x3) && dest < end) { + *dest++ = v; + } + if (dest >= end) return; + + const uint val1 = qFromBigEndian((v << 8) | (v >> 16)); + const uint val2 = qFromBigEndian((v << 16) | (v >> 8)); + const uint val3 = qFromBigEndian((v << 24) | (v >> 0)); + + for ( ; dest <= (end - 4); dest += 4) { + quint32 *dst = reinterpret_cast<quint32 *>(dest); + dst[0] = val1; + dst[1] = val2; + dst[2] = val3; } - const int align = (quintptr)(dest) & 0x3; - switch (align) { - case 2: *dest++ = value; --count; + // less than 4px left + switch (end - dest) { + case 3: + *dest++ = v; + Q_FALLTHROUGH(); + case 2: + *dest++ = v; + Q_FALLTHROUGH(); + case 1: + *dest++ = v; + } +} + +void qt_memfill16(quint16 *dest, quint16 value, qsizetype count) +{ + const int align = quintptr(dest) & 0x3; + if (align) { + *dest++ = value; + --count; } - const quint32 value32 = (value << 16) | value; - qt_memfill(reinterpret_cast<quint32*>(dest), value32, count / 2); if (count & 0x1) dest[count - 1] = value; -} -#endif -void qt_memfill64(quint64 *dest, quint64 color, int count) -{ - qt_memfill_template<quint64>(dest, color, count); + const quint32 value32 = (value << 16) | value; + qt_memfill32(reinterpret_cast<quint32*>(dest), value32, count / 2); } -#if !defined(__SSE2__) -void qt_memfill16(quint16 *dest, quint16 color, int count) -{ - qt_memfill_template<quint16>(dest, color, count); -} -#endif #if !defined(__SSE2__) && !defined(__ARM_NEON__) && !defined(__MIPS_DSP__) -void qt_memfill32(quint32 *dest, quint32 color, int count) +void qt_memfill32(quint32 *dest, quint32 color, qsizetype count) { qt_memfill_template<quint32>(dest, color, count); } #endif +#ifdef __SSE2__ +decltype(qt_memfill32_sse2) *qt_memfill32 = nullptr; +decltype(qt_memfill64_sse2) *qt_memfill64 = nullptr; +#endif #ifdef QT_COMPILER_SUPPORTS_SSE4_1 template<QtPixelOrder> void QT_FASTCALL storeA2RGB30PMFromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count, const QVector<QRgb> *, QDitherInfo *); @@ -6325,6 +6414,10 @@ static void qInitDrawhelperFunctions() qInitBlendFunctions(); #ifdef __SSE2__ +# ifndef __AVX2__ + qt_memfill32 = qt_memfill32_sse2; + qt_memfill64 = qt_memfill64_sse2; +# endif qDrawHelper[QImage::Format_RGB32].bitmapBlit = qt_bitmapblit32_sse2; qDrawHelper[QImage::Format_ARGB32].bitmapBlit = qt_bitmapblit32_sse2; qDrawHelper[QImage::Format_ARGB32_Premultiplied].bitmapBlit = qt_bitmapblit32_sse2; @@ -6401,6 +6494,14 @@ static void qInitDrawhelperFunctions() const QVector<QRgb> *, QDitherInfo *); extern const uint *QT_FASTCALL fetchRGBA8888ToARGB32PM_sse4(uint *buffer, const uchar *src, int index, int count, const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 * QT_FASTCALL convertARGB32ToRGBA64PM_sse4(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 * QT_FASTCALL convertRGBA8888ToRGBA64PM_sse4(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 *QT_FASTCALL fetchARGB32ToRGBA64PM_sse4(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 *QT_FASTCALL fetchRGBA8888ToRGBA64PM_sse4(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *); extern void QT_FASTCALL storeARGB32FromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count, const QVector<QRgb> *, QDitherInfo *); extern void QT_FASTCALL storeRGBA8888FromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count, @@ -6413,10 +6514,18 @@ static void qInitDrawhelperFunctions() const QVector<QRgb> *, QDitherInfo *); extern void QT_FASTCALL destStore64ARGB32_sse4(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length); extern void QT_FASTCALL destStore64RGBA8888_sse4(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 *buffer, int length); +# ifndef __AVX2__ qPixelLayouts[QImage::Format_ARGB32].fetchToARGB32PM = fetchARGB32ToARGB32PM_sse4; qPixelLayouts[QImage::Format_ARGB32].convertToARGB32PM = convertARGB32ToARGB32PM_sse4; qPixelLayouts[QImage::Format_RGBA8888].fetchToARGB32PM = fetchRGBA8888ToARGB32PM_sse4; qPixelLayouts[QImage::Format_RGBA8888].convertToARGB32PM = convertRGBA8888ToARGB32PM_sse4; + qPixelLayouts[QImage::Format_ARGB32].fetchToRGBA64PM = fetchARGB32ToRGBA64PM_sse4; + qPixelLayouts[QImage::Format_ARGB32].convertToRGBA64PM = convertARGB32ToRGBA64PM_sse4; + qPixelLayouts[QImage::Format_RGBA8888].fetchToRGBA64PM = fetchRGBA8888ToRGBA64PM_sse4; + qPixelLayouts[QImage::Format_RGBA8888].convertToRGBA64PM = convertRGBA8888ToRGBA64PM_sse4; + qPixelLayouts[QImage::Format_RGBX8888].fetchToRGBA64PM = fetchRGBA8888ToRGBA64PM_sse4; + qPixelLayouts[QImage::Format_RGBX8888].convertToRGBA64PM = convertRGBA8888ToRGBA64PM_sse4; +# endif qPixelLayouts[QImage::Format_ARGB32].storeFromARGB32PM = storeARGB32FromARGB32PM_sse4; qPixelLayouts[QImage::Format_RGBA8888].storeFromARGB32PM = storeRGBA8888FromARGB32PM_sse4; qPixelLayouts[QImage::Format_RGBX8888].storeFromARGB32PM = storeRGBXFromARGB32PM_sse4; @@ -6431,6 +6540,8 @@ static void qInitDrawhelperFunctions() #if defined(QT_COMPILER_SUPPORTS_AVX2) if (qCpuHasFeature(ArchHaswell)) { + qt_memfill32 = qt_memfill32_avx2; + qt_memfill64 = qt_memfill64_avx2; extern void qt_blend_rgb32_on_rgb32_avx2(uchar *destPixels, int dbpl, const uchar *srcPixels, int sbpl, int w, int h, int const_alpha); @@ -6470,6 +6581,26 @@ static void qInitDrawhelperFunctions() bilinearFastTransformHelperARGB32PM[0][SimpleScaleTransform] = fetchTransformedBilinearARGB32PM_simple_scale_helper_avx2; bilinearFastTransformHelperARGB32PM[0][DownscaleTransform] = fetchTransformedBilinearARGB32PM_downscale_helper_avx2; bilinearFastTransformHelperARGB32PM[0][FastRotateTransform] = fetchTransformedBilinearARGB32PM_fast_rotate_helper_avx2; + + extern void QT_FASTCALL convertARGB32ToARGB32PM_avx2(uint *buffer, int count, const QVector<QRgb> *); + extern void QT_FASTCALL convertRGBA8888ToARGB32PM_avx2(uint *buffer, int count, const QVector<QRgb> *); + extern const uint *QT_FASTCALL fetchARGB32ToARGB32PM_avx2(uint *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *); + extern const uint *QT_FASTCALL fetchRGBA8888ToARGB32PM_avx2(uint *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *); + qPixelLayouts[QImage::Format_ARGB32].fetchToARGB32PM = fetchARGB32ToARGB32PM_avx2; + qPixelLayouts[QImage::Format_ARGB32].convertToARGB32PM = convertARGB32ToARGB32PM_avx2; + qPixelLayouts[QImage::Format_RGBA8888].fetchToARGB32PM = fetchRGBA8888ToARGB32PM_avx2; + qPixelLayouts[QImage::Format_RGBA8888].convertToARGB32PM = convertRGBA8888ToARGB32PM_avx2; + + extern const QRgba64 * QT_FASTCALL convertARGB32ToRGBA64PM_avx2(QRgba64 *, const uint *, int, const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 * QT_FASTCALL convertRGBA8888ToRGBA64PM_avx2(QRgba64 *, const uint *, int count, const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 *QT_FASTCALL fetchARGB32ToRGBA64PM_avx2(QRgba64 *, const uchar *, int, int, const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 *QT_FASTCALL fetchRGBA8888ToRGBA64PM_avx2(QRgba64 *, const uchar *, int, int, const QVector<QRgb> *, QDitherInfo *); + qPixelLayouts[QImage::Format_ARGB32].convertToRGBA64PM = convertARGB32ToRGBA64PM_avx2; + qPixelLayouts[QImage::Format_RGBX8888].convertToRGBA64PM = convertRGBA8888ToRGBA64PM_avx2; + qPixelLayouts[QImage::Format_ARGB32].fetchToRGBA64PM = fetchARGB32ToRGBA64PM_avx2; + qPixelLayouts[QImage::Format_RGBX8888].fetchToRGBA64PM = fetchRGBA8888ToRGBA64PM_avx2; } #endif @@ -6505,6 +6636,14 @@ static void qInitDrawhelperFunctions() const QVector<QRgb> *, QDitherInfo *); extern const uint *QT_FASTCALL fetchRGBA8888ToARGB32PM_neon(uint *buffer, const uchar *src, int index, int count, const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 * QT_FASTCALL convertARGB32ToRGBA64PM_neon(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 * QT_FASTCALL convertRGBA8888ToRGBA64PM_neon(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 *QT_FASTCALL fetchARGB32ToRGBA64PM_neon(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *); + extern const QRgba64 *QT_FASTCALL fetchRGBA8888ToRGBA64PM_neon(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *); extern void QT_FASTCALL storeARGB32FromARGB32PM_neon(uchar *dest, const uint *src, int index, int count, const QVector<QRgb> *, QDitherInfo *); extern void QT_FASTCALL storeRGBA8888FromARGB32PM_neon(uchar *dest, const uint *src, int index, int count, @@ -6514,10 +6653,16 @@ static void qInitDrawhelperFunctions() qPixelLayouts[QImage::Format_ARGB32].fetchToARGB32PM = fetchARGB32ToARGB32PM_neon; qPixelLayouts[QImage::Format_ARGB32].convertToARGB32PM = convertARGB32ToARGB32PM_neon; qPixelLayouts[QImage::Format_ARGB32].storeFromARGB32PM = storeARGB32FromARGB32PM_neon; + qPixelLayouts[QImage::Format_ARGB32].fetchToRGBA64PM = fetchARGB32ToRGBA64PM_neon; + qPixelLayouts[QImage::Format_ARGB32].convertToRGBA64PM = convertARGB32ToRGBA64PM_neon; qPixelLayouts[QImage::Format_RGBA8888].fetchToARGB32PM = fetchRGBA8888ToARGB32PM_neon; qPixelLayouts[QImage::Format_RGBA8888].convertToARGB32PM = convertRGBA8888ToARGB32PM_neon; qPixelLayouts[QImage::Format_RGBA8888].storeFromARGB32PM = storeRGBA8888FromARGB32PM_neon; + qPixelLayouts[QImage::Format_RGBA8888].fetchToRGBA64PM = fetchRGBA8888ToRGBA64PM_neon; + qPixelLayouts[QImage::Format_RGBA8888].convertToRGBA64PM = convertRGBA8888ToRGBA64PM_neon; qPixelLayouts[QImage::Format_RGBX8888].storeFromARGB32PM = storeRGBXFromARGB32PM_neon; + qPixelLayouts[QImage::Format_RGBX8888].fetchToRGBA64PM = fetchRGBA8888ToRGBA64PM_neon; + qPixelLayouts[QImage::Format_RGBX8888].convertToRGBA64PM = convertRGBA8888ToRGBA64PM_neon; #endif #if defined(ENABLE_PIXMAN_DRAWHELPERS) diff --git a/src/gui/painting/qdrawhelper_avx2.cpp b/src/gui/painting/qdrawhelper_avx2.cpp index ec6643deed..2b3cc9b226 100644 --- a/src/gui/painting/qdrawhelper_avx2.cpp +++ b/src/gui/painting/qdrawhelper_avx2.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -38,6 +39,7 @@ ****************************************************************************/ #include "qdrawhelper_p.h" +#include "qdrawhelper_x86_p.h" #include "qdrawingprimitive_sse2_p.h" #include "qrgba64_p.h" @@ -53,7 +55,8 @@ enum { // Vectorized blend functions: // See BYTE_MUL_SSE2 for details. -inline static void BYTE_MUL_AVX2(__m256i &pixelVector, const __m256i &alphaChannel, const __m256i &colorMask, const __m256i &half) +inline static void Q_DECL_VECTORCALL +BYTE_MUL_AVX2(__m256i &pixelVector, __m256i alphaChannel, __m256i colorMask, __m256i half) { __m256i pixelVectorAG = _mm256_srli_epi16(pixelVector, 8); __m256i pixelVectorRB = _mm256_and_si256(pixelVector, colorMask); @@ -72,7 +75,8 @@ inline static void BYTE_MUL_AVX2(__m256i &pixelVector, const __m256i &alphaChann pixelVector = _mm256_or_si256(pixelVectorAG, pixelVectorRB); } -inline static void BYTE_MUL_RGB64_AVX2(__m256i &pixelVector, const __m256i &alphaChannel, const __m256i &colorMask, const __m256i &half) +inline static void Q_DECL_VECTORCALL +BYTE_MUL_RGB64_AVX2(__m256i &pixelVector, __m256i alphaChannel, __m256i colorMask, __m256i half) { __m256i pixelVectorAG = _mm256_srli_epi32(pixelVector, 16); __m256i pixelVectorRB = _mm256_and_si256(pixelVector, colorMask); @@ -92,7 +96,8 @@ inline static void BYTE_MUL_RGB64_AVX2(__m256i &pixelVector, const __m256i &alph } // See INTERPOLATE_PIXEL_255_SSE2 for details. -inline static void INTERPOLATE_PIXEL_255_AVX2(const __m256i &srcVector, __m256i &dstVector, const __m256i &alphaChannel, const __m256i &oneMinusAlphaChannel, const __m256i &colorMask, const __m256i &half) +inline static void Q_DECL_VECTORCALL +INTERPOLATE_PIXEL_255_AVX2(__m256i srcVector, __m256i &dstVector, __m256i alphaChannel, __m256i oneMinusAlphaChannel, __m256i colorMask, __m256i half) { const __m256i srcVectorAG = _mm256_srli_epi16(srcVector, 8); const __m256i dstVectorAG = _mm256_srli_epi16(dstVector, 8); @@ -114,7 +119,8 @@ inline static void INTERPOLATE_PIXEL_255_AVX2(const __m256i &srcVector, __m256i dstVector = _mm256_or_si256(finalAG, finalRB); } -inline static void INTERPOLATE_PIXEL_RGB64_AVX2(const __m256i &srcVector, __m256i &dstVector, const __m256i &alphaChannel, const __m256i &oneMinusAlphaChannel, const __m256i &colorMask, const __m256i &half) +inline static void Q_DECL_VECTORCALL +INTERPOLATE_PIXEL_RGB64_AVX2(__m256i srcVector, __m256i &dstVector, __m256i alphaChannel, __m256i oneMinusAlphaChannel, __m256i colorMask, __m256i half) { const __m256i srcVectorAG = _mm256_srli_epi32(srcVector, 16); const __m256i dstVectorAG = _mm256_srli_epi32(dstVector, 16); @@ -138,7 +144,7 @@ inline static void INTERPOLATE_PIXEL_RGB64_AVX2(const __m256i &srcVector, __m256 // See BLEND_SOURCE_OVER_ARGB32_SSE2 for details. -inline static void BLEND_SOURCE_OVER_ARGB32_AVX2(quint32 *dst, const quint32 *src, const int length) +inline static void Q_DECL_VECTORCALL BLEND_SOURCE_OVER_ARGB32_AVX2(quint32 *dst, const quint32 *src, const int length) { const __m256i half = _mm256_set1_epi16(0x80); const __m256i one = _mm256_set1_epi16(0xff); @@ -209,7 +215,8 @@ inline static void BLEND_SOURCE_OVER_ARGB32_AVX2(quint32 *dst, const quint32 *sr // See BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2 for details. -inline static void BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_AVX2(quint32 *dst, const quint32 *src, const int length, const int const_alpha) +inline static void Q_DECL_VECTORCALL +BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_AVX2(quint32 *dst, const quint32 *src, const int length, const int const_alpha) { int x = 0; @@ -316,6 +323,66 @@ void qt_blend_rgb32_on_rgb32_avx2(uchar *destPixels, int dbpl, } } +static Q_NEVER_INLINE +void Q_DECL_VECTORCALL qt_memfillXX_avx2(uchar *dest, __m256i value256, qsizetype bytes) +{ + __m128i value128 = _mm256_castsi256_si128(value256); + + // main body + __m256i *dst256 = reinterpret_cast<__m256i *>(dest); + uchar *end = dest + bytes; + while (reinterpret_cast<uchar *>(dst256 + 4) <= end) { + _mm256_storeu_si256(dst256 + 0, value256); + _mm256_storeu_si256(dst256 + 1, value256); + _mm256_storeu_si256(dst256 + 2, value256); + _mm256_storeu_si256(dst256 + 3, value256); + dst256 += 4; + } + + // first epilogue: fewer than 128 bytes / 32 entries + bytes = end - reinterpret_cast<uchar *>(dst256); + switch (bytes / sizeof(value256)) { + case 3: _mm256_storeu_si256(dst256++, value256); Q_FALLTHROUGH(); + case 2: _mm256_storeu_si256(dst256++, value256); Q_FALLTHROUGH(); + case 1: _mm256_storeu_si256(dst256++, value256); + } + + // second epilogue: fewer than 32 bytes + __m128i *dst128 = reinterpret_cast<__m128i *>(dst256); + if (bytes & sizeof(value128)) + _mm_storeu_si128(dst128++, value128); + + // third epilogue: fewer than 16 bytes + if (bytes & 8) + _mm_storel_epi64(reinterpret_cast<__m128i *>(end - 8), value128); +} + +void qt_memfill64_avx2(quint64 *dest, quint64 value, qsizetype count) +{ +#if defined(Q_CC_GNU) && !defined(Q_CC_CLANG) && !defined(Q_CC_INTEL) + // work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80820 + __m128i value64 = _mm_set_epi64x(0, value); // _mm_cvtsi64_si128(value); +# ifdef Q_PROCESSOR_X86_64 + asm ("" : "+x" (value64)); +# endif + __m256i value256 = _mm256_broadcastq_epi64(value64); +#else + __m256i value256 = _mm256_set1_epi64x(value); +#endif + + qt_memfillXX_avx2(reinterpret_cast<uchar *>(dest), value256, count * sizeof(quint64)); +} + +void qt_memfill32_avx2(quint32 *dest, quint32 value, qsizetype count) +{ + if (count % 2) { + // odd number of pixels, round to even + *dest++ = value; + --count; + } + qt_memfillXX_avx2(reinterpret_cast<uchar *>(dest), _mm256_set1_epi32(value), count * sizeof(quint32)); +} + void QT_FASTCALL comp_func_SourceOver_avx2(uint *destPixels, const uint *srcPixels, int length, uint const_alpha) { Q_ASSERT(const_alpha < 256); @@ -928,6 +995,233 @@ void QT_FASTCALL fetchTransformedBilinearARGB32PM_fast_rotate_helper_avx2(uint * } } +static inline __m256i epilogueMaskFromCount(qsizetype count) +{ + Q_ASSERT(count > 0); + static const __m256i offsetMask = _mm256_setr_epi32(0, 1, 2, 3, 4, 5, 6, 7); + return _mm256_add_epi32(offsetMask, _mm256_set1_epi32(-count)); +} + +template<bool RGBA> +static void convertARGBToARGB32PM_avx2(uint *buffer, const uint *src, qsizetype count) +{ + qsizetype i = 0; + const __m256i alphaMask = _mm256_set1_epi32(0xff000000); + const __m256i rgbaMask = _mm256_broadcastsi128_si256(_mm_setr_epi8(2, 1, 0, 3, 6, 5, 4, 7, 10, 9, 8, 11, 14, 13, 12, 15)); + const __m256i shuffleMask = _mm256_broadcastsi128_si256(_mm_setr_epi8(6, 7, 6, 7, 6, 7, 6, 7, 14, 15, 14, 15, 14, 15, 14, 15)); + const __m256i half = _mm256_set1_epi16(0x0080); + const __m256i zero = _mm256_setzero_si256(); + + for (; i < count - 7; i += 8) { + __m256i srcVector = _mm256_loadu_si256(reinterpret_cast<const __m256i *>(src + i)); + if (!_mm256_testz_si256(srcVector, alphaMask)) { + // keep the two _mm_test[zc]_siXXX next to each other + bool cf = _mm256_testc_si256(srcVector, alphaMask); + if (RGBA) + srcVector = _mm256_shuffle_epi8(srcVector, rgbaMask); + if (!cf) { + __m256i src1 = _mm256_unpacklo_epi8(srcVector, zero); + __m256i src2 = _mm256_unpackhi_epi8(srcVector, zero); + __m256i alpha1 = _mm256_shuffle_epi8(src1, shuffleMask); + __m256i alpha2 = _mm256_shuffle_epi8(src2, shuffleMask); + src1 = _mm256_mullo_epi16(src1, alpha1); + src2 = _mm256_mullo_epi16(src2, alpha2); + src1 = _mm256_add_epi16(src1, _mm256_srli_epi16(src1, 8)); + src2 = _mm256_add_epi16(src2, _mm256_srli_epi16(src2, 8)); + src1 = _mm256_add_epi16(src1, half); + src2 = _mm256_add_epi16(src2, half); + src1 = _mm256_srli_epi16(src1, 8); + src2 = _mm256_srli_epi16(src2, 8); + src1 = _mm256_blend_epi16(src1, alpha1, 0x88); + src2 = _mm256_blend_epi16(src2, alpha2, 0x88); + srcVector = _mm256_packus_epi16(src1, src2); + _mm256_storeu_si256(reinterpret_cast<__m256i *>(buffer + i), srcVector); + } else { + if (buffer != src || RGBA) + _mm256_storeu_si256(reinterpret_cast<__m256i *>(buffer + i), srcVector); + } + } else { + _mm256_storeu_si256(reinterpret_cast<__m256i *>(buffer + i), zero); + } + } + + if (i < count) { + const __m256i epilogueMask = epilogueMaskFromCount(count - i); + __m256i srcVector = _mm256_maskload_epi32(reinterpret_cast<const int *>(src + i), epilogueMask); + const __m256i epilogueAlphaMask = _mm256_blendv_epi8(_mm256_setzero_si256(), alphaMask, epilogueMask); + + if (!_mm256_testz_si256(srcVector, epilogueAlphaMask)) { + // keep the two _mm_test[zc]_siXXX next to each other + bool cf = _mm256_testc_si256(srcVector, epilogueAlphaMask); + if (RGBA) + srcVector = _mm256_shuffle_epi8(srcVector, rgbaMask); + if (!cf) { + __m256i src1 = _mm256_unpacklo_epi8(srcVector, zero); + __m256i src2 = _mm256_unpackhi_epi8(srcVector, zero); + __m256i alpha1 = _mm256_shuffle_epi8(src1, shuffleMask); + __m256i alpha2 = _mm256_shuffle_epi8(src2, shuffleMask); + src1 = _mm256_mullo_epi16(src1, alpha1); + src2 = _mm256_mullo_epi16(src2, alpha2); + src1 = _mm256_add_epi16(src1, _mm256_srli_epi16(src1, 8)); + src2 = _mm256_add_epi16(src2, _mm256_srli_epi16(src2, 8)); + src1 = _mm256_add_epi16(src1, half); + src2 = _mm256_add_epi16(src2, half); + src1 = _mm256_srli_epi16(src1, 8); + src2 = _mm256_srli_epi16(src2, 8); + src1 = _mm256_blend_epi16(src1, alpha1, 0x88); + src2 = _mm256_blend_epi16(src2, alpha2, 0x88); + srcVector = _mm256_packus_epi16(src1, src2); + _mm256_maskstore_epi32(reinterpret_cast<int *>(buffer + i), epilogueMask, srcVector); + } else { + if (buffer != src || RGBA) + _mm256_maskstore_epi32(reinterpret_cast<int *>(buffer + i), epilogueMask, srcVector); + } + } else { + _mm256_maskstore_epi32(reinterpret_cast<int *>(buffer + i), epilogueMask, zero); + } + } +} + +void QT_FASTCALL convertARGB32ToARGB32PM_avx2(uint *buffer, int count, const QVector<QRgb> *) +{ + convertARGBToARGB32PM_avx2<false>(buffer, buffer, count); +} + +void QT_FASTCALL convertRGBA8888ToARGB32PM_avx2(uint *buffer, int count, const QVector<QRgb> *) +{ + convertARGBToARGB32PM_avx2<true>(buffer, buffer, count); +} + +const uint *QT_FASTCALL fetchARGB32ToARGB32PM_avx2(uint *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToARGB32PM_avx2<false>(buffer, reinterpret_cast<const uint *>(src) + index, count); + return buffer; +} + +const uint *QT_FASTCALL fetchRGBA8888ToARGB32PM_avx2(uint *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToARGB32PM_avx2<true>(buffer, reinterpret_cast<const uint *>(src) + index, count); + return buffer; +} + +template<bool RGBA> +static void convertARGBToRGBA64PM_avx2(QRgba64 *buffer, const uint *src, qsizetype count) +{ + qsizetype i = 0; + const __m256i alphaMask = _mm256_set1_epi32(0xff000000); + const __m256i rgbaMask = _mm256_broadcastsi128_si256(_mm_setr_epi8(2, 1, 0, 3, 6, 5, 4, 7, 10, 9, 8, 11, 14, 13, 12, 15)); + const __m256i shuffleMask = _mm256_broadcastsi128_si256(_mm_setr_epi8(6, 7, 6, 7, 6, 7, 6, 7, 14, 15, 14, 15, 14, 15, 14, 15)); + const __m256i zero = _mm256_setzero_si256(); + + for (; i < count - 7; i += 8) { + __m256i dst1, dst2; + __m256i srcVector = _mm256_loadu_si256(reinterpret_cast<const __m256i *>(src + i)); + if (!_mm256_testz_si256(srcVector, alphaMask)) { + // keep the two _mm_test[zc]_siXXX next to each other + bool cf = _mm256_testc_si256(srcVector, alphaMask); + if (!RGBA) + srcVector = _mm256_shuffle_epi8(srcVector, rgbaMask); + + // The two unpack instructions unpack the low and upper halves of + // each 128-bit half of the 256-bit register. Here's the tracking + // of what's where: (p is 32-bit, P is 64-bit) + // as loaded: [ p1, p2, p3, p4; p5, p6, p7, p8 ] + // after permute4x64 [ p1, p2, p5, p6; p3, p4, p7, p8 ] + // after unpacklo/hi [ P1, P2; P3, P4 ] [ P5, P6; P7, P8 ] + srcVector = _mm256_permute4x64_epi64(srcVector, _MM_SHUFFLE(3, 1, 2, 0)); + + const __m256i src1 = _mm256_unpacklo_epi8(srcVector, srcVector); + const __m256i src2 = _mm256_unpackhi_epi8(srcVector, srcVector); + if (!cf) { + const __m256i alpha1 = _mm256_shuffle_epi8(src1, shuffleMask); + const __m256i alpha2 = _mm256_shuffle_epi8(src2, shuffleMask); + dst1 = _mm256_mulhi_epu16(src1, alpha1); + dst2 = _mm256_mulhi_epu16(src2, alpha2); + dst1 = _mm256_add_epi16(dst1, _mm256_srli_epi16(dst1, 15)); + dst2 = _mm256_add_epi16(dst2, _mm256_srli_epi16(dst2, 15)); + dst1 = _mm256_blend_epi16(dst1, src1, 0x88); + dst2 = _mm256_blend_epi16(dst2, src2, 0x88); + } else { + dst1 = src1; + dst2 = src2; + } + } else { + dst1 = dst2 = zero; + } + _mm256_storeu_si256(reinterpret_cast<__m256i *>(buffer + i), dst1); + _mm256_storeu_si256(reinterpret_cast<__m256i *>(buffer + i) + 1, dst2); + } + + if (i < count) { + __m256i epilogueMask = epilogueMaskFromCount(count - i); + const __m256i epilogueAlphaMask = _mm256_blendv_epi8(_mm256_setzero_si256(), alphaMask, epilogueMask); + __m256i dst1, dst2; + __m256i srcVector = _mm256_maskload_epi32(reinterpret_cast<const int *>(src + i), epilogueMask); + + if (!_mm256_testz_si256(srcVector, epilogueAlphaMask)) { + // keep the two _mm_test[zc]_siXXX next to each other + bool cf = _mm256_testc_si256(srcVector, epilogueAlphaMask); + if (!RGBA) + srcVector = _mm256_shuffle_epi8(srcVector, rgbaMask); + srcVector = _mm256_permute4x64_epi64(srcVector, _MM_SHUFFLE(3, 1, 2, 0)); + const __m256i src1 = _mm256_unpacklo_epi8(srcVector, srcVector); + const __m256i src2 = _mm256_unpackhi_epi8(srcVector, srcVector); + if (!cf) { + const __m256i alpha1 = _mm256_shuffle_epi8(src1, shuffleMask); + const __m256i alpha2 = _mm256_shuffle_epi8(src2, shuffleMask); + dst1 = _mm256_mulhi_epu16(src1, alpha1); + dst2 = _mm256_mulhi_epu16(src2, alpha2); + dst1 = _mm256_add_epi16(dst1, _mm256_srli_epi16(dst1, 15)); + dst2 = _mm256_add_epi16(dst2, _mm256_srli_epi16(dst2, 15)); + dst1 = _mm256_blend_epi16(dst1, src1, 0x88); + dst2 = _mm256_blend_epi16(dst2, src2, 0x88); + } else { + dst1 = src1; + dst2 = src2; + } + } else { + dst1 = dst2 = zero; + } + epilogueMask = _mm256_permute4x64_epi64(epilogueMask, _MM_SHUFFLE(3, 1, 2, 0)); + _mm256_maskstore_epi64(reinterpret_cast<qint64 *>(buffer + i), + _mm256_unpacklo_epi32(epilogueMask, epilogueMask), + dst1); + _mm256_maskstore_epi64(reinterpret_cast<qint64 *>(buffer + i + 4), + _mm256_unpackhi_epi32(epilogueMask, epilogueMask), + dst2); + } +} + +const QRgba64 * QT_FASTCALL convertARGB32ToRGBA64PM_avx2(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToRGBA64PM_avx2<false>(buffer, src, count); + return buffer; +} + +const QRgba64 * QT_FASTCALL convertRGBA8888ToRGBA64PM_avx2(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToRGBA64PM_avx2<true>(buffer, src, count); + return buffer; +} + +const QRgba64 *QT_FASTCALL fetchARGB32ToRGBA64PM_avx2(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToRGBA64PM_avx2<false>(buffer, reinterpret_cast<const uint *>(src) + index, count); + return buffer; +} + +const QRgba64 *QT_FASTCALL fetchRGBA8888ToRGBA64PM_avx2(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToRGBA64PM_avx2<true>(buffer, reinterpret_cast<const uint *>(src) + index, count); + return buffer; +} + QT_END_NAMESPACE #endif diff --git a/src/gui/painting/qdrawhelper_mips_dsp.cpp b/src/gui/painting/qdrawhelper_mips_dsp.cpp index e92a6606de..17597deb1d 100644 --- a/src/gui/painting/qdrawhelper_mips_dsp.cpp +++ b/src/gui/painting/qdrawhelper_mips_dsp.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -void qt_memfill32(quint32 *dest, quint32 color, int count) +void qt_memfill32(quint32 *dest, quint32 color, qsizetype count) { qt_memfill32_asm_mips_dsp(dest, color, count); } diff --git a/src/gui/painting/qdrawhelper_mips_dsp_p.h b/src/gui/painting/qdrawhelper_mips_dsp_p.h index 36c4af2732..a3d0410274 100644 --- a/src/gui/painting/qdrawhelper_mips_dsp_p.h +++ b/src/gui/painting/qdrawhelper_mips_dsp_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE #if defined(QT_COMPILER_SUPPORTS_MIPS_DSP) -extern "C" void qt_memfill32_asm_mips_dsp(quint32 *dest, quint32 value, int count); +extern "C" void qt_memfill32_asm_mips_dsp(quint32 *dest, quint32 value, qsizetype count); extern "C" void comp_func_SourceOver_asm_mips_dsp(uint *dest, const uint *src, int length, uint const_alpha); diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp index 629dfe2358..3fcbcfd053 100644 --- a/src/gui/painting/qdrawhelper_neon.cpp +++ b/src/gui/painting/qdrawhelper_neon.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -void qt_memfill32(quint32 *dest, quint32 value, int count) +void qt_memfill32(quint32 *dest, quint32 value, qsizetype count) { const int epilogueSize = count % 16; #if !defined(Q_PROCESSOR_ARM_64) @@ -84,20 +84,20 @@ void qt_memfill32(quint32 *dest, quint32 value, int count) switch (epilogueSize) { - case 15: *dest++ = value; - case 14: *dest++ = value; - case 13: *dest++ = value; - case 12: *dest++ = value; - case 11: *dest++ = value; - case 10: *dest++ = value; - case 9: *dest++ = value; - case 8: *dest++ = value; - case 7: *dest++ = value; - case 6: *dest++ = value; - case 5: *dest++ = value; - case 4: *dest++ = value; - case 3: *dest++ = value; - case 2: *dest++ = value; + case 15: *dest++ = value; Q_FALLTHROUGH(); + case 14: *dest++ = value; Q_FALLTHROUGH(); + case 13: *dest++ = value; Q_FALLTHROUGH(); + case 12: *dest++ = value; Q_FALLTHROUGH(); + case 11: *dest++ = value; Q_FALLTHROUGH(); + case 10: *dest++ = value; Q_FALLTHROUGH(); + case 9: *dest++ = value; Q_FALLTHROUGH(); + case 8: *dest++ = value; Q_FALLTHROUGH(); + case 7: *dest++ = value; Q_FALLTHROUGH(); + case 6: *dest++ = value; Q_FALLTHROUGH(); + case 5: *dest++ = value; Q_FALLTHROUGH(); + case 4: *dest++ = value; Q_FALLTHROUGH(); + case 3: *dest++ = value; Q_FALLTHROUGH(); + case 2: *dest++ = value; Q_FALLTHROUGH(); case 1: *dest++ = value; } } @@ -791,7 +791,7 @@ void QT_FASTCALL qt_destStoreRGB16_neon(QRasterBuffer *rasterBuffer, int x, int void QT_FASTCALL comp_func_solid_SourceOver_neon(uint *destPixels, int length, uint color, uint const_alpha) { if ((const_alpha & qAlpha(color)) == 255) { - QT_MEMFILL_UINT(destPixels, length, color); + qt_memfill32(destPixels, color, length); } else { if (const_alpha != 255) color = BYTE_MUL(color, const_alpha); @@ -1149,6 +1149,72 @@ static inline void convertARGBToARGB32PM_neon(uint *buffer, const uint *src, int } } +template<bool RGBA> +static inline void convertARGB32ToRGBA64PM_neon(QRgba64 *buffer, const uint *src, int count) +{ + if (count <= 0) + return; + + const uint8x8_t shuffleMask = { 3, 3, 3, 3, 7, 7, 7, 7}; + const uint64x2_t blendMask = vdupq_n_u64(Q_UINT64_C(0xffff000000000000)); + + int i = 0; + for (; i < count-3; i += 4) { + uint32x4_t vs32 = vld1q_u32(src + i); + uint32x4_t alphaVector = vshrq_n_u32(vs32, 24); +#if defined(Q_PROCESSOR_ARM_64) + uint32_t alphaSum = vaddvq_u32(alphaVector); +#else + // no vaddvq_u32 + uint32x2_t tmp = vpadd_u32(vget_low_u32(alphaVector), vget_high_u32(alphaVector)); + uint32_t alphaSum = vget_lane_u32(vpadd_u32(tmp, tmp), 0); +#endif + if (alphaSum) { + if (!RGBA) + vs32 = vrgba2argb(vs32); + const uint8x16_t vs8 = vreinterpretq_u8_u32(vs32); + const uint8x16x2_t v = vzipq_u8(vs8, vs8); + if (alphaSum != 255 * 4) { + const uint8x8_t s1 = vreinterpret_u8_u32(vget_low_u32(vs32)); + const uint8x8_t s2 = vreinterpret_u8_u32(vget_high_u32(vs32)); + const uint8x8_t alpha1 = vtbl1_u8(s1, shuffleMask); + const uint8x8_t alpha2 = vtbl1_u8(s2, shuffleMask); + uint16x8_t src1 = vmull_u8(s1, alpha1); + uint16x8_t src2 = vmull_u8(s2, alpha2); + // convert from 0->(255x255) to 0->(255x257) + src1 = vsraq_n_u16(src1, src1, 7); + src2 = vsraq_n_u16(src2, src2, 7); + + // now restore alpha from the trivial conversion + const uint64x2_t d1 = vbslq_u64(blendMask, vreinterpretq_u64_u8(v.val[0]), vreinterpretq_u64_u16(src1)); + const uint64x2_t d2 = vbslq_u64(blendMask, vreinterpretq_u64_u8(v.val[1]), vreinterpretq_u64_u16(src2)); + + vst1q_u16((uint16_t *)buffer, vreinterpretq_u16_u64(d1)); + buffer += 2; + vst1q_u16((uint16_t *)buffer, vreinterpretq_u16_u64(d2)); + buffer += 2; + } else { + vst1q_u16((uint16_t *)buffer, vreinterpretq_u16_u8(v.val[0])); + buffer += 2; + vst1q_u16((uint16_t *)buffer, vreinterpretq_u16_u8(v.val[1])); + buffer += 2; + } + } else { + vst1q_u16((uint16_t *)buffer, vdupq_n_u16(0)); + buffer += 2; + vst1q_u16((uint16_t *)buffer, vdupq_n_u16(0)); + buffer += 2; + } + } + + SIMD_EPILOGUE(i, count, 3) { + uint s = src[i]; + if (RGBA) + s = RGBA2ARGB(s); + *buffer++ = QRgba64::fromArgb32(s).premultiplied(); + } +} + static inline float32x4_t reciprocal_mul_ps(float32x4_t a, float mul) { float32x4_t ia = vrecpeq_f32(a); // estimate 1/a @@ -1258,6 +1324,34 @@ const uint *QT_FASTCALL fetchRGBA8888ToARGB32PM_neon(uint *buffer, const uchar * return buffer; } +const QRgba64 * QT_FASTCALL convertARGB32ToRGBA64PM_neon(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGB32ToRGBA64PM_neon<false>(buffer, src, count); + return buffer; +} + +const QRgba64 * QT_FASTCALL convertRGBA8888ToRGBA64PM_neon(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGB32ToRGBA64PM_neon<true>(buffer, src, count); + return buffer; +} + +const QRgba64 *QT_FASTCALL fetchARGB32ToRGBA64PM_neon(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGB32ToRGBA64PM_neon<false>(buffer, reinterpret_cast<const uint *>(src) + index, count); + return buffer; +} + +const QRgba64 *QT_FASTCALL fetchRGBA8888ToRGBA64PM_neon(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGB32ToRGBA64PM_neon<true>(buffer, reinterpret_cast<const uint *>(src) + index, count); + return buffer; +} + void QT_FASTCALL storeRGB32FromARGB32PM_neon(uchar *dest, const uint *src, int index, int count, const QVector<QRgb> *, QDitherInfo *) { diff --git a/src/gui/painting/qdrawhelper_neon_p.h b/src/gui/painting/qdrawhelper_neon_p.h index 40475a9bde..19e1f21a3b 100644 --- a/src/gui/painting/qdrawhelper_neon_p.h +++ b/src/gui/painting/qdrawhelper_neon_p.h @@ -123,7 +123,7 @@ void qt_transform_image_rgb16_on_rgb16_neon(uchar *destPixels, int dbpl, const QTransform &targetRectTransform, int const_alpha); -void qt_memfill32_neon(quint32 *dest, quint32 value, int count); +void qt_memfill32_neon(quint32 *dest, quint32 value, qsizetype count); void qt_memrotate90_16_neon(const uchar *srcPixels, int w, int h, int sbpl, uchar *destPixels, int dbpl); void qt_memrotate270_16_neon(const uchar *srcPixels, int w, int h, int sbpl, uchar *destPixels, int dbpl); diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h index fb08261205..37108949d6 100644 --- a/src/gui/painting/qdrawhelper_p.h +++ b/src/gui/painting/qdrawhelper_p.h @@ -69,14 +69,18 @@ QT_BEGIN_NAMESPACE #if defined(Q_CC_GNU) -# define Q_STATIC_TEMPLATE_FUNCTION static # define Q_DECL_RESTRICT __restrict__ +# if defined(Q_PROCESSOR_X86_32) && defined(Q_CC_GNU) && !defined(Q_CC_CLANG) && !defined(Q_CC_INTEL) +# define Q_DECL_VECTORCALL __attribute__((sseregparm,regparm(3))) +# else +# define Q_DECL_VECTORCALL +# endif #elif defined(Q_CC_MSVC) -# define Q_STATIC_TEMPLATE_FUNCTION static # define Q_DECL_RESTRICT __restrict +# define Q_DECL_VECTORCALL __vectorcall #else -# define Q_STATIC_TEMPLATE_FUNCTION static # define Q_DECL_RESTRICT +# define Q_DECL_VECTORCALL #endif static const uint AMASK = 0xff000000; @@ -149,7 +153,6 @@ typedef void (*MemRotateFunc)(const uchar *srcPixels, int w, int h, int sbpl, uc struct DrawHelper { ProcessSpans blendColor; - ProcessSpans blendGradient; BitmapBlitFunc bitmapBlit; AlphamapBlitFunc alphamapBlit; AlphaRGBBlitFunc alphaRGBBlit; @@ -162,10 +165,33 @@ extern SrcOverTransformFunc qTransformFunctions[QImage::NImageFormats][QImage::N extern DrawHelper qDrawHelper[QImage::NImageFormats]; +struct quint24 { + quint24() = default; + quint24(uint value) + { + data[0] = uchar(value >> 16); + data[1] = uchar(value >> 8); + data[2] = uchar(value); + } + operator uint() const + { + return data[2] | (data[1] << 8) | (data[0] << 16); + } + + uchar data[3]; +}; + +void qBlendGradient(int count, const QSpan *spans, void *userData); void qBlendTexture(int count, const QSpan *spans, void *userData); -extern void qt_memfill64(quint64 *dest, quint64 value, int count); -extern void qt_memfill32(quint32 *dest, quint32 value, int count); -extern void qt_memfill16(quint16 *dest, quint16 value, int count); +#ifdef __SSE2__ +extern void (*qt_memfill64)(quint64 *dest, quint64 value, qsizetype count); +extern void (*qt_memfill32)(quint32 *dest, quint32 value, qsizetype count); +#else +extern void qt_memfill64(quint64 *dest, quint64 value, qsizetype count); +extern void qt_memfill32(quint32 *dest, quint32 value, qsizetype count); +#endif +extern void qt_memfill24(quint24 *dest, quint24 value, qsizetype count); +extern void qt_memfill16(quint16 *dest, quint16 value, qsizetype count); typedef void (QT_FASTCALL *CompositionFunction)(uint *Q_DECL_RESTRICT dest, const uint *Q_DECL_RESTRICT src, int length, uint const_alpha); typedef void (QT_FASTCALL *CompositionFunction64)(QRgba64 *Q_DECL_RESTRICT dest, const QRgba64 *Q_DECL_RESTRICT src, int length, uint const_alpha); @@ -222,11 +248,6 @@ struct Operator class QRasterPaintEngine; -struct QSolidData -{ - QRgba64 color; -}; - struct QLinearGradientData { struct { @@ -331,8 +352,8 @@ struct QSpanData int fast_matrix : 1; bool bilinear; QImage *tempImage; + QRgba64 solidColor; union { - QSolidData solid; QGradientData gradient; QTextureData texture; }; @@ -858,6 +879,8 @@ static Q_ALWAYS_INLINE uint BYTE_MUL_RGB16_32(uint x, uint a) { // qt_div_255 is a fast rounded division by 255 using an approximation that is accurate for all positive 16-bit integers static Q_DECL_CONSTEXPR Q_ALWAYS_INLINE int qt_div_255(int x) { return (x + (x>>8) + 0x80) >> 8; } +static Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_div_257_floor(uint x) { return (x - (x >> 8)) >> 8; } +static Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_div_257(uint x) { return qt_div_257_floor(x + 128); } static Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_div_65535(uint x) { return (x + (x>>16) + 0x8000U) >> 16; } static Q_ALWAYS_INLINE uint qAlphaRgb30(uint c) @@ -868,76 +891,63 @@ static Q_ALWAYS_INLINE uint qAlphaRgb30(uint c) return a; } -struct quint24 { - quint24() = default; - quint24(uint value); - operator uint() const; - uchar data[3]; -}; - -inline quint24::quint24(uint value) +template <class T> inline void qt_memfill_template(T *dest, T color, qsizetype count) { - data[0] = uchar(value >> 16); - data[1] = uchar(value >> 8); - data[2] = uchar(value); + if (!count) + return; + + qsizetype n = (count + 7) / 8; + switch (count & 0x07) + { + case 0: do { *dest++ = color; Q_FALLTHROUGH(); + case 7: *dest++ = color; Q_FALLTHROUGH(); + case 6: *dest++ = color; Q_FALLTHROUGH(); + case 5: *dest++ = color; Q_FALLTHROUGH(); + case 4: *dest++ = color; Q_FALLTHROUGH(); + case 3: *dest++ = color; Q_FALLTHROUGH(); + case 2: *dest++ = color; Q_FALLTHROUGH(); + case 1: *dest++ = color; + } while (--n > 0); + } } -inline quint24::operator uint() const +template <class T> inline void qt_memfill(T *dest, T value, qsizetype count) { - return data[2] | (data[1] << 8) | (data[0] << 16); + qt_memfill_template(dest, value, count); } -template <class T> Q_STATIC_TEMPLATE_FUNCTION -void qt_memfill(T *dest, T value, int count); - -template<> inline void qt_memfill(quint64 *dest, quint64 color, int count) +template<> inline void qt_memfill(quint64 *dest, quint64 color, qsizetype count) { qt_memfill64(dest, color, count); } -template<> inline void qt_memfill(quint32 *dest, quint32 color, int count) +template<> inline void qt_memfill(quint32 *dest, quint32 color, qsizetype count) { qt_memfill32(dest, color, count); } -template<> inline void qt_memfill(quint16 *dest, quint16 color, int count) +template<> inline void qt_memfill(quint24 *dest, quint24 color, qsizetype count) { - qt_memfill16(dest, color, count); + qt_memfill24(dest, color, count); } -template<> inline void qt_memfill(quint8 *dest, quint8 color, int count) +template<> inline void qt_memfill(quint16 *dest, quint16 color, qsizetype count) { - memset(dest, color, count); + qt_memfill16(dest, color, count); } -template <class T> -inline void qt_memfill(T *dest, T value, int count) +template<> inline void qt_memfill(quint8 *dest, quint8 color, qsizetype count) { - if (!count) - return; - - int n = (count + 7) / 8; - switch (count & 0x07) - { - case 0: do { *dest++ = value; Q_FALLTHROUGH(); - case 7: *dest++ = value; Q_FALLTHROUGH(); - case 6: *dest++ = value; Q_FALLTHROUGH(); - case 5: *dest++ = value; Q_FALLTHROUGH(); - case 4: *dest++ = value; Q_FALLTHROUGH(); - case 3: *dest++ = value; Q_FALLTHROUGH(); - case 2: *dest++ = value; Q_FALLTHROUGH(); - case 1: *dest++ = value; - } while (--n > 0); - } + memset(dest, color, count); } -template <class T> Q_STATIC_TEMPLATE_FUNCTION +template <class T> static inline void qt_rectfill(T *dest, T value, int x, int y, int width, int height, qsizetype stride) { char *d = reinterpret_cast<char*>(dest + x) + y * stride; if (uint(stride) == (width * sizeof(T))) { - qt_memfill(reinterpret_cast<T*>(d), value, width * height); + qt_memfill(reinterpret_cast<T*>(d), value, qsizetype(width) * height); } else { for (int j = 0; j < height; ++j) { dest = reinterpret_cast<T*>(d); @@ -947,52 +957,6 @@ inline void qt_rectfill(T *dest, T value, } } -#define QT_MEMFILL_UINT(dest, length, color) \ - qt_memfill<quint32>(dest, color, length); - -#define QT_MEMFILL_USHORT(dest, length, color) \ - qt_memfill<quint16>(dest, color, length); - -#define QT_MEMCPY_REV_UINT(dest, src, length) \ -do { \ - /* Duff's device */ \ - uint *_d = (uint*)(dest) + length; \ - const uint *_s = (uint*)(src) + length; \ - int n = ((length) + 7) / 8; \ - switch ((length) & 0x07) \ - { \ - case 0: do { *--_d = *--_s; Q_FALLTHROUGH(); \ - case 7: *--_d = *--_s; Q_FALLTHROUGH(); \ - case 6: *--_d = *--_s; Q_FALLTHROUGH(); \ - case 5: *--_d = *--_s; Q_FALLTHROUGH(); \ - case 4: *--_d = *--_s; Q_FALLTHROUGH(); \ - case 3: *--_d = *--_s; Q_FALLTHROUGH(); \ - case 2: *--_d = *--_s; Q_FALLTHROUGH(); \ - case 1: *--_d = *--_s; \ - } while (--n > 0); \ - } \ -} while (false) - -#define QT_MEMCPY_USHORT(dest, src, length) \ -do { \ - /* Duff's device */ \ - ushort *_d = (ushort*)(dest); \ - const ushort *_s = (const ushort*)(src); \ - int n = ((length) + 7) / 8; \ - switch ((length) & 0x07) \ - { \ - case 0: do { *_d++ = *_s++; Q_FALLTHROUGH(); \ - case 7: *_d++ = *_s++; Q_FALLTHROUGH(); \ - case 6: *_d++ = *_s++; Q_FALLTHROUGH(); \ - case 5: *_d++ = *_s++; Q_FALLTHROUGH(); \ - case 4: *_d++ = *_s++; Q_FALLTHROUGH(); \ - case 3: *_d++ = *_s++; Q_FALLTHROUGH(); \ - case 2: *_d++ = *_s++; Q_FALLTHROUGH(); \ - case 1: *_d++ = *_s++; \ - } while (--n > 0); \ - } \ -} while (false) - inline ushort qConvertRgb32To16(uint c) { return (((c) >> 3) & 0x001f) diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp index 3212ffdd2d..c82f41ec88 100644 --- a/src/gui/painting/qdrawhelper_sse2.cpp +++ b/src/gui/painting/qdrawhelper_sse2.cpp @@ -233,19 +233,71 @@ void QT_FASTCALL comp_func_Source_sse2(uint *dst, const uint *src, int length, u } } -void qt_memfill32(quint32 *dest, quint32 value, int count) +#ifndef __AVX2__ +static Q_NEVER_INLINE +void Q_DECL_VECTORCALL qt_memfillXX_aligned(void *dest, __m128i value128, quintptr bytecount) { - if (count < 7) { + __m128i *dst128 = reinterpret_cast<__m128i *>(dest); + __m128i *end128 = reinterpret_cast<__m128i *>(static_cast<uchar *>(dest) + bytecount); + + while (dst128 + 4 <= end128) { + _mm_store_si128(dst128 + 0, value128); + _mm_store_si128(dst128 + 1, value128); + _mm_store_si128(dst128 + 2, value128); + _mm_store_si128(dst128 + 3, value128); + dst128 += 4; + } + + bytecount %= 4 * sizeof(__m128i); + switch (bytecount / sizeof(__m128i)) { + case 3: _mm_store_si128(dst128++, value128); Q_FALLTHROUGH(); + case 2: _mm_store_si128(dst128++, value128); Q_FALLTHROUGH(); + case 1: _mm_store_si128(dst128++, value128); + } +} + +void qt_memfill64_sse2(quint64 *dest, quint64 value, qsizetype count) +{ + quintptr misaligned = quintptr(dest) % sizeof(__m128i); + if (misaligned && count) { +#if defined(Q_PROCESSOR_X86_32) + // Before SSE came out, the alignment of the stack used to be only 4 + // bytes and some OS/ABIs (notably, code generated by MSVC) still only + // align to that. In any case, we cannot count on the alignment of + // quint64 to be 8 -- see QtPrivate::AlignOf_WorkaroundForI386Abi in + // qglobal.h. + // + // If the pointer is not aligned to at least 8 bytes, then we'll never + // in turn hit a multiple of 16 for the qt_memfillXX_aligned call + // below. + if (Q_UNLIKELY(misaligned % sizeof(quint64))) + return qt_memfill_template(dest, value, count); +#endif + + *dest++ = value; + --count; + } + + if (count % 2) { + dest[count - 1] = value; + --count; + } + + qt_memfillXX_aligned(dest, _mm_set1_epi64x(value), count * sizeof(quint64)); +} + +void qt_memfill32_sse2(quint32 *dest, quint32 value, qsizetype count) +{ + if (count < 4) { + // this simplifies the code below: the first switch can fall through + // without checking the value of count switch (count) { - case 6: *dest++ = value; Q_FALLTHROUGH(); - case 5: *dest++ = value; Q_FALLTHROUGH(); - case 4: *dest++ = value; Q_FALLTHROUGH(); case 3: *dest++ = value; Q_FALLTHROUGH(); case 2: *dest++ = value; Q_FALLTHROUGH(); case 1: *dest = value; } return; - }; + } const int align = (quintptr)(dest) & 0xf; switch (align) { @@ -263,25 +315,9 @@ void qt_memfill32(quint32 *dest, quint32 value, int count) } } - int count128 = count / 4; - __m128i *dst128 = reinterpret_cast<__m128i*>(dest); - __m128i *end128 = dst128 + count128; - const __m128i value128 = _mm_set_epi32(value, value, value, value); - - while (dst128 + 3 < end128) { - _mm_stream_si128(dst128 + 0, value128); - _mm_stream_si128(dst128 + 1, value128); - _mm_stream_si128(dst128 + 2, value128); - _mm_stream_si128(dst128 + 3, value128); - dst128 += 4; - } - - switch (count128 & 0x3) { - case 3: _mm_stream_si128(dst128++, value128); Q_FALLTHROUGH(); - case 2: _mm_stream_si128(dst128++, value128); Q_FALLTHROUGH(); - case 1: _mm_stream_si128(dst128++, value128); - } + qt_memfillXX_aligned(dest, _mm_set1_epi32(value), count * sizeof(quint32)); } +#endif // !__AVX2__ void QT_FASTCALL comp_func_solid_SourceOver_sse2(uint *destPixels, int length, uint color, uint const_alpha) { @@ -314,28 +350,6 @@ void QT_FASTCALL comp_func_solid_SourceOver_sse2(uint *destPixels, int length, u } } -void qt_memfill16(quint16 *dest, quint16 value, int count) -{ - if (count < 3) { - switch (count) { - case 2: *dest++ = value; Q_FALLTHROUGH(); - case 1: *dest = value; - } - return; - } - - const int align = (quintptr)(dest) & 0x3; - switch (align) { - case 2: *dest++ = value; --count; - } - - const quint32 value32 = (value << 16) | value; - qt_memfill32(reinterpret_cast<quint32*>(dest), value32, count / 2); - - if (count & 0x1) - dest[count - 1] = value; -} - void qt_bitmapblit32_sse2_base(QRasterBuffer *rasterBuffer, int x, int y, quint32 color, const uchar *src, int width, int height, int stride) @@ -440,30 +454,30 @@ public: union Vect_buffer_i { Int32x4 v; int i[4]; }; union Vect_buffer_f { Float32x4 v; float f[4]; }; - static inline Float32x4 v_dup(float x) { return _mm_set1_ps(x); } - static inline Float32x4 v_dup(double x) { return _mm_set1_ps(x); } - static inline Int32x4 v_dup(int x) { return _mm_set1_epi32(x); } - static inline Int32x4 v_dup(uint x) { return _mm_set1_epi32(x); } + static inline Float32x4 Q_DECL_VECTORCALL v_dup(float x) { return _mm_set1_ps(x); } + static inline Float32x4 Q_DECL_VECTORCALL v_dup(double x) { return _mm_set1_ps(x); } + static inline Int32x4 Q_DECL_VECTORCALL v_dup(int x) { return _mm_set1_epi32(x); } + static inline Int32x4 Q_DECL_VECTORCALL v_dup(uint x) { return _mm_set1_epi32(x); } - static inline Float32x4 v_add(Float32x4 a, Float32x4 b) { return _mm_add_ps(a, b); } - static inline Int32x4 v_add(Int32x4 a, Int32x4 b) { return _mm_add_epi32(a, b); } + static inline Float32x4 Q_DECL_VECTORCALL v_add(Float32x4 a, Float32x4 b) { return _mm_add_ps(a, b); } + static inline Int32x4 Q_DECL_VECTORCALL v_add(Int32x4 a, Int32x4 b) { return _mm_add_epi32(a, b); } - static inline Float32x4 v_max(Float32x4 a, Float32x4 b) { return _mm_max_ps(a, b); } - static inline Float32x4 v_min(Float32x4 a, Float32x4 b) { return _mm_min_ps(a, b); } - static inline Int32x4 v_min_16(Int32x4 a, Int32x4 b) { return _mm_min_epi16(a, b); } + static inline Float32x4 Q_DECL_VECTORCALL v_max(Float32x4 a, Float32x4 b) { return _mm_max_ps(a, b); } + static inline Float32x4 Q_DECL_VECTORCALL v_min(Float32x4 a, Float32x4 b) { return _mm_min_ps(a, b); } + static inline Int32x4 Q_DECL_VECTORCALL v_min_16(Int32x4 a, Int32x4 b) { return _mm_min_epi16(a, b); } - static inline Int32x4 v_and(Int32x4 a, Int32x4 b) { return _mm_and_si128(a, b); } + static inline Int32x4 Q_DECL_VECTORCALL v_and(Int32x4 a, Int32x4 b) { return _mm_and_si128(a, b); } - static inline Float32x4 v_sub(Float32x4 a, Float32x4 b) { return _mm_sub_ps(a, b); } - static inline Int32x4 v_sub(Int32x4 a, Int32x4 b) { return _mm_sub_epi32(a, b); } + static inline Float32x4 Q_DECL_VECTORCALL v_sub(Float32x4 a, Float32x4 b) { return _mm_sub_ps(a, b); } + static inline Int32x4 Q_DECL_VECTORCALL v_sub(Int32x4 a, Int32x4 b) { return _mm_sub_epi32(a, b); } - static inline Float32x4 v_mul(Float32x4 a, Float32x4 b) { return _mm_mul_ps(a, b); } + static inline Float32x4 Q_DECL_VECTORCALL v_mul(Float32x4 a, Float32x4 b) { return _mm_mul_ps(a, b); } - static inline Float32x4 v_sqrt(Float32x4 x) { return _mm_sqrt_ps(x); } + static inline Float32x4 Q_DECL_VECTORCALL v_sqrt(Float32x4 x) { return _mm_sqrt_ps(x); } - static inline Int32x4 v_toInt(Float32x4 x) { return _mm_cvttps_epi32(x); } + static inline Int32x4 Q_DECL_VECTORCALL v_toInt(Float32x4 x) { return _mm_cvttps_epi32(x); } - static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { return _mm_castps_si128(_mm_cmpgt_ps(a, b)); } + static inline Int32x4 Q_DECL_VECTORCALL v_greaterOrEqual(Float32x4 a, Float32x4 b) { return _mm_castps_si128(_mm_cmpgt_ps(a, b)); } }; const uint * QT_FASTCALL qt_fetch_radial_gradient_sse2(uint *buffer, const Operator *op, const QSpanData *data, diff --git a/src/gui/painting/qdrawhelper_sse4.cpp b/src/gui/painting/qdrawhelper_sse4.cpp index f6c2f11eaf..d9a687b1b4 100644 --- a/src/gui/painting/qdrawhelper_sse4.cpp +++ b/src/gui/painting/qdrawhelper_sse4.cpp @@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE +#ifndef __AVX2__ template<bool RGBA> static void convertARGBToARGB32PM_sse4(uint *buffer, const uint *src, int count) { @@ -94,7 +95,55 @@ static void convertARGBToARGB32PM_sse4(uint *buffer, const uint *src, int count) } } -static inline __m128 reciprocal_mul_ps(__m128 a, float mul) +template<bool RGBA> +static void convertARGBToRGBA64PM_sse4(QRgba64 *buffer, const uint *src, int count) +{ + int i = 0; + const __m128i alphaMask = _mm_set1_epi32(0xff000000); + const __m128i rgbaMask = _mm_setr_epi8(2, 1, 0, 3, 6, 5, 4, 7, 10, 9, 8, 11, 14, 13, 12, 15); + const __m128i shuffleMask = _mm_setr_epi8(6, 7, 6, 7, 6, 7, 6, 7, 14, 15, 14, 15, 14, 15, 14, 15); + const __m128i zero = _mm_setzero_si128(); + + for (; i < count - 3; i += 4) { + __m128i srcVector = _mm_loadu_si128((const __m128i *)&src[i]); + if (!_mm_testz_si128(srcVector, alphaMask)) { + bool cf = _mm_testc_si128(srcVector, alphaMask); + + if (!RGBA) + srcVector = _mm_shuffle_epi8(srcVector, rgbaMask); + const __m128i src1 = _mm_unpacklo_epi8(srcVector, srcVector); + const __m128i src2 = _mm_unpackhi_epi8(srcVector, srcVector); + if (!cf) { + __m128i alpha1 = _mm_shuffle_epi8(src1, shuffleMask); + __m128i alpha2 = _mm_shuffle_epi8(src2, shuffleMask); + __m128i dst1 = _mm_mulhi_epu16(src1, alpha1); + __m128i dst2 = _mm_mulhi_epu16(src2, alpha2); + // Map 0->0xfffe to 0->0xffff + dst1 = _mm_add_epi16(dst1, _mm_srli_epi16(dst1, 15)); + dst2 = _mm_add_epi16(dst2, _mm_srli_epi16(dst2, 15)); + // correct alpha value: + dst1 = _mm_blend_epi16(dst1, src1, 0x88); + dst2 = _mm_blend_epi16(dst2, src2, 0x88); + _mm_storeu_si128((__m128i *)&buffer[i], dst1); + _mm_storeu_si128((__m128i *)&buffer[i + 2], dst2); + } else { + _mm_storeu_si128((__m128i *)&buffer[i], src1); + _mm_storeu_si128((__m128i *)&buffer[i + 2], src2); + } + } else { + _mm_storeu_si128((__m128i *)&buffer[i], zero); + _mm_storeu_si128((__m128i *)&buffer[i + 2], zero); + } + } + + SIMD_EPILOGUE(i, count, 3) { + const uint s = RGBA ? RGBA2ARGB(src[i]) : src[i]; + buffer[i] = QRgba64::fromArgb32(s).premultiplied(); + } +} +#endif // __AVX2__ + +static inline __m128 Q_DECL_VECTORCALL reciprocal_mul_ps(__m128 a, float mul) { __m128 ia = _mm_rcp_ps(a); // Approximate 1/a // Improve precision of ia using Newton-Raphson @@ -259,6 +308,7 @@ static inline void convertARGBFromRGBA64PM_sse4(uint *buffer, const QRgba64 *src } } +#ifndef __AVX2__ void QT_FASTCALL convertARGB32ToARGB32PM_sse4(uint *buffer, int count, const QVector<QRgb> *) { convertARGBToARGB32PM_sse4<false>(buffer, buffer, count); @@ -269,6 +319,20 @@ void QT_FASTCALL convertRGBA8888ToARGB32PM_sse4(uint *buffer, int count, const Q convertARGBToARGB32PM_sse4<true>(buffer, buffer, count); } +const QRgba64 * QT_FASTCALL convertARGB32ToRGBA64PM_sse4(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToRGBA64PM_sse4<false>(buffer, src, count); + return buffer; +} + +const QRgba64 * QT_FASTCALL convertRGBA8888ToRGBA64PM_sse4(QRgba64 *buffer, const uint *src, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToRGBA64PM_sse4<true>(buffer, src, count); + return buffer; +} + const uint *QT_FASTCALL fetchARGB32ToARGB32PM_sse4(uint *buffer, const uchar *src, int index, int count, const QVector<QRgb> *, QDitherInfo *) { @@ -283,6 +347,21 @@ const uint *QT_FASTCALL fetchRGBA8888ToARGB32PM_sse4(uint *buffer, const uchar * return buffer; } +const QRgba64 *QT_FASTCALL fetchARGB32ToRGBA64PM_sse4(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToRGBA64PM_sse4<false>(buffer, reinterpret_cast<const uint *>(src) + index, count); + return buffer; +} + +const QRgba64 *QT_FASTCALL fetchRGBA8888ToRGBA64PM_sse4(QRgba64 *buffer, const uchar *src, int index, int count, + const QVector<QRgb> *, QDitherInfo *) +{ + convertARGBToRGBA64PM_sse4<true>(buffer, reinterpret_cast<const uint *>(src) + index, count); + return buffer; +} +#endif // __AVX2__ + void QT_FASTCALL storeRGB32FromARGB32PM_sse4(uchar *dest, const uint *src, int index, int count, const QVector<QRgb> *, QDitherInfo *) { diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp index 42d760d5cc..35d61c3e6c 100644 --- a/src/gui/painting/qdrawhelper_ssse3.cpp +++ b/src/gui/painting/qdrawhelper_ssse3.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -79,55 +80,58 @@ QT_BEGIN_NAMESPACE // The computation being done is: // result = s + d * (1-alpha) // with shortcuts if fully opaque or fully transparent. -#define BLEND_SOURCE_OVER_ARGB32_SSSE3(dst, src, length, nullVector, half, one, colorMask, alphaMask) { \ - int x = 0; \ -\ - /* First, get dst aligned. */ \ - ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { \ - blend_pixel(dst[x], src[x]); \ - } \ -\ - const int minusOffsetToAlignSrcOn16Bytes = (reinterpret_cast<quintptr>(&(src[x])) >> 2) & 0x3;\ -\ - if (!minusOffsetToAlignSrcOn16Bytes) {\ - /* src is aligned, usual algorithm but with aligned operations.\ - See the SSE2 version for more documentation on the algorithm itself. */\ - const __m128i alphaShuffleMask = _mm_set_epi8(char(0xff),15,char(0xff),15,char(0xff),11,char(0xff),11,char(0xff),7,char(0xff),7,char(0xff),3,char(0xff),3);\ - for (; x < length-3; x += 4) { \ - const __m128i srcVector = _mm_load_si128((const __m128i *)&src[x]); \ - const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); \ - if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { \ - _mm_store_si128((__m128i *)&dst[x], srcVector); \ - } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { \ - __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); \ - alphaChannel = _mm_sub_epi16(one, alphaChannel); \ - const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); \ - __m128i destMultipliedByOneMinusAlpha; \ - BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); \ - const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); \ - _mm_store_si128((__m128i *)&dst[x], result); \ - } \ - } /* end for() */\ - } else if ((length - x) >= 8) {\ - /* We use two vectors to extract the src: prevLoaded for the first pixels, lastLoaded for the current pixels. */\ - __m128i srcVectorPrevLoaded = _mm_load_si128((const __m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes]);\ - const int palignrOffset = minusOffsetToAlignSrcOn16Bytes << 2;\ -\ - const __m128i alphaShuffleMask = _mm_set_epi8(char(0xff),15,char(0xff),15,char(0xff),11,char(0xff),11,char(0xff),7,char(0xff),7,char(0xff),3,char(0xff),3);\ - switch (palignrOffset) {\ - case 4:\ - BLENDING_LOOP(4, length)\ - break;\ - case 8:\ - BLENDING_LOOP(8, length)\ - break;\ - case 12:\ - BLENDING_LOOP(12, length)\ - break;\ - }\ - }\ - for (; x < length; ++x) \ - blend_pixel(dst[x], src[x]); \ +static inline void Q_DECL_VECTORCALL +BLEND_SOURCE_OVER_ARGB32_SSSE3(quint32 *dst, const quint32 *src, int length, + __m128i nullVector, __m128i half, __m128i one, __m128i colorMask, __m128i alphaMask) +{ + int x = 0; + + /* First, get dst aligned. */ + ALIGNMENT_PROLOGUE_16BYTES(dst, x, length) { + blend_pixel(dst[x], src[x]); + } + + const int minusOffsetToAlignSrcOn16Bytes = (reinterpret_cast<quintptr>(&(src[x])) >> 2) & 0x3; + + if (!minusOffsetToAlignSrcOn16Bytes) { + /* src is aligned, usual algorithm but with aligned operations. + See the SSE2 version for more documentation on the algorithm itself. */ + const __m128i alphaShuffleMask = _mm_set_epi8(char(0xff),15,char(0xff),15,char(0xff),11,char(0xff),11,char(0xff),7,char(0xff),7,char(0xff),3,char(0xff),3); + for (; x < length-3; x += 4) { + const __m128i srcVector = _mm_load_si128((const __m128i *)&src[x]); + const __m128i srcVectorAlpha = _mm_and_si128(srcVector, alphaMask); + if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, alphaMask)) == 0xffff) { + _mm_store_si128((__m128i *)&dst[x], srcVector); + } else if (_mm_movemask_epi8(_mm_cmpeq_epi32(srcVectorAlpha, nullVector)) != 0xffff) { + __m128i alphaChannel = _mm_shuffle_epi8(srcVector, alphaShuffleMask); + alphaChannel = _mm_sub_epi16(one, alphaChannel); + const __m128i dstVector = _mm_load_si128((__m128i *)&dst[x]); + __m128i destMultipliedByOneMinusAlpha; + BYTE_MUL_SSE2(destMultipliedByOneMinusAlpha, dstVector, alphaChannel, colorMask, half); + const __m128i result = _mm_add_epi8(srcVector, destMultipliedByOneMinusAlpha); + _mm_store_si128((__m128i *)&dst[x], result); + } + } /* end for() */ + } else if ((length - x) >= 8) { + /* We use two vectors to extract the src: prevLoaded for the first pixels, lastLoaded for the current pixels. */ + __m128i srcVectorPrevLoaded = _mm_load_si128((const __m128i *)&src[x - minusOffsetToAlignSrcOn16Bytes]); + const int palignrOffset = minusOffsetToAlignSrcOn16Bytes << 2; + + const __m128i alphaShuffleMask = _mm_set_epi8(char(0xff),15,char(0xff),15,char(0xff),11,char(0xff),11,char(0xff),7,char(0xff),7,char(0xff),3,char(0xff),3); + switch (palignrOffset) { + case 4: + BLENDING_LOOP(4, length) + break; + case 8: + BLENDING_LOOP(8, length) + break; + case 12: + BLENDING_LOOP(12, length) + break; + } + } + for (; x < length; ++x) + blend_pixel(dst[x], src[x]); } void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl, @@ -185,6 +189,71 @@ const uint * QT_FASTCALL qt_fetchUntransformed_888_ssse3(uint *buffer, const Ope return buffer; } +void qt_memfill24_ssse3(quint24 *dest, quint24 color, qsizetype count) +{ + // LCM of 12 and 16 bytes is 48 bytes (16 px) + quint32 v = color; + __m128i m = _mm_cvtsi32_si128(v); + quint24 *end = dest + count; + + constexpr uchar x = 2, y = 1, z = 0; + Q_DECL_ALIGN(__m128i) static const uchar + shuffleMask[16 + 1] = { x, y, z, x, y, z, x, y, z, x, y, z, x, y, z, x, y }; + + __m128i mval1 = _mm_shuffle_epi8(m, _mm_load_si128(reinterpret_cast<const __m128i *>(shuffleMask))); + __m128i mval2 = _mm_shuffle_epi8(m, _mm_loadu_si128(reinterpret_cast<const __m128i *>(shuffleMask + 1))); + __m128i mval3 = _mm_alignr_epi8(mval2, mval1, 2); + + for ( ; dest + 16 <= end; dest += 16) { +#ifdef __AVX__ + // Store using 32-byte AVX instruction + __m256 mval12 = _mm256_castps128_ps256(_mm_castsi128_ps(mval1)); + mval12 = _mm256_insertf128_ps(mval12, _mm_castsi128_ps(mval2), 1); + _mm256_storeu_ps(reinterpret_cast<float *>(dest), mval12); +#else + _mm_storeu_si128(reinterpret_cast<__m128i *>(dest) + 0, mval1); + _mm_storeu_si128(reinterpret_cast<__m128i *>(dest) + 1, mval2); +#endif + _mm_storeu_si128(reinterpret_cast<__m128i *>(dest) + 2, mval3); + } + + if (count < 3) { + if (count > 1) + end[-2] = v; + if (count) + end[-1] = v; + return; + } + + // less than 16px/48B left + uchar *ptr = reinterpret_cast<uchar *>(dest); + uchar *ptr_end = reinterpret_cast<uchar *>(end); + qptrdiff left = ptr_end - ptr; + if (left >= 24) { + // 8px/24B or more left + _mm_storeu_si128(reinterpret_cast<__m128i *>(ptr) + 0, mval1); + _mm_storel_epi64(reinterpret_cast<__m128i *>(ptr) + 1, mval2); + ptr += 24; + left -= 24; + } + + // less than 8px/24B left + + if (left >= 16) { + // but more than 5px/15B left + _mm_storeu_si128(reinterpret_cast<__m128i *>(ptr) , mval1); + } else if (left >= 8) { + // but more than 2px/6B left + _mm_storel_epi64(reinterpret_cast<__m128i *>(ptr), mval1); + } + + if (left) { + // 1 or 2px left + // store 8 bytes ending with the right values (will overwrite a bit) + _mm_storel_epi64(reinterpret_cast<__m128i *>(ptr_end - 8), mval2); + } +} + QT_END_NAMESPACE #endif // QT_COMPILER_SUPPORTS_SSSE3 diff --git a/src/gui/painting/qdrawhelper_x86_p.h b/src/gui/painting/qdrawhelper_x86_p.h index cefc213999..5749d8c9fb 100644 --- a/src/gui/painting/qdrawhelper_x86_p.h +++ b/src/gui/painting/qdrawhelper_x86_p.h @@ -57,8 +57,8 @@ QT_BEGIN_NAMESPACE #ifdef __SSE2__ -void qt_memfill32(quint32 *dest, quint32 value, int count); -void qt_memfill16(quint16 *dest, quint16 value, int count); +void qt_memfill64_sse2(quint64 *dest, quint64 value, qsizetype count); +void qt_memfill32_sse2(quint32 *dest, quint32 value, qsizetype count); void qt_bitmapblit32_sse2(QRasterBuffer *rasterBuffer, int x, int y, const QRgba64 &color, const uchar *src, int width, int height, int stride); @@ -79,6 +79,9 @@ void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl, extern CompositionFunction qt_functionForMode_SSE2[]; extern CompositionFunctionSolid qt_functionForModeSolid_SSE2[]; + +void qt_memfill64_avx2(quint64 *dest, quint64 value, qsizetype count); +void qt_memfill32_avx2(quint32 *dest, quint32 value, qsizetype count); #endif // __SSE2__ static const int numCompositionFunctions = 38; diff --git a/src/gui/painting/qdrawingprimitive_sse2_p.h b/src/gui/painting/qdrawingprimitive_sse2_p.h index b237ea1611..cc8d230fa8 100644 --- a/src/gui/painting/qdrawingprimitive_sse2_p.h +++ b/src/gui/painting/qdrawingprimitive_sse2_p.h @@ -42,7 +42,7 @@ #include <QtGui/private/qtguiglobal_p.h> #include <private/qsimd_p.h> -#include "qdrawhelper_p.h" +#include "qdrawhelper_x86_p.h" #include "qrgba64_p.h" #ifdef __SSE2__ @@ -232,7 +232,7 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE #if QT_COMPILER_SUPPORTS_HERE(SSE4_1) QT_FUNCTION_TARGET(SSE2) -Q_ALWAYS_INLINE void reciprocal_mul_ss(__m128 &ia, const __m128 a, float mul) +Q_ALWAYS_INLINE void Q_DECL_VECTORCALL reciprocal_mul_ss(__m128 &ia, const __m128 a, float mul) { ia = _mm_rcp_ss(a); // Approximate 1/a // Improve precision of ia using Newton-Raphson diff --git a/src/gui/painting/qimagescale_sse4.cpp b/src/gui/painting/qimagescale_sse4.cpp index 34d6b3882e..5861a2e2ff 100644 --- a/src/gui/painting/qimagescale_sse4.cpp +++ b/src/gui/painting/qimagescale_sse4.cpp @@ -39,6 +39,7 @@ #include "qimagescale_p.h" #include "qimage.h" +#include <private/qdrawhelper_x86_p.h> #include <private/qsimd_p.h> #if defined(QT_COMPILER_SUPPORTS_SSE4_1) @@ -47,7 +48,8 @@ QT_BEGIN_NAMESPACE using namespace QImageScale; -inline static __m128i qt_qimageScaleAARGBA_helper(const unsigned int *pix, int xyap, int Cxy, int step, const __m128i vxyap, const __m128i vCxy) +inline static __m128i Q_DECL_VECTORCALL +qt_qimageScaleAARGBA_helper(const unsigned int *pix, int xyap, int Cxy, int step, const __m128i vxyap, const __m128i vCxy) { __m128i vpix = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(*pix)); __m128i vx = _mm_mullo_epi32(vpix, vxyap); diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp index 43aeff3268..9cb787fb2c 100644 --- a/src/gui/painting/qmemrotate.cpp +++ b/src/gui/painting/qmemrotate.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE static const int tileSize = 32; template <class T> -Q_STATIC_TEMPLATE_FUNCTION +static inline void qt_memrotate90_tiled(const T *src, int w, int h, int sstride, T *dest, int dstride) { sstride /= sizeof(T); @@ -103,7 +103,7 @@ inline void qt_memrotate90_tiled(const T *src, int w, int h, int sstride, T *des } template <class T> -Q_STATIC_TEMPLATE_FUNCTION +static inline void qt_memrotate90_tiled_unpacked(const T *src, int w, int h, int sstride, T *dest, int dstride) { @@ -131,7 +131,7 @@ inline void qt_memrotate90_tiled_unpacked(const T *src, int w, int h, int sstrid } template <class T> -Q_STATIC_TEMPLATE_FUNCTION +static inline void qt_memrotate270_tiled(const T *src, int w, int h, int sstride, T *dest, int dstride) { sstride /= sizeof(T); @@ -190,7 +190,7 @@ inline void qt_memrotate270_tiled(const T *src, int w, int h, int sstride, T *de } template <class T> -Q_STATIC_TEMPLATE_FUNCTION +static inline void qt_memrotate270_tiled_unpacked(const T *src, int w, int h, int sstride, T *dest, int dstride) { @@ -219,7 +219,7 @@ inline void qt_memrotate270_tiled_unpacked(const T *src, int w, int h, int sstri template <class T> -Q_STATIC_TEMPLATE_FUNCTION +static inline void qt_memrotate90_template(const T *src, int srcWidth, int srcHeight, int srcStride, T *dest, int dstStride) { @@ -246,7 +246,7 @@ inline void qt_memrotate90_template<quint64>(const quint64 *src, int w, int h, i } template <class T> -Q_STATIC_TEMPLATE_FUNCTION +static inline void qt_memrotate180_template(const T *src, int w, int h, int sstride, T *dest, int dstride) { const char *s = (const char*)(src) + (h - 1) * sstride; @@ -261,7 +261,7 @@ inline void qt_memrotate180_template(const T *src, int w, int h, int sstride, T } template <class T> -Q_STATIC_TEMPLATE_FUNCTION +static inline void qt_memrotate270_template(const T *src, int srcWidth, int srcHeight, int srcStride, T *dest, int dstStride) { diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 90b6d16551..0f5c7756ad 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -873,7 +873,7 @@ void QRasterPaintEngine::updateRasterState() && s->intOpacity == 256 && (mode == QPainter::CompositionMode_Source || (mode == QPainter::CompositionMode_SourceOver - && s->penData.solid.color.isOpaque())); + && s->penData.solidColor.isOpaque())); } s->dirty = 0; @@ -1536,9 +1536,9 @@ static void fillRect_normalized(const QRect &r, QSpanData *data, if (data->fillRect && (mode == QPainter::CompositionMode_Source || (mode == QPainter::CompositionMode_SourceOver - && data->solid.color.isOpaque()))) + && data->solidColor.isOpaque()))) { - data->fillRect(data->rasterBuffer, x1, y1, width, height, data->solid.color); + data->fillRect(data->rasterBuffer, x1, y1, width, height, data->solidColor); return; } } @@ -1900,9 +1900,9 @@ void QRasterPaintEngine::fillRect(const QRectF &r, const QColor &color) Q_D(QRasterPaintEngine); QRasterPaintEngineState *s = state(); - d->solid_color_filler.solid.color = qPremultiply(combineAlpha256(color.rgba64(), s->intOpacity)); + d->solid_color_filler.solidColor = qPremultiply(combineAlpha256(color.rgba64(), s->intOpacity)); - if (d->solid_color_filler.solid.color.isTransparent() + if (d->solid_color_filler.solidColor.isTransparent() && s->composition_mode == QPainter::CompositionMode_SourceOver) { return; } @@ -2356,14 +2356,14 @@ void QRasterPaintEngine::drawImage(const QRectF &r, const QImage &img, const QRe case QImage::Format_A2BGR30_Premultiplied: case QImage::Format_A2RGB30_Premultiplied: // Combine premultiplied color with the opacity set on the painter. - d->solid_color_filler.solid.color = multiplyAlpha256(QRgba64::fromArgb32(color), s->intOpacity); + d->solid_color_filler.solidColor = multiplyAlpha256(QRgba64::fromArgb32(color), s->intOpacity); break; default: - d->solid_color_filler.solid.color = qPremultiply(combineAlpha256(QRgba64::fromArgb32(color), s->intOpacity)); + d->solid_color_filler.solidColor = qPremultiply(combineAlpha256(QRgba64::fromArgb32(color), s->intOpacity)); break; } - if (d->solid_color_filler.solid.color.isTransparent() && s->composition_mode == QPainter::CompositionMode_SourceOver) + if (d->solid_color_filler.solidColor.isTransparent() && s->composition_mode == QPainter::CompositionMode_SourceOver) return; d->solid_color_filler.clip = d->clip(); @@ -2713,20 +2713,20 @@ void QRasterPaintEngine::alphaPenBlt(const void* src, int bpl, int depth, int rx if (unclipped) { if (depth == 1) { if (s->penData.bitmapBlit) { - s->penData.bitmapBlit(rb, rx, ry, s->penData.solid.color, + s->penData.bitmapBlit(rb, rx, ry, s->penData.solidColor, scanline, w, h, bpl); return; } } else if (depth == 8) { if (s->penData.alphamapBlit) { - s->penData.alphamapBlit(rb, rx, ry, s->penData.solid.color, + s->penData.alphamapBlit(rb, rx, ry, s->penData.solidColor, scanline, w, h, bpl, 0, useGammaCorrection); return; } } else if (depth == 32) { // (A)RGB Alpha mask where the alpha component is not used. if (s->penData.alphaRGBBlit) { - s->penData.alphaRGBBlit(rb, rx, ry, s->penData.solid.color, + s->penData.alphaRGBBlit(rb, rx, ry, s->penData.solidColor, (const uint *) scanline, w, h, bpl / 4, 0, useGammaCorrection); return; } @@ -2755,10 +2755,10 @@ void QRasterPaintEngine::alphaPenBlt(const void* src, int bpl, int depth, int rx ry = ny; } if (depth == 8) - s->penData.alphamapBlit(rb, rx, ry, s->penData.solid.color, + s->penData.alphamapBlit(rb, rx, ry, s->penData.solidColor, scanline, w, h, bpl, clip, useGammaCorrection); else if (depth == 32) - s->penData.alphaRGBBlit(rb, rx, ry, s->penData.solid.color, + s->penData.alphaRGBBlit(rb, rx, ry, s->penData.solidColor, (const uint *) scanline, w, h, bpl / 4, clip, useGammaCorrection); return; } @@ -3835,7 +3835,6 @@ QImage::Format QRasterBuffer::prepare(QImage *image) bytes_per_line = image->bytesPerLine(); format = image->format(); - drawHelper = qDrawHelper + format; if (image->depth() == 1 && image->colorTable().size() == 2) { monoDestinationWithClut = true; const QVector<QRgb> colorTable = image->colorTable(); @@ -3883,51 +3882,15 @@ void QClipData::initialize() Q_CHECK_PTR(m_clipLines); QT_TRY { - m_spans = (QSpan *)malloc(clipSpanHeight*sizeof(QSpan)); allocated = clipSpanHeight; - Q_CHECK_PTR(m_spans); - QT_TRY { - if (hasRectClip) { - int y = 0; - while (y < ymin) { - m_clipLines[y].spans = 0; - m_clipLines[y].count = 0; - ++y; - } - - const int len = clipRect.width(); - count = 0; - while (y < ymax) { - QSpan *span = m_spans + count; - span->x = xmin; - span->len = len; - span->y = y; - span->coverage = 255; - ++count; - - m_clipLines[y].spans = span; - m_clipLines[y].count = 1; - ++y; - } - - while (y < clipSpanHeight) { - m_clipLines[y].spans = 0; - m_clipLines[y].count = 0; - ++y; - } - } else if (hasRegionClip) { - + if (hasRegionClip) { const auto rects = clipRegion.begin(); const int numRects = clipRegion.rectCount(); - - { // resize - const int maxSpans = (ymax - ymin) * numRects; - if (maxSpans > allocated) { - m_spans = q_check_ptr((QSpan *)realloc(m_spans, maxSpans * sizeof(QSpan))); - allocated = maxSpans; - } - } + const int maxSpans = (ymax - ymin) * numRects; + allocated = qMax(allocated, maxSpans); + m_spans = (QSpan *)malloc(allocated * sizeof(QSpan)); + Q_CHECK_PTR(m_spans); int y = 0; int firstInBand = 0; @@ -3974,6 +3937,40 @@ void QClipData::initialize() ++y; } + return; + } + + m_spans = (QSpan *)malloc(allocated * sizeof(QSpan)); + Q_CHECK_PTR(m_spans); + + if (hasRectClip) { + int y = 0; + while (y < ymin) { + m_clipLines[y].spans = 0; + m_clipLines[y].count = 0; + ++y; + } + + const int len = clipRect.width(); + count = 0; + while (y < ymax) { + QSpan *span = m_spans + count; + span->x = xmin; + span->len = len; + span->y = y; + span->coverage = 255; + ++count; + + m_clipLines[y].spans = span; + m_clipLines[y].count = 1; + ++y; + } + + while (y < clipSpanHeight) { + m_clipLines[y].spans = 0; + m_clipLines[y].count = 0; + ++y; + } } } QT_CATCH(...) { free(m_spans); // have to free m_spans again or someone might think that we were successfully initialized. @@ -4596,8 +4593,8 @@ void QSpanData::setup(const QBrush &brush, int alpha, QPainter::CompositionMode case Qt::SolidPattern: { type = Solid; QColor c = qbrush_color(brush); - solid.color = qPremultiply(combineAlpha256(c.rgba64(), alpha)); - if (solid.color.isTransparent() && compositionMode == QPainter::CompositionMode_SourceOver) + solidColor = qPremultiply(combineAlpha256(c.rgba64(), alpha)); + if (solidColor.isTransparent() && compositionMode == QPainter::CompositionMode_SourceOver) type = None; break; } @@ -4723,17 +4720,19 @@ void QSpanData::adjustSpanMethods() case None: unclipped_blend = 0; break; - case Solid: - unclipped_blend = rasterBuffer->drawHelper->blendColor; - bitmapBlit = rasterBuffer->drawHelper->bitmapBlit; - alphamapBlit = rasterBuffer->drawHelper->alphamapBlit; - alphaRGBBlit = rasterBuffer->drawHelper->alphaRGBBlit; - fillRect = rasterBuffer->drawHelper->fillRect; + case Solid: { + const DrawHelper &drawHelper = qDrawHelper[rasterBuffer->format]; + unclipped_blend = drawHelper.blendColor; + bitmapBlit = drawHelper.bitmapBlit; + alphamapBlit = drawHelper.alphamapBlit; + alphaRGBBlit = drawHelper.alphaRGBBlit; + fillRect = drawHelper.fillRect; break; + } case LinearGradient: case RadialGradient: case ConicalGradient: - unclipped_blend = rasterBuffer->drawHelper->blendGradient; + unclipped_blend = qBlendGradient; break; case Texture: unclipped_blend = qBlendTexture; diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 14eddf07b1..881144d1c2 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -471,7 +471,6 @@ public: QPainter::CompositionMode compositionMode; QImage::Format format; - DrawHelper *drawHelper; QImage colorizeBitmap(const QImage &image, const QColor &color); private: diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index f4cbf15fc7..22d3fb3001 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -439,6 +439,9 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) } } + if (d->activeStroker == &d->stroker) + d->stroker.setForceOpen(path.hasExplicitOpen()); + const QPainterPath::ElementType *types = path.elements(); const qreal *points = path.points(); int pointCount = path.elementCount(); @@ -1097,7 +1100,7 @@ bool QPaintEngineEx::shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTran }(), 2); qreal pixelSize = fontEngine->fontDef.pixelSize; - return (pixelSize * pixelSize * qAbs(m.determinant())) < maxCachedGlyphSizeSquared; + return (pixelSize * pixelSize * qAbs(m.determinant())) <= maxCachedGlyphSizeSquared; } QT_END_NAMESPACE diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index b70b29e54e..570f750645 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -1437,6 +1437,13 @@ void QPainterPrivate::updateState(QPainterState *newState) by slightly less than half a pixel. Also will treat default constructed pens as cosmetic. Potentially useful when porting a Qt 4 application to Qt 5. + \value LosslessImageRendering Use a lossless image rendering, whenever possible. + Currently, this hint is only used when QPainter is employed to output a PDF + file through QPrinter or QPdfWriter, where drawImage()/drawPixmap() calls + will encode images using a lossless compression algorithm instead of lossy + JPEG compression. + This value was added in Qt 5.13. + \sa renderHints(), setRenderHint(), {QPainter#Rendering Quality}{Rendering Quality}, {Concentric Circles Example} @@ -1514,7 +1521,7 @@ QPainter::~QPainter() /*! Returns the paint device on which this painter is currently - painting, or 0 if the painter is not active. + painting, or \nullptr if the painter is not active. \sa isActive() */ @@ -1540,6 +1547,7 @@ bool QPainter::isActive() const return d->engine; } +#if QT_DEPRECATED_SINCE(5, 13) /*! Initializes the painters pen, background and font to the same as the given \a device. @@ -1567,7 +1575,7 @@ void QPainter::initFrom(const QPaintDevice *device) d->engine->setDirty(QPaintEngine::DirtyFont); } } - +#endif /*! Saves the current painter state (pushes the state onto a stack). A @@ -2878,6 +2886,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op) d->updateState(d->state); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \since 4.2 \obsolete @@ -2972,7 +2981,10 @@ void QPainter::setMatrix(const QMatrix &matrix, bool combine) const QMatrix &QPainter::matrix() const { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED return worldMatrix(); +QT_WARNING_POP } @@ -3041,7 +3053,7 @@ void QPainter::resetMatrix() { resetTransform(); } - +#endif /*! \since 4.2 @@ -3092,6 +3104,7 @@ bool QPainter::worldMatrixEnabled() const return d->state->WxF; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -3117,6 +3130,7 @@ bool QPainter::matrixEnabled() const { return worldMatrixEnabled(); } +#endif /*! Scales the coordinate system by (\a{sx}, \a{sy}). @@ -4175,6 +4189,7 @@ void QPainter::drawRoundedRect(const QRectF &rect, qreal xRadius, qreal yRadius, Draws the given rectangle \a x, \a y, \a w, \a h with rounded corners. */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -4202,6 +4217,10 @@ void QPainter::drawRoundRect(const QRectF &r, int xRnd, int yRnd) Draws the rectangle \a r with rounded corners. */ +void QPainter::drawRoundRect(const QRect &rect, int xRnd, int yRnd) +{ + drawRoundRect(QRectF(rect), xRnd, yRnd); +} /*! \obsolete @@ -4212,6 +4231,11 @@ void QPainter::drawRoundRect(const QRectF &r, int xRnd, int yRnd) Draws the rectangle \a x, \a y, \a w, \a h with rounded corners. */ +void QPainter::drawRoundRect(int x, int y, int w, int h, int xRnd, int yRnd) +{ + drawRoundRect(QRectF(x, y, w, h), xRnd, yRnd); +} +#endif /*! \fn void QPainter::drawEllipse(const QRectF &rectangle) @@ -6203,7 +6227,7 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen) % HexString<qreal>(pen.widthF()); QPixmap pixmap; - if (QPixmapCache::find(key, pixmap)) + if (QPixmapCache::find(key, &pixmap)) return pixmap; const qreal halfPeriod = qMax(qreal(2), qreal(radiusBase * 1.61803399)); // the golden ratio @@ -7371,6 +7395,7 @@ void QPainter::setViewTransformEnabled(bool enable) d->updateMatrix(); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \threadsafe @@ -7451,6 +7476,7 @@ QPaintDevice *QPainter::redirected(const QPaintDevice *device, QPoint *offset) Q_UNUSED(offset) return 0; } +#endif void qt_format_text(const QFont &fnt, const QRectF &_r, int tf, const QString& str, QRectF *brect, @@ -8060,6 +8086,7 @@ QFont QPaintEngineState::font() const return static_cast<const QPainterState *>(this)->font; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \since 4.2 \obsolete @@ -8082,6 +8109,7 @@ QMatrix QPaintEngineState::matrix() const return st->matrix.toAffine(); } +#endif /*! \since 4.3 diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index 482f5fb63d..843f24e3e1 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -91,7 +91,8 @@ public: SmoothPixmapTransform = 0x04, HighQualityAntialiasing = 0x08, NonCosmeticDefaultPen = 0x10, - Qt4CompatiblePainting = 0x20 + Qt4CompatiblePainting = 0x20, + LosslessImageRendering = 0x40, }; Q_FLAG(RenderHint) @@ -131,7 +132,10 @@ public: bool end(); bool isActive() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use begin(QPaintDevice*) instead") void initFrom(const QPaintDevice *device); +#endif enum CompositionMode { CompositionMode_SourceOver, @@ -231,28 +235,40 @@ public: void restore(); // XForm functions +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setTransform() instead") void setMatrix(const QMatrix &matrix, bool combine = false); + QT_DEPRECATED_X("Use transform() instead") const QMatrix &matrix() const; + QT_DEPRECATED_X("Use deviceTransform() instead") const QMatrix &deviceMatrix() const; + QT_DEPRECATED_X("Use resetTransform() instead") void resetMatrix(); +#endif void setTransform(const QTransform &transform, bool combine = false); const QTransform &transform() const; const QTransform &deviceTransform() const; void resetTransform(); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setWorldTransform() instead") void setWorldMatrix(const QMatrix &matrix, bool combine = false); + QT_DEPRECATED_X("Use worldTransform() instead") const QMatrix &worldMatrix() const; + QT_DEPRECATED_X("Use combinedTransform() instead") + QMatrix combinedMatrix() const; + QT_DEPRECATED_X("Use setWorldMatrixEnabled() instead") + void setMatrixEnabled(bool enabled); + QT_DEPRECATED_X("Use worldMatrixEnabled() instead") + bool matrixEnabled() const; +#endif void setWorldTransform(const QTransform &matrix, bool combine = false); const QTransform &worldTransform() const; - QMatrix combinedMatrix() const; QTransform combinedTransform() const; - void setMatrixEnabled(bool enabled); - bool matrixEnabled() const; - void setWorldMatrixEnabled(bool enabled); bool worldMatrixEnabled() const; @@ -354,9 +370,14 @@ public: inline void drawRoundedRect(const QRect &rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use drawRoundedRect(..., Qt::RelativeSize) instead") void drawRoundRect(const QRectF &r, int xround = 25, int yround = 25); - inline void drawRoundRect(int x, int y, int w, int h, int = 25, int = 25); - inline void drawRoundRect(const QRect &r, int xround = 25, int yround = 25); + QT_DEPRECATED_X("Use drawRoundedRect(..., Qt::RelativeSize) instead") + void drawRoundRect(int x, int y, int w, int h, int = 25, int = 25); + QT_DEPRECATED_X("Use drawRoundedRect(..., Qt::RelativeSize) instead") + void drawRoundRect(const QRect &r, int xround = 25, int yround = 25); +#endif void drawTiledPixmap(const QRectF &rect, const QPixmap &pm, const QPointF &offset = QPointF()); inline void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &, int sx=0, int sy=0); @@ -463,10 +484,15 @@ public: QPaintEngine *paintEngine() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QWidget::render() instead") static void setRedirected(const QPaintDevice *device, QPaintDevice *replacement, const QPoint& offset = QPoint()); + QT_DEPRECATED_X("Use QWidget::render() instead") static QPaintDevice *redirected(const QPaintDevice *device, QPoint *offset = nullptr); + QT_DEPRECATED_X("Use QWidget::render() instead") static void restoreRedirected(const QPaintDevice *device); +#endif void beginNativePainting(); void endNativePainting(); @@ -628,16 +654,6 @@ inline void QPainter::drawPoints(const QPolygon &points) drawPoints(points.constData(), points.size()); } -inline void QPainter::drawRoundRect(int x, int y, int w, int h, int xRnd, int yRnd) -{ - drawRoundRect(QRectF(x, y, w, h), xRnd, yRnd); -} - -inline void QPainter::drawRoundRect(const QRect &rect, int xRnd, int yRnd) -{ - drawRoundRect(QRectF(rect), xRnd, yRnd); -} - inline void QPainter::drawRoundedRect(int x, int y, int w, int h, qreal xRadius, qreal yRadius, Qt::SizeMode mode) { diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h index 2d44577310..930180e9fa 100644 --- a/src/gui/painting/qpainter_p.h +++ b/src/gui/painting/qpainter_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtCore/qvarlengtharray.h> #include <QtGui/private/qtguiglobal_p.h> #include "QtGui/qbrush.h" #include "QtGui/qfont.h" @@ -202,7 +203,7 @@ public: QPainterPrivate **d_ptrs; QPainterState *state; - QVector<QPainterState*> states; + QVarLengthArray<QPainterState *, 8> states; mutable QPainterDummyState *dummyState; diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index c5ccf0003d..cb8bb9dfcf 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -629,6 +629,55 @@ QPainterPath::~QPainterPath() } /*! + Clears the path elements stored. + + This allows the path to reuse previous memory allocations. + + \sa reserve(), capacity() + \since 5.13 +*/ +void QPainterPath::clear() +{ + if (!d_ptr) + return; + + detach(); + d_func()->clear(); +} + +/*! + Reserves a given amount of elements in QPainterPath's internal memory. + + Attempts to allocate memory for at least \a size elements. + + \sa clear(), capacity(), QVector::reserve() + \since 5.13 +*/ +void QPainterPath::reserve(int size) +{ + Q_D(QPainterPath); + if ((!d && size > 0) || (d && d->elements.capacity() < size)) { + detach(); + d->elements.reserve(size); + } +} + +/*! + Returns the number of elements allocated by the QPainterPath. + + \sa clear(), reserve() + \since 5.13 +*/ +int QPainterPath::capacity() const +{ + Q_D(QPainterPath); + if (d) + return d->elements.capacity(); + + return 0; +} + +/*! Closes the current subpath by drawing a line to the beginning of the subpath, automatically starting a new path. The current point of the new path is (0, 0). @@ -2271,13 +2320,19 @@ static inline bool epsilonCompare(const QPointF &a, const QPointF &b, const QSiz bool QPainterPath::operator==(const QPainterPath &path) const { QPainterPathData *d = reinterpret_cast<QPainterPathData *>(d_func()); - if (path.d_func() == d) + QPainterPathData *other_d = path.d_func(); + if (other_d == d) return true; - else if (!d || !path.d_func()) + else if (!d || !other_d) { + if (!d && other_d->elements.empty() && other_d->fillRule == Qt::OddEvenFill) + return true; + if (!other_d && d && d->elements.empty() && d->fillRule == Qt::OddEvenFill) + return true; return false; - else if (d->fillRule != path.d_func()->fillRule) + } + else if (d->fillRule != other_d->fillRule) return false; - else if (d->elements.size() != path.d_func()->elements.size()) + else if (d->elements.size() != other_d->elements.size()) return false; const qreal qt_epsilon = sizeof(qreal) == sizeof(double) ? 1e-12 : qreal(1e-5); @@ -2287,8 +2342,8 @@ bool QPainterPath::operator==(const QPainterPath &path) const epsilon.rheight() *= qt_epsilon; for (int i = 0; i < d->elements.size(); ++i) - if (d->elements.at(i).type != path.d_func()->elements.at(i).type - || !epsilonCompare(d->elements.at(i), path.d_func()->elements.at(i), epsilon)) + if (d->elements.at(i).type != other_d->elements.at(i).type + || !epsilonCompare(d->elements.at(i), other_d->elements.at(i), epsilon)) return false; return true; @@ -3187,6 +3242,7 @@ void QPainterPath::addRoundedRect(const QRectF &rect, qreal xRadius, qreal yRadi Adds the given rectangle \a x, \a y, \a w, \a h with rounded corners to the path. */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -3253,6 +3309,17 @@ void QPainterPath::addRoundRect(const QRectF &r, int xRnd, int yRnd) \sa addRoundedRect() */ +void QPainterPath::addRoundRect(const QRectF &rect, + int roundness) +{ + int xRnd = roundness; + int yRnd = roundness; + if (rect.width() > rect.height()) + xRnd = int(roundness * rect.height()/rect.width()); + else + yRnd = int(roundness * rect.width()/rect.height()); + addRoundRect(rect, xRnd, yRnd); +} /*! \obsolete @@ -3269,6 +3336,11 @@ void QPainterPath::addRoundRect(const QRectF &r, int xRnd, int yRnd) \sa addRoundedRect() */ +void QPainterPath::addRoundRect(qreal x, qreal y, qreal w, qreal h, + int xRnd, int yRnd) +{ + addRoundRect(QRectF(x, y, w, h), xRnd, yRnd); +} /*! \obsolete @@ -3288,6 +3360,12 @@ void QPainterPath::addRoundRect(const QRectF &r, int xRnd, int yRnd) \sa addRoundedRect() */ +void QPainterPath::addRoundRect(qreal x, qreal y, qreal w, qreal h, + int roundness) +{ + addRoundRect(QRectF(x, y, w, h), roundness); +} +#endif /*! \since 4.3 @@ -3342,6 +3420,7 @@ QPainterPath QPainterPath::subtracted(const QPainterPath &p) const return clipper.clip(QPathClipper::BoolSub); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \since 4.3 \obsolete @@ -3354,6 +3433,7 @@ QPainterPath QPainterPath::subtractedInverted(const QPainterPath &p) const { return p.subtracted(*this); } +#endif /*! \since 4.4 diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index db39c1c5a0..a69a192767 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -97,8 +97,13 @@ public: { qSwap(d_ptr, other.d_ptr); return *this; } #endif ~QPainterPath(); + inline void swap(QPainterPath &other) Q_DECL_NOEXCEPT { d_ptr.swap(other.d_ptr); } + void clear(); + void reserve(int size); + int capacity() const; + void closeSubpath(); void moveTo(const QPointF &p); @@ -138,12 +143,18 @@ public: qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead") void addRoundRect(const QRectF &rect, int xRnd, int yRnd); - inline void addRoundRect(qreal x, qreal y, qreal w, qreal h, - int xRnd, int yRnd); - inline void addRoundRect(const QRectF &rect, int roundness); - inline void addRoundRect(qreal x, qreal y, qreal w, qreal h, - int roundness); + QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead") + void addRoundRect(qreal x, qreal y, qreal w, qreal h, + int xRnd, int yRnd); + QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead") + void addRoundRect(const QRectF &rect, int roundness); + QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead") + void addRoundRect(qreal x, qreal y, qreal w, qreal h, + int roundness); +#endif void connectPath(const QPainterPath &path); @@ -188,7 +199,10 @@ public: Q_REQUIRED_RESULT QPainterPath united(const QPainterPath &r) const; Q_REQUIRED_RESULT QPainterPath intersected(const QPainterPath &r) const; Q_REQUIRED_RESULT QPainterPath subtracted(const QPainterPath &r) const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use r.subtracted() instead") Q_REQUIRED_RESULT QPainterPath subtractedInverted(const QPainterPath &r) const; +#endif Q_REQUIRED_RESULT QPainterPath simplified() const; @@ -333,30 +347,6 @@ inline void QPainterPath::addRoundedRect(qreal x, qreal y, qreal w, qreal h, addRoundedRect(QRectF(x, y, w, h), xRadius, yRadius, mode); } -inline void QPainterPath::addRoundRect(qreal x, qreal y, qreal w, qreal h, - int xRnd, int yRnd) -{ - addRoundRect(QRectF(x, y, w, h), xRnd, yRnd); -} - -inline void QPainterPath::addRoundRect(const QRectF &rect, - int roundness) -{ - int xRnd = roundness; - int yRnd = roundness; - if (rect.width() > rect.height()) - xRnd = int(roundness * rect.height()/rect.width()); - else - yRnd = int(roundness * rect.width()/rect.height()); - addRoundRect(rect, xRnd, yRnd); -} - -inline void QPainterPath::addRoundRect(qreal x, qreal y, qreal w, qreal h, - int roundness) -{ - addRoundRect(QRectF(x, y, w, h), roundness); -} - inline void QPainterPath::addText(qreal x, qreal y, const QFont &f, const QString &text) { addText(QPointF(x, y), f, text); diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h index 92d9a4ea66..a36c8005bc 100644 --- a/src/gui/painting/qpainterpath_p.h +++ b/src/gui/painting/qpainterpath_p.h @@ -157,7 +157,7 @@ public: QVectorPath path; private: - Q_DISABLE_COPY(QVectorPathConverter) + Q_DISABLE_COPY_MOVE(QVectorPathConverter) }; class QPainterPathData : public QPainterPathPrivate @@ -194,6 +194,7 @@ public: inline bool isClosed() const; inline void close(); inline void maybeMoveTo(); + inline void clear(); const QVectorPath &vectorPath() { if (!pathConverter) @@ -290,6 +291,25 @@ inline void QPainterPathData::maybeMoveTo() } } +inline void QPainterPathData::clear() +{ + Q_ASSERT(ref.load() == 1); + + elements.clear(); + + cStart = 0; + + bounds = {}; + controlBounds = {}; + + require_moveTo = false; + dirtyBounds = false; + dirtyControlBounds = false; + convex = false; + + delete pathConverter; + pathConverter = nullptr; +} #define KAPPA qreal(0.5522847498) diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h index 64e684e1ad..c25a479807 100644 --- a/src/gui/painting/qpathclipper_p.h +++ b/src/gui/painting/qpathclipper_p.h @@ -86,7 +86,7 @@ public: static QPainterPath intersect(const QPainterPath &path, const QRectF &rect); private: - Q_DISABLE_COPY(QPathClipper) + Q_DISABLE_COPY_MOVE(QPathClipper) enum ClipperMode { ClipMode, // do the full clip diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index ae3df6f9ec..b23cc903b1 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -856,7 +856,6 @@ void QPdfEngine::drawRects (const QRectF *rects, int rectCount) if (!d->hasPen && !d->hasBrush) return; - QBrush penBrush = d->pen.brush(); if (d->simplePen || !d->hasPen) { // draw strokes natively in this case for better output if(!d->simplePen && !d->stroker.matrix.isIdentity()) @@ -949,7 +948,8 @@ void QPdfEngine::drawPixmap (const QRectF &rectangle, const QPixmap &pixmap, con QPixmap pm = sourceRect != pixmap.rect() ? pixmap.copy(sourceRect) : pixmap; QImage image = pm.toImage(); bool bitmap = true; - const int object = d->addImage(image, &bitmap, pm.cacheKey()); + const bool lossless = painter()->testRenderHint(QPainter::LosslessImageRendering); + const int object = d->addImage(image, &bitmap, lossless, pm.cacheKey()); if (object < 0) return; @@ -988,7 +988,8 @@ void QPdfEngine::drawImage(const QRectF &rectangle, const QImage &image, const Q QRect sourceRect = sr.toRect(); QImage im = sourceRect != image.rect() ? image.copy(sourceRect) : image; bool bitmap = true; - const int object = d->addImage(im, &bitmap, im.cacheKey()); + const bool lossless = painter()->testRenderHint(QPainter::LosslessImageRendering); + const int object = d->addImage(im, &bitmap, lossless, im.cacheKey()); if (object < 0) return; @@ -2633,6 +2634,8 @@ int QPdfEnginePrivate::addConstantAlphaObject(int brushAlpha, int penAlpha) int QPdfEnginePrivate::addBrushPattern(const QTransform &m, bool *specifyColor, int *gStateObject) { + Q_Q(QPdfEngine); + int paintType = 2; // Uncolored tiling int w = 8; int h = 8; @@ -2662,7 +2665,8 @@ int QPdfEnginePrivate::addBrushPattern(const QTransform &m, bool *specifyColor, return 0; QImage image = brush.textureImage(); bool bitmap = true; - imageObject = addImage(image, &bitmap, image.cacheKey()); + const bool lossless = q->painter()->testRenderHint(QPainter::LosslessImageRendering); + imageObject = addImage(image, &bitmap, lossless, image.cacheKey()); if (imageObject != -1) { QImage::Format f = image.format(); if (f != QImage::Format_MonoLSB && f != QImage::Format_Mono) { @@ -2724,7 +2728,7 @@ static inline bool is_monochrome(const QVector<QRgb> &colorTable) /*! * Adds an image to the pdf and return the pdf-object id. Returns -1 if adding the image failed. */ -int QPdfEnginePrivate::addImage(const QImage &img, bool *bitmap, qint64 serial_no) +int QPdfEnginePrivate::addImage(const QImage &img, bool *bitmap, bool lossless, qint64 serial_no) { if (img.isNull()) return -1; @@ -2785,7 +2789,7 @@ int QPdfEnginePrivate::addImage(const QImage &img, bool *bitmap, qint64 serial_n bool hasAlpha = false; bool hasMask = false; - if (QImageWriter::supportedImageFormats().contains("jpeg") && !grayscale) { + if (QImageWriter::supportedImageFormats().contains("jpeg") && !grayscale && !lossless) { QBuffer buffer(&imageData); QImageWriter writer(&buffer, "jpeg"); writer.setQuality(94); diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h index e2526de67d..e337c61f64 100644 --- a/src/gui/painting/qpdf_p.h +++ b/src/gui/painting/qpdf_p.h @@ -242,7 +242,7 @@ public: void writeHeader(); void writeTail(); - int addImage(const QImage &image, bool *bitmap, qint64 serial_no); + int addImage(const QImage &image, bool *bitmap, bool lossless, qint64 serial_no); int addConstantAlphaObject(int brushAlpha, int penAlpha = 255); int addBrushPattern(const QTransform &matrix, bool *specifyColor, int *gStateObject); diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp index 6c85d65538..258939a763 100644 --- a/src/gui/painting/qpdfwriter.cpp +++ b/src/gui/painting/qpdfwriter.cpp @@ -76,7 +76,7 @@ public: : QPagedPaintDevicePrivate(), pd(d) {} - virtual ~QPdfPagedPaintDevicePrivate() + ~QPdfPagedPaintDevicePrivate() {} bool setPageLayout(const QPageLayout &newPageLayout) override diff --git a/src/gui/painting/qrgba64.h b/src/gui/painting/qrgba64.h index 0e5344cacb..0e0b567890 100644 --- a/src/gui/painting/qrgba64.h +++ b/src/gui/painting/qrgba64.h @@ -118,7 +118,27 @@ public: Q_DECL_CONSTEXPR quint8 alpha8() const { return div_257(alpha()); } Q_DECL_CONSTEXPR uint toArgb32() const { +#if defined(__cpp_constexpr) && __cpp_constexpr-0 >= 201304 + quint64 br = rgba & Q_UINT64_C(0xffff0000ffff); + quint64 ag = (rgba >> 16) & Q_UINT64_C(0xffff0000ffff); + br += Q_UINT64_C(0x8000000080); + ag += Q_UINT64_C(0x8000000080); + br = (br - ((br >> 8) & Q_UINT64_C(0xffff0000ffff))) >> 8; + ag = (ag - ((ag >> 8) & Q_UINT64_C(0xffff0000ffff))); +#if Q_BYTE_ORDER == Q_BIG_ENDIAN + return ((br << 24) & 0xff000000) + | ((ag >> 24) & 0xff0000) + | ((br >> 24) & 0xff00) + | ((ag >> 8) & 0xff); +#else + return ((ag >> 16) & 0xff000000) + | ((br << 16) & 0xff0000) + | (ag & 0xff00) + | ((br >> 32) & 0xff); +#endif +#else return uint((alpha8() << 24) | (red8() << 16) | (green8() << 8) | blue8()); +#endif } Q_DECL_CONSTEXPR ushort toRgb16() const { @@ -131,11 +151,20 @@ public: return *this; if (isTransparent()) return QRgba64::fromRgba64(0); - const quint32 a = alpha(); - const quint16 r = div_65535(red() * a); - const quint16 g = div_65535(green() * a); - const quint16 b = div_65535(blue() * a); - return fromRgba64(r, g, b, quint16(a)); + const quint64 a = alpha(); + quint64 br = (rgba & Q_UINT64_C(0xffff0000ffff)) * a; + quint64 ag = ((rgba >> 16) & Q_UINT64_C(0xffff0000ffff)) * a; + br = (br + ((br >> 16) & Q_UINT64_C(0xffff0000ffff)) + Q_UINT64_C(0x800000008000)); + ag = (ag + ((ag >> 16) & Q_UINT64_C(0xffff0000ffff)) + Q_UINT64_C(0x800000008000)); +#if Q_BYTE_ORDER == Q_BIG_ENDIAN + ag = ag & Q_UINT64_C(0xffff0000ffff0000); + br = (br >> 16) & Q_UINT64_C(0xffff00000000); + return fromRgba64(a | br | ag); +#else + br = (br >> 16) & Q_UINT64_C(0xffff0000ffff); + ag = ag & Q_UINT64_C(0xffff0000); + return fromRgba64((a << 48) | br | ag); +#endif } Q_DECL_RELAXED_CONSTEXPR QRgba64 unpremultiplied() const @@ -163,7 +192,6 @@ private: static Q_DECL_CONSTEXPR Q_ALWAYS_INLINE quint8 div_257_floor(uint x) { return quint8((x - (x >> 8)) >> 8); } static Q_DECL_CONSTEXPR Q_ALWAYS_INLINE quint8 div_257(quint16 x) { return div_257_floor(x + 128U); } - static Q_DECL_CONSTEXPR Q_ALWAYS_INLINE quint16 div_65535(uint x) { return quint16((x + (x>>16) + 0x8000U) >> 16); } Q_DECL_RELAXED_CONSTEXPR Q_ALWAYS_INLINE QRgba64 unpremultiplied_32bit() const { if (isOpaque() || isTransparent()) diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index 292952b7c0..c01531caf2 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -369,7 +369,8 @@ void QStrokerOps::strokeEllipse(const QRectF &rect, void *data, const QTransform QStroker::QStroker() : m_capStyle(SquareJoin), m_joinStyle(FlatJoin), m_back1X(0), m_back1Y(0), - m_back2X(0), m_back2Y(0) + m_back2X(0), m_back2Y(0), + m_forceOpen(false) { m_strokeWidth = qt_real_to_fixed(1); m_miterLimit = qt_real_to_fixed(2); @@ -749,7 +750,7 @@ template <class Iterator> bool qt_stroke_side(Iterator *it, } } - if (start == prev) { + if (start == prev && !stroker->forceOpen()) { // closed subpath, join first and last point #ifdef QPP_STROKE_DEBUG qDebug("\n ---> (side) closed subpath"); diff --git a/src/gui/painting/qstroker_p.h b/src/gui/painting/qstroker_p.h index 1a7c184e1a..722a0904f3 100644 --- a/src/gui/painting/qstroker_p.h +++ b/src/gui/painting/qstroker_p.h @@ -222,6 +222,9 @@ public: void setMiterLimit(qfixed length) { m_miterLimit = length; } qfixed miterLimit() const { return m_miterLimit; } + void setForceOpen(bool state) { m_forceOpen = state; } + bool forceOpen() { return m_forceOpen; } + void joinPoints(qfixed x, qfixed y, const QLineF &nextLine, LineJoinMode join); inline void emitMoveTo(qfixed x, qfixed y); inline void emitLineTo(qfixed x, qfixed y); @@ -247,6 +250,8 @@ protected: qfixed m_back2X; qfixed m_back2Y; + + bool m_forceOpen; }; class Q_GUI_EXPORT QDashStroker : public QStrokerOps diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 040d33fc2a..5f9e037ff0 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -2144,13 +2144,14 @@ QTransform::operator QVariant() const \sa inverted() */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn qreal QTransform::det() const \obsolete Returns the matrix's determinant. Use determinant() instead. */ - +#endif /*! \fn qreal QTransform::m11() const diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index 63c4a241c1..7460a405be 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -98,7 +98,10 @@ public: TransformationType type() const; inline qreal determinant() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use determinant() instead") qreal det() const; +#endif qreal m11() const; qreal m12() const; diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h index d1b08ed423..1b649a5d2a 100644 --- a/src/gui/painting/qvectorpath_p.h +++ b/src/gui/painting/qvectorpath_p.h @@ -99,7 +99,8 @@ public: // Shape rendering specifiers... OddEvenFill = 0x1000, WindingFill = 0x2000, - ImplicitClose = 0x4000 + ImplicitClose = 0x4000, + ExplicitOpen = 0x8000 }; // ### Falcon: introduca a struct XY for points so lars is not so confused... @@ -124,6 +125,7 @@ public: inline bool isCacheable() const { return m_hints & ShouldUseCacheHint; } inline bool hasImplicitClose() const { return m_hints & ImplicitClose; } + inline bool hasExplicitOpen() const { return m_hints & ExplicitOpen; } inline bool hasWindingFill() const { return m_hints & WindingFill; } inline void makeCacheable() const { m_hints |= ShouldUseCacheHint; m_cache = 0; } @@ -142,7 +144,7 @@ public: case QPaintEngine::ConvexMode: return ConvexPolygonHint | ImplicitClose; case QPaintEngine::OddEvenMode: return PolygonHint | OddEvenFill | ImplicitClose; case QPaintEngine::WindingMode: return PolygonHint | WindingFill | ImplicitClose; - case QPaintEngine::PolylineMode: return PolygonHint; + case QPaintEngine::PolylineMode: return PolygonHint | ExplicitOpen; default: return 0; } } @@ -194,7 +196,7 @@ public: private: - Q_DISABLE_COPY(QVectorPath) + Q_DISABLE_COPY_MOVE(QVectorPath) const QPainterPath::ElementType *m_elements; const qreal *m_points; diff --git a/src/gui/platform/platform.pri b/src/gui/platform/platform.pri new file mode 100644 index 0000000000..1fe2db81b0 --- /dev/null +++ b/src/gui/platform/platform.pri @@ -0,0 +1 @@ +wasm:include(wasm/wasm.pri) diff --git a/src/gui/platform/wasm/qwasmlocalfileaccess.cpp b/src/gui/platform/wasm/qwasmlocalfileaccess.cpp new file mode 100644 index 0000000000..83f9415c69 --- /dev/null +++ b/src/gui/platform/wasm/qwasmlocalfileaccess.cpp @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qwasmlocalfileaccess_p.h" +#include <private/qstdweb_p.h> +#include <emscripten.h> +#include <emscripten/bind.h> +#include <emscripten/html5.h> +#include <emscripten/val.h> + +QT_BEGIN_NAMESPACE + +namespace QWasmLocalFileAccess { + +void streamFile(const qstdweb::File &file, uint32_t offset, uint32_t length, char *buffer, const std::function<void ()> &completed) +{ + // Read file in chunks in order to avoid holding two copies in memory at the same time + const uint32_t chunkSize = 256 * 1024; + const uint32_t end = offset + length; + // assert end < file.size + auto fileReader = std::make_shared<qstdweb::FileReader>(); + + auto chunkCompleted = std::make_shared<std::function<void (uint32_t, char *buffer)>>(); + *chunkCompleted = [=](uint32_t chunkBegin, char *chunkBuffer) mutable { + + // Copy current chunk from JS memory to Wasm memory + qstdweb::ArrayBuffer result = fileReader->result(); + qstdweb::Uint8Array(result).copyTo(chunkBuffer); + + // Read next chunk if not at buffer end + uint32_t nextChunkBegin = std::min(chunkBegin + result.byteLength(), end); + uint32_t nextChunkEnd = std::min(nextChunkBegin + chunkSize, end); + if (nextChunkBegin == end) { + completed(); + chunkCompleted.reset(); + return; + } + char *nextChunkBuffer = chunkBuffer + result.byteLength(); + fileReader->onLoad([=]() { (*chunkCompleted)(nextChunkBegin, nextChunkBuffer); }); + qstdweb::Blob blob = file.slice(nextChunkBegin, nextChunkEnd); + fileReader->readAsArrayBuffer(blob); + }; + + // Read first chunk. First iteration is a dummy iteration with no available data. + (*chunkCompleted)(offset, buffer); +} + +void streamFile(const qstdweb::File &file, char *buffer, const std::function<void ()> &completed) +{ + streamFile(file, 0, file.size(), buffer, completed); +} + +void readFiles(const qstdweb::FileList &fileList, + const std::function<char *(uint64_t size, const std::string name)> &acceptFile, + const std::function<void ()> &fileDataReady) +{ + auto readFile = std::make_shared<std::function<void(int)>>(); + + *readFile = [=](int fileIndex) mutable { + // Stop when all files have been processed + if (fileIndex >= fileList.length()) { + readFile.reset(); + return; + } + + const qstdweb::File file = fileList[fileIndex]; + + // Ask caller if the file should be accepted + char *buffer = acceptFile(file.size(), file.name()); + if (buffer == nullptr) { + (*readFile)(fileIndex + 1); + return; + } + + // Read file data into caller-provided buffer + streamFile(file, buffer, [=]() { + fileDataReady(); + (*readFile)(fileIndex + 1); + }); + }; + + (*readFile)(0); +} + +typedef std::function<void (const qstdweb::FileList &fileList)> OpenFileDialogCallback; +void openFileDialog(const std::string &accept, FileSelectMode fileSelectMode, + const OpenFileDialogCallback &filesSelected) +{ + // Create file input html element which will display a native file dialog + // and call back to our onchange handler once the user has selected + // one or more files. + emscripten::val document = emscripten::val::global("document"); + emscripten::val input = document.call<emscripten::val>("createElement", std::string("input")); + input.set("type", "file"); + input.set("style", "display:none"); + input.set("accept", emscripten::val(accept)); + input.set("multiple", emscripten::val(fileSelectMode == MultipleFiles)); + + // Note: there is no event in case the user cancels the file dialog. + static std::unique_ptr<qstdweb::EventCallback> changeEvent; + auto callback = [=]() { filesSelected(qstdweb::FileList(input["files"])); }; + changeEvent.reset(new qstdweb::EventCallback(input, "change", callback)); + + // Activate file input + emscripten::val body = document["body"]; + body.call<void>("appendChild", input); + input.call<void>("click"); + body.call<void>("removeChild", input); +} + +void openFiles(const std::string &accept, FileSelectMode fileSelectMode, + const std::function<void (int fileCount)> &fileDialogClosed, + const std::function<char *(uint64_t size, const std::string name)> &acceptFile, + const std::function<void()> &fileDataReady) +{ + openFileDialog(accept, fileSelectMode, [=](const qstdweb::FileList &files) { + fileDialogClosed(files.length()); + readFiles(files, acceptFile, fileDataReady); + }); +} + +void openFile(const std::string &accept, + const std::function<void (bool fileSelected)> &fileDialogClosed, + const std::function<char *(uint64_t size, const std::string name)> &acceptFile, + const std::function<void()> &fileDataReady) +{ + auto fileDialogClosedWithInt = [=](int fileCount) { fileDialogClosed(fileCount != 0); }; + openFiles(accept, FileSelectMode::SingleFile, fileDialogClosedWithInt, acceptFile, fileDataReady); +} + +} // namespace QWasmLocalFileAccess + +QT_END_NAMESPACE diff --git a/src/gui/platform/wasm/qwasmlocalfileaccess_p.h b/src/gui/platform/wasm/qwasmlocalfileaccess_p.h new file mode 100644 index 0000000000..794db8d9b2 --- /dev/null +++ b/src/gui/platform/wasm/qwasmlocalfileaccess_p.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QWASMLOCALFILEACCESS_P_H +#define QWASMLOCALFILEACCESS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <qglobal.h> +#include <cstdint> +#include <functional> + +QT_BEGIN_NAMESPACE + +namespace QWasmLocalFileAccess { + +enum FileSelectMode { SingleFile, MultipleFiles }; + +void openFiles(const std::string &accept, FileSelectMode fileSelectMode, + const std::function<void (int fileCount)> &fileDialogClosed, + const std::function<char *(uint64_t size, const std::string name)> &acceptFile, + const std::function<void()> &fileDataReady); + +void openFile(const std::string &accept, + const std::function<void (bool fileSelected)> &fileDialogClosed, + const std::function<char *(uint64_t size, const std::string name)> &acceptFile, + const std::function<void()> &fileDataReady); + +} // namespace QWasmLocalFileAccess + +QT_END_NAMESPACE + +#endif // QWASMLOCALFILEACCESS_P_H diff --git a/src/gui/platform/wasm/wasm.pri b/src/gui/platform/wasm/wasm.pri new file mode 100644 index 0000000000..1b5d7eadb5 --- /dev/null +++ b/src/gui/platform/wasm/wasm.pri @@ -0,0 +1,3 @@ +INCLUDEDIR += $$PWD +HEADERS += $$PWD/qwasmlocalfileaccess_p.h +SOURCES += $$PWD/qwasmlocalfileaccess.cpp diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 8fea27f772..3371401420 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -143,7 +143,9 @@ public: virtual void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) = 0; }; +#ifndef Q_CLANG_QDOC Q_DECLARE_INTERFACE(QTextObjectInterface, "org.qt-project.Qt.QTextObjectInterface") +#endif QT_END_NAMESPACE diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 325fd26a31..dc7e128bcd 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -115,6 +115,7 @@ static const QCssKnownValue properties[NumProperties - 1] = { { "float", Float }, { "font", Font }, { "font-family", FontFamily }, + { "font-kerning", FontKerning }, { "font-size", FontSize }, { "font-style", FontStyle }, { "font-variant", FontVariant }, @@ -368,6 +369,7 @@ static inline bool isInheritable(Property propertyId) { switch (propertyId) { case Font: + case FontKerning: case FontFamily: case FontSize: case FontStyle: @@ -721,7 +723,8 @@ static ColorData parseColorValue(QCss::Value v) if (lst.count() != 2) return ColorData(); - if ((lst.at(0).compare(QLatin1String("palette"), Qt::CaseInsensitive)) == 0) { + const QString &identifier = lst.at(0); + if ((identifier.compare(QLatin1String("palette"), Qt::CaseInsensitive)) == 0) { int role = findKnownValue(lst.at(1).trimmed(), values, NumKnownValues); if (role >= Value_FirstColorRole && role <= Value_LastColorRole) return (QPalette::ColorRole)(role-Value_FirstColorRole); @@ -729,8 +732,16 @@ static ColorData parseColorValue(QCss::Value v) return ColorData(); } - bool rgb = lst.at(0).startsWith(QLatin1String("rgb")); - bool rgba = lst.at(0).startsWith(QLatin1String("rgba")); + const bool rgb = identifier.startsWith(QLatin1String("rgb")); + const bool hsv = !rgb && identifier.startsWith(QLatin1String("hsv")); + const bool hsl = !rgb && !hsv && identifier.startsWith(QLatin1String("hsl")); + + if (!rgb && !hsv && !hsl) + return ColorData(); + + const bool hasAlpha = identifier.size() == 4 && identifier.at(3) == QLatin1Char('a'); + if (identifier.size() > 3 && !hasAlpha) + return ColorData(); Parser p(lst.at(1)); if (!p.testExpr()) @@ -743,7 +754,8 @@ static ColorData parseColorValue(QCss::Value v) for (int i = 0; i < qMin(tokenCount, 7); i += 2) { if (colorDigits.at(i).type == Value::Percentage) { - colorDigits[i].variant = colorDigits.at(i).variant.toReal() * (255. / 100.); + const qreal maxRange = (rgb || i != 0) ? 255. : 359.; + colorDigits[i].variant = colorDigits.at(i).variant.toReal() * (maxRange / 100.); colorDigits[i].type = Value::Number; } else if (colorDigits.at(i).type != Value::Number) { return ColorData(); @@ -754,20 +766,29 @@ static ColorData parseColorValue(QCss::Value v) if (tokenCount < 5) return ColorData(); + // ### Qt6: replace this with a check and return invalid color when token count does not match + if (hasAlpha && tokenCount != 7) + qWarning("QCssParser::parseColorValue: Specified color with alpha value but no alpha given: '%s'", qPrintable(lst.join(QLatin1Char(' ')))); + if (!hasAlpha && tokenCount != 5) + qWarning("QCssParser::parseColorValue: Specified color without alpha value but alpha given: '%s'", qPrintable(lst.join(QLatin1Char(' ')))); + int v1 = colorDigits.at(0).variant.toInt(); int v2 = colorDigits.at(2).variant.toInt(); int v3 = colorDigits.at(4).variant.toInt(); int alpha = 255; - if (tokenCount >= 7) { + if (tokenCount == 7) { int alphaValue = colorDigits.at(6).variant.toInt(); - if (rgba && alphaValue <= 1) + if (alphaValue <= 1) alpha = colorDigits.at(6).variant.toReal() * 255.; else alpha = alphaValue; } - return rgb ? QColor::fromRgb(v1, v2, v3, alpha) - : QColor::fromHsv(v1, v2, v3, alpha); + if (rgb) + return QColor::fromRgb(v1, v2, v3, alpha); + if (hsv) + return QColor::fromHsv(v1, v2, v3, alpha); + return QColor::fromHsl(v1, v2, v3, alpha); } static QColor colorFromData(const ColorData& c, const QPalette &pal) @@ -1142,6 +1163,19 @@ static bool setFontStyleFromValue(const QCss::Value &value, QFont *font) return false; } +static bool setFontKerningFromValue(const QCss::Value &value, QFont *font) +{ + if (value.type != Value::KnownIdentifier) + return false ; + switch (value.variant.toInt()) { + case Value_Normal: font->setKerning(true); return true; + case Value_None: font->setKerning(false); return true; + case Value_Auto: return true; + default: break; + } + return false; +} + static bool setFontWeightFromValue(const QCss::Value &value, QFont *font) { if (value.type == Value::KnownIdentifier) { @@ -1166,11 +1200,13 @@ static bool setFontWeightFromValue(const QCss::Value &value, QFont *font) static bool setFontFamilyFromValues(const QVector<QCss::Value> &values, QFont *font, int start = 0) { QString family; + QStringList families; bool shouldAddSpace = false; for (int i = start; i < values.count(); ++i) { const QCss::Value &v = values.at(i); if (v.type == Value::TermOperatorComma) { - family += QLatin1Char(','); + families << family; + family.clear(); shouldAddSpace = false; continue; } @@ -1182,9 +1218,12 @@ static bool setFontFamilyFromValues(const QVector<QCss::Value> &values, QFont *f family += str; shouldAddSpace = true; } - if (family.isEmpty()) + if (!family.isEmpty()) + families << family; + if (families.isEmpty()) return false; - font->setFamily(family); + font->setFamily(families.at(0)); + font->setFamilies(families); return true; } @@ -1274,6 +1313,7 @@ bool ValueExtractor::extractFont(QFont *font, int *fontSizeAdjustment) case FontStyle: setFontStyleFromValue(val, font); break; case FontWeight: setFontWeightFromValue(val, font); break; case FontFamily: setFontFamilyFromValues(decl.d->values, font); break; + case FontKerning: setFontKerningFromValue(val, font); break; case TextDecoration: setTextDecorationFromValues(decl.d->values, font); break; case Font: parseShorthandFontProperty(decl.d->values, font, fontSizeAdjustment); break; case FontVariant: setFontVariantFromValue(val, font); break; @@ -1968,7 +2008,7 @@ bool StyleSelector::basicSelectorMatches(const BasicSelector &sel, NodePtr node) } void StyleSelector::matchRule(NodePtr node, const StyleRule &rule, StyleSheetOrigin origin, - int depth, QMap<uint, StyleRule> *weightedRules) + int depth, QMultiMap<uint, StyleRule> *weightedRules) { for (int j = 0; j < rule.selectors.count(); ++j) { const Selector& selector = rule.selectors.at(j); @@ -1982,7 +2022,7 @@ void StyleSelector::matchRule(NodePtr node, const StyleRule &rule, StyleSheetOri newRule.selectors[0] = selector; } //We might have rules with the same weight if they came from a rule with several selectors - weightedRules->insertMulti(weight, newRule); + weightedRules->insert(weight, newRule); } } } @@ -1995,7 +2035,7 @@ QVector<StyleRule> StyleSelector::styleRulesForNode(NodePtr node) if (styleSheets.isEmpty()) return rules; - QMap<uint, StyleRule> weightedRules; // (spec, rule) that will be sorted below + QMultiMap<uint, StyleRule> weightedRules; // (spec, rule) that will be sorted below //prune using indexed stylesheet for (int sheetIdx = 0; sheetIdx < styleSheets.count(); ++sheetIdx) { diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index c1594531ea..860bbe382a 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -195,6 +195,7 @@ enum Property { QtListNumberSuffix, LineHeight, QtLineHeightType, + FontKerning, NumProperties }; @@ -673,7 +674,7 @@ public: Qt::CaseSensitivity nameCaseSensitivity; private: void matchRule(NodePtr node, const StyleRule &rules, StyleSheetOrigin origin, - int depth, QMap<uint, StyleRule> *weightedRules); + int depth, QMultiMap<uint, StyleRule> *weightedRules); bool selectorMatches(const Selector &rule, NodePtr node); bool basicSelectorMatches(const BasicSelector &rule, NodePtr node); }; diff --git a/src/gui/text/qcssscanner.cpp b/src/gui/text/qcssscanner.cpp index 33dc01c8bc..d48cbb71d7 100644 --- a/src/gui/text/qcssscanner.cpp +++ b/src/gui/text/qcssscanner.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -37,7 +37,7 @@ ** ****************************************************************************/ -// auto generated. DO NOT EDIT. +// auto generated by qtbase/util/lexgen/. DO NOT EDIT. class QCssScanner_Generated { public: @@ -75,23 +75,23 @@ int QCssScanner_Generated::lex() // initial state ch = next(); if (ch.unicode() >= 9 && ch.unicode() <= 10) - goto state_1; + goto state_4; if (ch.unicode() >= 12 && ch.unicode() <= 13) - goto state_1; + goto state_4; if (ch.unicode() == 32) - goto state_1; + goto state_4; if (ch.unicode() == 33) { token = QCss::EXCLAMATION_SYM; goto found; } if (ch.unicode() == 34) - goto state_3; + goto state_2; if (ch.unicode() == 35) - goto state_4; + goto state_1; if (ch.unicode() == 36) - goto state_5; - if (ch.unicode() == 39) goto state_6; + if (ch.unicode() == 39) + goto state_5; if (ch.unicode() == 40) { token = QCss::LPAREN; goto found; @@ -101,17 +101,17 @@ int QCssScanner_Generated::lex() goto found; } if (ch.unicode() == 42) - goto state_9; + goto state_8; if (ch.unicode() == 43) - goto state_10; + goto state_7; if (ch.unicode() == 44) - goto state_11; + goto state_14; if (ch.unicode() == 45) - goto state_12; - if (ch.unicode() == 46) goto state_13; + if (ch.unicode() == 46) + goto state_12; if (ch.unicode() == 47) - goto state_14; + goto state_11; if (ch.unicode() >= 48 && ch.unicode() <= 57) goto state_15; if (ch.unicode() == 58) { @@ -123,64 +123,56 @@ int QCssScanner_Generated::lex() goto found; } if (ch.unicode() == 60) - goto state_18; + goto state_20; if (ch.unicode() == 61) { token = QCss::EQUAL; goto found; } if (ch.unicode() == 62) - goto state_20; + goto state_18; if (ch.unicode() == 64) - goto state_21; + goto state_26; if (ch.unicode() == 91) { token = QCss::LBRACKET; goto found; } if (ch.unicode() == 92) - goto state_23; + goto state_30; if (ch.unicode() == 93) { token = QCss::RBRACKET; goto found; } if (ch.unicode() == 94) - goto state_25; + goto state_28; if (ch.unicode() == 95) - goto state_26; + goto state_21; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_26; + goto state_21; if (ch.unicode() == 123) - goto state_27; + goto state_22; if (ch.unicode() == 124) - goto state_28; + goto state_25; if (ch.unicode() == 125) { token = QCss::RBRACE; goto found; } if (ch.unicode() == 126) - goto state_30; + goto state_23; goto out; state_1: - lastAcceptingPos = pos; - token = QCss::S; ch = next(); - if (ch.unicode() >= 9 && ch.unicode() <= 10) - goto state_31; - if (ch.unicode() >= 12 && ch.unicode() <= 13) + if (ch.unicode() == 45) goto state_31; - if (ch.unicode() == 32) + if (ch.unicode() >= 48 && ch.unicode() <= 57) goto state_31; - if (ch.unicode() == 43) - goto state_10; - if (ch.unicode() == 44) - goto state_11; - if (ch.unicode() == 62) - goto state_20; - if (ch.unicode() == 123) - goto state_27; - if (ch.unicode() == 126) + if (ch.unicode() == 92) goto state_32; + if (ch.unicode() == 95) + goto state_31; + if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) + goto state_31; goto out; - state_3: + state_2: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); @@ -204,93 +196,101 @@ int QCssScanner_Generated::lex() goto state_33; goto out; state_4: + lastAcceptingPos = pos; + token = QCss::S; ch = next(); - if (ch.unicode() == 45) - goto state_36; - if (ch.unicode() >= 48 && ch.unicode() <= 57) + if (ch.unicode() >= 9 && ch.unicode() <= 10) goto state_36; - if (ch.unicode() == 92) - goto state_37; - if (ch.unicode() == 95) + if (ch.unicode() >= 12 && ch.unicode() <= 13) goto state_36; - if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) + if (ch.unicode() == 32) goto state_36; + if (ch.unicode() == 43) + goto state_7; + if (ch.unicode() == 44) + goto state_14; + if (ch.unicode() == 62) + goto state_18; + if (ch.unicode() == 123) + goto state_22; + if (ch.unicode() == 126) + goto state_37; goto out; state_5: - ch = next(); - if (ch.unicode() == 61) { - token = QCss::ENDSWITH; - goto found; - } - goto out; - state_6: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_39; + goto state_38; if (ch.unicode() == 11) - goto state_39; + goto state_38; if (ch.unicode() >= 14 && ch.unicode() <= 38) - goto state_39; + goto state_38; if (ch.unicode() == 39) - goto state_40; - if (ch.unicode() >= 40 && ch.unicode() <= 91) goto state_39; + if (ch.unicode() >= 40 && ch.unicode() <= 91) + goto state_38; if (ch.unicode() == 92) - goto state_41; + goto state_40; if (ch.unicode() >= 93 && ch.unicode() <= 96) - goto state_39; + goto state_38; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_39; + goto state_38; if (ch.unicode() >= 123) - goto state_39; + goto state_38; goto out; - state_9: - lastAcceptingPos = pos; - token = QCss::STAR; + state_6: ch = next(); if (ch.unicode() == 61) { - token = QCss::CONTAINS; + token = QCss::ENDSWITH; goto found; } goto out; - state_10: + state_7: lastAcceptingPos = pos; token = QCss::PLUS; goto out; + state_8: + lastAcceptingPos = pos; + token = QCss::STAR; + ch = next(); + if (ch.unicode() == 61) { + token = QCss::CONTAINS; + goto found; + } + goto out; state_11: lastAcceptingPos = pos; - token = QCss::COMMA; + token = QCss::SLASH; + ch = next(); + if (ch.unicode() == 42) { + token = handleCommentStart(); + goto found; + } goto out; state_12: lastAcceptingPos = pos; + token = QCss::DOT; + ch = next(); + if (ch.unicode() >= 48 && ch.unicode() <= 57) + goto state_44; + goto out; + state_13: + lastAcceptingPos = pos; token = QCss::MINUS; ch = next(); if (ch.unicode() == 45) - goto state_43; + goto state_45; if (ch.unicode() == 92) - goto state_23; + goto state_30; if (ch.unicode() == 95) - goto state_26; + goto state_21; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_26; - goto out; - state_13: - lastAcceptingPos = pos; - token = QCss::DOT; - ch = next(); - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_44; + goto state_21; goto out; state_14: lastAcceptingPos = pos; - token = QCss::SLASH; - ch = next(); - if (ch.unicode() == 42) { - token = handleCommentStart(); - goto found; - } + token = QCss::COMMA; goto out; state_15: lastAcceptingPos = pos; @@ -299,68 +299,70 @@ int QCssScanner_Generated::lex() if (ch.unicode() == 37) goto state_46; if (ch.unicode() == 45) - goto state_47; - if (ch.unicode() == 46) goto state_48; + if (ch.unicode() == 46) + goto state_47; if (ch.unicode() >= 48 && ch.unicode() <= 57) goto state_49; if (ch.unicode() == 92) - goto state_50; - if (ch.unicode() == 95) goto state_51; + if (ch.unicode() == 95) + goto state_50; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_51; + goto state_50; goto out; state_18: + lastAcceptingPos = pos; + token = QCss::GREATER; + goto out; + state_20: ch = next(); if (ch.unicode() == 33) goto state_52; goto out; - state_20: - lastAcceptingPos = pos; - token = QCss::GREATER; - goto out; state_21: + lastAcceptingPos = pos; + token = QCss::IDENT; ch = next(); - if (ch.unicode() == 45) + if (ch.unicode() == 40) goto state_53; - if (ch.unicode() == 92) + if (ch.unicode() == 45) goto state_54; - if (ch.unicode() == 95) + if (ch.unicode() >= 48 && ch.unicode() <= 57) + goto state_54; + if (ch.unicode() == 92) goto state_55; + if (ch.unicode() == 95) + goto state_54; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_55; + goto state_54; + goto out; + state_22: + lastAcceptingPos = pos; + token = QCss::LBRACE; goto out; state_23: + lastAcceptingPos = pos; + token = QCss::TILDE; ch = next(); - if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_56; - if (ch.unicode() == 11) - goto state_56; - if (ch.unicode() >= 14 && ch.unicode() <= 47) - goto state_56; - if (ch.unicode() >= 58 && ch.unicode() <= 96) - goto state_56; - if (ch.unicode() >= 103) - goto state_56; + if (ch.unicode() == 61) { + token = QCss::INCLUDES; + goto found; + } goto out; state_25: + lastAcceptingPos = pos; + token = QCss::OR; ch = next(); if (ch.unicode() == 61) { - token = QCss::BEGINSWITH; + token = QCss::DASHMATCH; goto found; } goto out; state_26: - lastAcceptingPos = pos; - token = QCss::IDENT; ch = next(); - if (ch.unicode() == 40) - goto state_58; if (ch.unicode() == 45) - goto state_59; - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_59; + goto state_58; if (ch.unicode() == 92) goto state_60; if (ch.unicode() == 95) @@ -368,52 +370,53 @@ int QCssScanner_Generated::lex() if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) goto state_59; goto out; - state_27: - lastAcceptingPos = pos; - token = QCss::LBRACE; - goto out; state_28: - lastAcceptingPos = pos; - token = QCss::OR; ch = next(); if (ch.unicode() == 61) { - token = QCss::DASHMATCH; + token = QCss::BEGINSWITH; goto found; } goto out; state_30: - lastAcceptingPos = pos; - token = QCss::TILDE; ch = next(); - if (ch.unicode() == 61) { - token = QCss::INCLUDES; - goto found; - } + if (ch.unicode() >= 1 && ch.unicode() <= 9) + goto state_62; + if (ch.unicode() == 11) + goto state_62; + if (ch.unicode() >= 14 && ch.unicode() <= 47) + goto state_62; + if (ch.unicode() >= 58 && ch.unicode() <= 96) + goto state_62; + if (ch.unicode() >= 103) + goto state_62; goto out; state_31: lastAcceptingPos = pos; - token = QCss::S; + token = QCss::HASH; ch = next(); - if (ch.unicode() >= 9 && ch.unicode() <= 10) - goto state_31; - if (ch.unicode() >= 12 && ch.unicode() <= 13) - goto state_31; - if (ch.unicode() == 32) - goto state_31; - if (ch.unicode() == 43) - goto state_10; - if (ch.unicode() == 44) - goto state_11; - if (ch.unicode() == 62) - goto state_20; - if (ch.unicode() == 123) - goto state_27; - if (ch.unicode() == 126) - goto state_32; + if (ch.unicode() == 45) + goto state_63; + if (ch.unicode() >= 48 && ch.unicode() <= 57) + goto state_63; + if (ch.unicode() == 92) + goto state_64; + if (ch.unicode() == 95) + goto state_63; + if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) + goto state_63; goto out; state_32: - lastAcceptingPos = pos; - token = QCss::TILDE; + ch = next(); + if (ch.unicode() >= 1 && ch.unicode() <= 9) + goto state_65; + if (ch.unicode() == 11) + goto state_65; + if (ch.unicode() >= 14 && ch.unicode() <= 47) + goto state_65; + if (ch.unicode() >= 58 && ch.unicode() <= 96) + goto state_65; + if (ch.unicode() >= 103) + goto state_65; goto out; state_33: lastAcceptingPos = pos; @@ -445,78 +448,75 @@ int QCssScanner_Generated::lex() state_35: ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_63; + goto state_66; if (ch.unicode() == 10) - goto state_64; + goto state_67; if (ch.unicode() == 11) - goto state_63; + goto state_66; if (ch.unicode() == 12) - goto state_65; + goto state_69; if (ch.unicode() == 13) - goto state_66; + goto state_68; if (ch.unicode() >= 14 && ch.unicode() <= 47) - goto state_63; + goto state_66; if (ch.unicode() >= 58 && ch.unicode() <= 96) - goto state_63; + goto state_66; if (ch.unicode() >= 103) - goto state_63; + goto state_66; goto out; state_36: lastAcceptingPos = pos; - token = QCss::HASH; + token = QCss::S; ch = next(); - if (ch.unicode() == 45) - goto state_67; - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_67; - if (ch.unicode() == 92) - goto state_68; - if (ch.unicode() == 95) - goto state_67; - if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_67; + if (ch.unicode() >= 9 && ch.unicode() <= 10) + goto state_36; + if (ch.unicode() >= 12 && ch.unicode() <= 13) + goto state_36; + if (ch.unicode() == 32) + goto state_36; + if (ch.unicode() == 43) + goto state_7; + if (ch.unicode() == 44) + goto state_14; + if (ch.unicode() == 62) + goto state_18; + if (ch.unicode() == 123) + goto state_22; + if (ch.unicode() == 126) + goto state_37; goto out; state_37: - ch = next(); - if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_69; - if (ch.unicode() == 11) - goto state_69; - if (ch.unicode() >= 14 && ch.unicode() <= 47) - goto state_69; - if (ch.unicode() >= 58 && ch.unicode() <= 96) - goto state_69; - if (ch.unicode() >= 103) - goto state_69; + lastAcceptingPos = pos; + token = QCss::TILDE; goto out; - state_39: + state_38: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_39; + goto state_38; if (ch.unicode() == 11) - goto state_39; + goto state_38; if (ch.unicode() >= 14 && ch.unicode() <= 38) - goto state_39; + goto state_38; if (ch.unicode() == 39) - goto state_40; - if (ch.unicode() >= 40 && ch.unicode() <= 91) goto state_39; + if (ch.unicode() >= 40 && ch.unicode() <= 91) + goto state_38; if (ch.unicode() == 92) - goto state_41; + goto state_40; if (ch.unicode() >= 93 && ch.unicode() <= 96) - goto state_39; + goto state_38; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_39; + goto state_38; if (ch.unicode() >= 123) - goto state_39; + goto state_38; goto out; - state_40: + state_39: lastAcceptingPos = pos; token = QCss::STRING; goto out; - state_41: + state_40: ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) goto state_70; @@ -525,9 +525,9 @@ int QCssScanner_Generated::lex() if (ch.unicode() == 11) goto state_70; if (ch.unicode() == 12) - goto state_72; - if (ch.unicode() == 13) goto state_73; + if (ch.unicode() == 13) + goto state_72; if (ch.unicode() >= 14 && ch.unicode() <= 47) goto state_70; if (ch.unicode() >= 58 && ch.unicode() <= 96) @@ -535,13 +535,6 @@ int QCssScanner_Generated::lex() if (ch.unicode() >= 103) goto state_70; goto out; - state_43: - ch = next(); - if (ch.unicode() == 62) { - token = QCss::CDC; - goto found; - } - goto out; state_44: lastAcceptingPos = pos; token = QCss::NUMBER; @@ -549,15 +542,22 @@ int QCssScanner_Generated::lex() if (ch.unicode() == 37) goto state_46; if (ch.unicode() == 45) - goto state_47; + goto state_48; if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_75; + goto state_74; if (ch.unicode() == 92) - goto state_50; - if (ch.unicode() == 95) goto state_51; + if (ch.unicode() == 95) + goto state_50; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_51; + goto state_50; + goto out; + state_45: + ch = next(); + if (ch.unicode() == 62) { + token = QCss::CDC; + goto found; + } goto out; state_46: lastAcceptingPos = pos; @@ -565,17 +565,17 @@ int QCssScanner_Generated::lex() goto out; state_47: ch = next(); - if (ch.unicode() == 92) - goto state_50; - if (ch.unicode() == 95) - goto state_51; - if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_51; + if (ch.unicode() >= 48 && ch.unicode() <= 57) + goto state_44; goto out; state_48: ch = next(); - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_44; + if (ch.unicode() == 92) + goto state_51; + if (ch.unicode() == 95) + goto state_50; + if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) + goto state_50; goto out; state_49: lastAcceptingPos = pos; @@ -584,45 +584,45 @@ int QCssScanner_Generated::lex() if (ch.unicode() == 37) goto state_46; if (ch.unicode() == 45) - goto state_47; - if (ch.unicode() == 46) goto state_48; + if (ch.unicode() == 46) + goto state_47; if (ch.unicode() >= 48 && ch.unicode() <= 57) goto state_49; if (ch.unicode() == 92) - goto state_50; - if (ch.unicode() == 95) goto state_51; + if (ch.unicode() == 95) + goto state_50; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_51; + goto state_50; goto out; state_50: + lastAcceptingPos = pos; + token = QCss::LENGTH; ch = next(); - if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_76; - if (ch.unicode() == 11) + if (ch.unicode() == 45) goto state_76; - if (ch.unicode() >= 14 && ch.unicode() <= 47) + if (ch.unicode() >= 48 && ch.unicode() <= 57) goto state_76; - if (ch.unicode() >= 58 && ch.unicode() <= 96) + if (ch.unicode() == 92) + goto state_77; + if (ch.unicode() == 95) goto state_76; - if (ch.unicode() >= 103) + if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) goto state_76; goto out; state_51: - lastAcceptingPos = pos; - token = QCss::LENGTH; ch = next(); - if (ch.unicode() == 45) - goto state_77; - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_77; - if (ch.unicode() == 92) + if (ch.unicode() >= 1 && ch.unicode() <= 9) + goto state_78; + if (ch.unicode() == 11) + goto state_78; + if (ch.unicode() >= 14 && ch.unicode() <= 47) + goto state_78; + if (ch.unicode() >= 58 && ch.unicode() <= 96) + goto state_78; + if (ch.unicode() >= 103) goto state_78; - if (ch.unicode() == 95) - goto state_77; - if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_77; goto out; state_52: ch = next(); @@ -630,15 +630,27 @@ int QCssScanner_Generated::lex() goto state_79; goto out; state_53: + lastAcceptingPos = pos; + token = QCss::FUNCTION; + goto out; + state_54: + lastAcceptingPos = pos; + token = QCss::IDENT; ch = next(); - if (ch.unicode() == 92) + if (ch.unicode() == 40) + goto state_53; + if (ch.unicode() == 45) goto state_54; - if (ch.unicode() == 95) + if (ch.unicode() >= 48 && ch.unicode() <= 57) + goto state_54; + if (ch.unicode() == 92) goto state_55; + if (ch.unicode() == 95) + goto state_54; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_55; + goto state_54; goto out; - state_54: + state_55: ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) goto state_80; @@ -651,7 +663,16 @@ int QCssScanner_Generated::lex() if (ch.unicode() >= 103) goto state_80; goto out; - state_55: + state_58: + ch = next(); + if (ch.unicode() == 92) + goto state_60; + if (ch.unicode() == 95) + goto state_59; + if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) + goto state_59; + goto out; + state_59: lastAcceptingPos = pos; token = QCss::ATKEYWORD_SYM; ch = next(); @@ -666,58 +687,80 @@ int QCssScanner_Generated::lex() if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) goto state_81; goto out; - state_56: + state_60: + ch = next(); + if (ch.unicode() >= 1 && ch.unicode() <= 9) + goto state_83; + if (ch.unicode() == 11) + goto state_83; + if (ch.unicode() >= 14 && ch.unicode() <= 47) + goto state_83; + if (ch.unicode() >= 58 && ch.unicode() <= 96) + goto state_83; + if (ch.unicode() >= 103) + goto state_83; + goto out; + state_62: lastAcceptingPos = pos; token = QCss::IDENT; ch = next(); if (ch.unicode() == 40) - goto state_58; + goto state_53; if (ch.unicode() == 45) - goto state_59; + goto state_54; if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_59; + goto state_54; if (ch.unicode() == 92) - goto state_60; + goto state_55; if (ch.unicode() == 95) - goto state_59; + goto state_54; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_59; - goto out; - state_58: - lastAcceptingPos = pos; - token = QCss::FUNCTION; + goto state_54; goto out; - state_59: + state_63: lastAcceptingPos = pos; - token = QCss::IDENT; + token = QCss::HASH; ch = next(); - if (ch.unicode() == 40) - goto state_58; if (ch.unicode() == 45) - goto state_59; + goto state_63; if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_59; + goto state_63; if (ch.unicode() == 92) - goto state_60; + goto state_64; if (ch.unicode() == 95) - goto state_59; + goto state_63; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_59; + goto state_63; goto out; - state_60: + state_64: ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_83; + goto state_84; if (ch.unicode() == 11) - goto state_83; + goto state_84; if (ch.unicode() >= 14 && ch.unicode() <= 47) - goto state_83; + goto state_84; if (ch.unicode() >= 58 && ch.unicode() <= 96) - goto state_83; + goto state_84; if (ch.unicode() >= 103) - goto state_83; + goto state_84; goto out; - state_63: + state_65: + lastAcceptingPos = pos; + token = QCss::HASH; + ch = next(); + if (ch.unicode() == 45) + goto state_63; + if (ch.unicode() >= 48 && ch.unicode() <= 57) + goto state_63; + if (ch.unicode() == 92) + goto state_64; + if (ch.unicode() == 95) + goto state_63; + if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) + goto state_63; + goto out; + state_66: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); @@ -740,7 +783,7 @@ int QCssScanner_Generated::lex() if (ch.unicode() >= 123) goto state_33; goto out; - state_64: + state_67: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); @@ -763,12 +806,14 @@ int QCssScanner_Generated::lex() if (ch.unicode() >= 123) goto state_33; goto out; - state_65: + state_68: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) goto state_33; + if (ch.unicode() == 10) + goto state_85; if (ch.unicode() == 11) goto state_33; if (ch.unicode() >= 14 && ch.unicode() <= 33) @@ -786,14 +831,12 @@ int QCssScanner_Generated::lex() if (ch.unicode() >= 123) goto state_33; goto out; - state_66: + state_69: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) goto state_33; - if (ch.unicode() == 10) - goto state_84; if (ch.unicode() == 11) goto state_33; if (ch.unicode() >= 14 && ch.unicode() <= 33) @@ -811,191 +854,133 @@ int QCssScanner_Generated::lex() if (ch.unicode() >= 123) goto state_33; goto out; - state_67: - lastAcceptingPos = pos; - token = QCss::HASH; - ch = next(); - if (ch.unicode() == 45) - goto state_67; - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_67; - if (ch.unicode() == 92) - goto state_68; - if (ch.unicode() == 95) - goto state_67; - if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_67; - goto out; - state_68: - ch = next(); - if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_85; - if (ch.unicode() == 11) - goto state_85; - if (ch.unicode() >= 14 && ch.unicode() <= 47) - goto state_85; - if (ch.unicode() >= 58 && ch.unicode() <= 96) - goto state_85; - if (ch.unicode() >= 103) - goto state_85; - goto out; - state_69: - lastAcceptingPos = pos; - token = QCss::HASH; - ch = next(); - if (ch.unicode() == 45) - goto state_67; - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_67; - if (ch.unicode() == 92) - goto state_68; - if (ch.unicode() == 95) - goto state_67; - if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_67; - goto out; state_70: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_39; + goto state_38; if (ch.unicode() == 11) - goto state_39; + goto state_38; if (ch.unicode() >= 14 && ch.unicode() <= 38) - goto state_39; + goto state_38; if (ch.unicode() == 39) - goto state_40; - if (ch.unicode() >= 40 && ch.unicode() <= 91) goto state_39; + if (ch.unicode() >= 40 && ch.unicode() <= 91) + goto state_38; if (ch.unicode() == 92) - goto state_41; + goto state_40; if (ch.unicode() >= 93 && ch.unicode() <= 96) - goto state_39; + goto state_38; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_39; + goto state_38; if (ch.unicode() >= 123) - goto state_39; + goto state_38; goto out; state_71: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_39; + goto state_38; if (ch.unicode() == 11) - goto state_39; + goto state_38; if (ch.unicode() >= 14 && ch.unicode() <= 38) - goto state_39; + goto state_38; if (ch.unicode() == 39) - goto state_40; - if (ch.unicode() >= 40 && ch.unicode() <= 91) goto state_39; + if (ch.unicode() >= 40 && ch.unicode() <= 91) + goto state_38; if (ch.unicode() == 92) - goto state_41; + goto state_40; if (ch.unicode() >= 93 && ch.unicode() <= 96) - goto state_39; + goto state_38; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_39; + goto state_38; if (ch.unicode() >= 123) - goto state_39; + goto state_38; goto out; state_72: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_39; + goto state_38; + if (ch.unicode() == 10) + goto state_86; if (ch.unicode() == 11) - goto state_39; + goto state_38; if (ch.unicode() >= 14 && ch.unicode() <= 38) - goto state_39; + goto state_38; if (ch.unicode() == 39) - goto state_40; - if (ch.unicode() >= 40 && ch.unicode() <= 91) goto state_39; + if (ch.unicode() >= 40 && ch.unicode() <= 91) + goto state_38; if (ch.unicode() == 92) - goto state_41; + goto state_40; if (ch.unicode() >= 93 && ch.unicode() <= 96) - goto state_39; + goto state_38; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_39; + goto state_38; if (ch.unicode() >= 123) - goto state_39; + goto state_38; goto out; state_73: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_39; - if (ch.unicode() == 10) - goto state_86; + goto state_38; if (ch.unicode() == 11) - goto state_39; + goto state_38; if (ch.unicode() >= 14 && ch.unicode() <= 38) - goto state_39; + goto state_38; if (ch.unicode() == 39) - goto state_40; - if (ch.unicode() >= 40 && ch.unicode() <= 91) goto state_39; + if (ch.unicode() >= 40 && ch.unicode() <= 91) + goto state_38; if (ch.unicode() == 92) - goto state_41; + goto state_40; if (ch.unicode() >= 93 && ch.unicode() <= 96) - goto state_39; + goto state_38; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_39; + goto state_38; if (ch.unicode() >= 123) - goto state_39; + goto state_38; goto out; - state_75: + state_74: lastAcceptingPos = pos; token = QCss::NUMBER; ch = next(); if (ch.unicode() == 37) goto state_46; if (ch.unicode() == 45) - goto state_47; + goto state_48; if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_75; + goto state_74; if (ch.unicode() == 92) - goto state_50; - if (ch.unicode() == 95) goto state_51; + if (ch.unicode() == 95) + goto state_50; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_51; + goto state_50; goto out; state_76: lastAcceptingPos = pos; token = QCss::LENGTH; ch = next(); if (ch.unicode() == 45) - goto state_77; + goto state_76; if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_77; + goto state_76; if (ch.unicode() == 92) - goto state_78; - if (ch.unicode() == 95) - goto state_77; - if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_77; - goto out; - state_77: - lastAcceptingPos = pos; - token = QCss::LENGTH; - ch = next(); - if (ch.unicode() == 45) goto state_77; - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_77; - if (ch.unicode() == 92) - goto state_78; if (ch.unicode() == 95) - goto state_77; + goto state_76; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_77; + goto state_76; goto out; - state_78: + state_77: ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) goto state_87; @@ -1008,6 +993,21 @@ int QCssScanner_Generated::lex() if (ch.unicode() >= 103) goto state_87; goto out; + state_78: + lastAcceptingPos = pos; + token = QCss::LENGTH; + ch = next(); + if (ch.unicode() == 45) + goto state_76; + if (ch.unicode() >= 48 && ch.unicode() <= 57) + goto state_76; + if (ch.unicode() == 92) + goto state_77; + if (ch.unicode() == 95) + goto state_76; + if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) + goto state_76; + goto out; state_79: ch = next(); if (ch.unicode() == 45) { @@ -1017,18 +1017,20 @@ int QCssScanner_Generated::lex() goto out; state_80: lastAcceptingPos = pos; - token = QCss::ATKEYWORD_SYM; + token = QCss::IDENT; ch = next(); + if (ch.unicode() == 40) + goto state_53; if (ch.unicode() == 45) - goto state_81; + goto state_54; if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_81; + goto state_54; if (ch.unicode() == 92) - goto state_82; + goto state_55; if (ch.unicode() == 95) - goto state_81; + goto state_54; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_81; + goto state_54; goto out; state_81: lastAcceptingPos = pos; @@ -1060,23 +1062,36 @@ int QCssScanner_Generated::lex() goto out; state_83: lastAcceptingPos = pos; - token = QCss::IDENT; + token = QCss::ATKEYWORD_SYM; ch = next(); - if (ch.unicode() == 40) - goto state_58; if (ch.unicode() == 45) - goto state_59; + goto state_81; if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_59; + goto state_81; if (ch.unicode() == 92) - goto state_60; + goto state_82; if (ch.unicode() == 95) - goto state_59; + goto state_81; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_59; + goto state_81; goto out; state_84: lastAcceptingPos = pos; + token = QCss::HASH; + ch = next(); + if (ch.unicode() == 45) + goto state_63; + if (ch.unicode() >= 48 && ch.unicode() <= 57) + goto state_63; + if (ch.unicode() == 92) + goto state_64; + if (ch.unicode() == 95) + goto state_63; + if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) + goto state_63; + goto out; + state_85: + lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) @@ -1098,58 +1113,43 @@ int QCssScanner_Generated::lex() if (ch.unicode() >= 123) goto state_33; goto out; - state_85: - lastAcceptingPos = pos; - token = QCss::HASH; - ch = next(); - if (ch.unicode() == 45) - goto state_67; - if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_67; - if (ch.unicode() == 92) - goto state_68; - if (ch.unicode() == 95) - goto state_67; - if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_67; - goto out; state_86: lastAcceptingPos = pos; token = QCss::INVALID; ch = next(); if (ch.unicode() >= 1 && ch.unicode() <= 9) - goto state_39; + goto state_38; if (ch.unicode() == 11) - goto state_39; + goto state_38; if (ch.unicode() >= 14 && ch.unicode() <= 38) - goto state_39; + goto state_38; if (ch.unicode() == 39) - goto state_40; - if (ch.unicode() >= 40 && ch.unicode() <= 91) goto state_39; + if (ch.unicode() >= 40 && ch.unicode() <= 91) + goto state_38; if (ch.unicode() == 92) - goto state_41; + goto state_40; if (ch.unicode() >= 93 && ch.unicode() <= 96) - goto state_39; + goto state_38; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_39; + goto state_38; if (ch.unicode() >= 123) - goto state_39; + goto state_38; goto out; state_87: lastAcceptingPos = pos; token = QCss::LENGTH; ch = next(); if (ch.unicode() == 45) - goto state_77; + goto state_76; if (ch.unicode() >= 48 && ch.unicode() <= 57) - goto state_77; + goto state_76; if (ch.unicode() == 92) - goto state_78; - if (ch.unicode() == 95) goto state_77; + if (ch.unicode() == 95) + goto state_76; if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) - goto state_77; + goto state_76; goto out; state_89: lastAcceptingPos = pos; @@ -1176,4 +1176,3 @@ int QCssScanner_Generated::lex() } return token; } - diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 69255fd59d..a51e98ce85 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -116,7 +116,17 @@ bool QFontDef::exactMatch(const QFontDef &other) const if (stretch != 0 && other.stretch != 0 && stretch != other.stretch) return false; + if (families.size() != other.families.size()) + return false; + QString this_family, this_foundry, other_family, other_foundry; + for (int i = 0; i < families.size(); ++i) { + QFontDatabase::parseFontName(families.at(i), this_foundry, this_family); + QFontDatabase::parseFontName(other.families.at(i), other_foundry, other_family); + if (this_family != other_family || this_foundry != other_foundry) + return false; + } + QFontDatabase::parseFontName(family, this_foundry, this_family); QFontDatabase::parseFontName(other.family, other_foundry, other_family); @@ -261,6 +271,9 @@ void QFontPrivate::resolve(uint mask, const QFontPrivate *other) if (! (mask & QFont::FamilyResolved)) request.family = other->request.family; + if (!(mask & QFont::FamiliesResolved)) + request.families = other->request.families; + if (! (mask & QFont::StyleNameResolved)) request.styleName = other->request.styleName; @@ -340,7 +353,7 @@ QFontEngineData::~QFontEngineData() \class QFont \reentrant - \brief The QFont class specifies a font used for drawing text. + \brief The QFont class specifies a query for a font used for drawing text. \ingroup painting \ingroup appearance @@ -348,6 +361,7 @@ QFontEngineData::~QFontEngineData() \ingroup richtext-processing \inmodule QtGui + QFont can be regarded as a query for one or more fonts on the system. When you create a QFont object you specify various attributes that you want the font to have. Qt will use the font with the specified @@ -355,9 +369,15 @@ QFontEngineData::~QFontEngineData() matching installed font. The attributes of the font that is actually used are retrievable from a QFontInfo object. If the window system provides an exact match exactMatch() returns \c true. - Use QFontMetrics to get measurements, e.g. the pixel length of a + Use QFontMetricsF to get measurements, e.g. the pixel length of a string using QFontMetrics::width(). + Attributes which are not specifically set will not affect the font + selection algorithm, and default values will be preferred instead. + + To load a specific physical font, typically represented by a single file, + use QRawFont instead. + Note that a QGuiApplication instance must exist before a QFont can be used. You can set the application's default font with QGuiApplication::setFont(). @@ -390,8 +410,6 @@ QFontEngineData::~QFontEngineData() setStyleHint(). The default family (corresponding to the current style hint) is returned by defaultFamily(). - The font-matching algorithm has a lastResortFamily() and - lastResortFont() in cases where a suitable match cannot be found. You can provide substitutions for font family names using insertSubstitution() and insertSubstitutions(). Substitutions can be removed with removeSubstitutions(). Use substitute() to retrieve @@ -419,18 +437,21 @@ QFontEngineData::~QFontEngineData() \target fontmatching The font matching algorithm works as follows: \list 1 - \li The specified font family is searched for. - \li If not found, the styleHint() is used to select a replacement - family. - \li Each replacement font family is searched for. - \li If none of these are found or there was no styleHint(), "helvetica" - will be searched for. - \li If "helvetica" isn't found Qt will try the lastResortFamily(). - \li If the lastResortFamily() isn't found Qt will try the - lastResortFont() which will always return a name of some kind. + \li The specified font families (set by setFamilies()) are searched for. + \li If not found, then if set the specified font family exists and can be used to represent + the writing system in use, it will be selected. + \li If not, a replacement font that supports the writing system is + selected. The font matching algorithm will try to find the + best match for all the properties set in the QFont. How this is + done varies from platform to platform. + \li If no font exists on the system that can support the text, + then special "missing character" boxes will be shown in its place. \endlist - Note that the actual font matching algorithm varies from platform to platform. + \note If the selected font, though supporting the writing system in general, + is missing glyphs for one or more specific characters, then Qt will try to + find a fallback font for this or these particular characters. This feature + can be disabled using QFont::NoFontMerging style strategy. In Windows a request for the "Courier" font is automatically changed to "Courier New", an improved version of Courier that allows for smooth scaling. @@ -499,6 +520,7 @@ QFontEngineData::~QFontEngineData() individually and then considered resolved. \value FamilyResolved + \value FamiliesResolved \value SizeResolved \value StyleHintResolved \value StyleStrategyResolved @@ -540,14 +562,25 @@ QFontEngineData::~QFontEngineData() \since 5.2 */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! + \obsolete Constructs a font from \a font for use on the paint device \a pd. */ QFont::QFont(const QFont &font, QPaintDevice *pd) + : QFont(font, static_cast<const QPaintDevice*>(pd)) +{} +#endif + +/*! + \since 5.13 + Constructs a font from \a font for use on the paint device \a pd. +*/ +QFont::QFont(const QFont &font, const QPaintDevice *pd) : resolve_mask(font.resolve_mask) { - Q_ASSERT(pd != 0); - int dpi = pd->logicalDpiY(); + Q_ASSERT(pd); + const int dpi = pd->logicalDpiY(); const int screen = 0; if (font.d->dpi != dpi || font.d->screen != screen ) { d = new QFontPrivate(*font.d); @@ -1684,6 +1717,7 @@ bool QFont::operator<(const QFont &f) const if (r1.stretch != r2.stretch) return r1.stretch < r2.stretch; if (r1.styleHint != r2.styleHint) return r1.styleHint < r2.styleHint; if (r1.styleStrategy != r2.styleStrategy) return r1.styleStrategy < r2.styleStrategy; + if (r1.families != r2.families) return r1.families < r2.families; if (r1.family != r2.family) return r1.family < r2.family; if (f.d->capital != d->capital) return f.d->capital < d->capital; @@ -2133,21 +2167,22 @@ void QFont::cacheStatistics() { } +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn QString QFont::lastResortFamily() const - Returns the "last resort" font family name. + \obsolete - The current implementation tries a wide variety of common fonts, - returning the first one it finds. Is is possible that no family is - found in which case an empty string is returned. + This function is deprecated and is not in use by the font + selection algorithm in Qt 5. It always returns "helvetica". \sa lastResortFont() */ QString QFont::lastResortFamily() const { - return QString::fromLatin1("helvetica"); + return QStringLiteral("helvetica"); } +#endif extern QStringList qt_fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script); @@ -2169,34 +2204,66 @@ QString QFont::defaultFamily() const return QString(); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn QString QFont::lastResortFont() const - Returns a "last resort" font name for the font matching algorithm. - This is used if the last resort family is not available. It will - always return a name, if necessary returning something like - "fixed" or "system". + \obsolete + + Deprecated function. Since Qt 5.0, this is not used by the font selection algorithm. For + compatibility it remains in the API, but will always return the same value as lastResortFamily(). +*/ +QString QFont::lastResortFont() const +{ +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + return lastResortFamily(); +QT_WARNING_POP +} +#endif + +/*! + \since 5.13 + + Returns the requested font family names, i.e. the names set in the last + setFamilies() call or via the constructor. Otherwise it returns an + empty list. + + \sa setFamily(), setFamilies(), family(), substitutes(), substitute() +*/ + +QStringList QFont::families() const +{ + return d->request.families; +} - The current implementation tries a wide variety of common fonts, - returning the first one it finds. The implementation may change - at any time, but this function will always return a string - containing something. +/*! + \since 5.13 - It is theoretically possible that there really isn't a - lastResortFont() in which case Qt will abort with an error - message. We have not been able to identify a case where this - happens. Please \l{bughowto.html}{report it as a bug} if - it does, preferably with a list of the fonts you have installed. + Sets the list of family names for the font. The names are case + insensitive and may include a foundry name. The first family in + \a families will be set as the main family for the font. - \sa lastResortFamily() + Each family name entry in \a families may optionally also include a + foundry name, e.g. "Helvetica [Cronyx]". If the family is + available from more than one foundry and the foundry isn't + specified, an arbitrary foundry is chosen. If the family isn't + available a family will be set using the \l{QFont}{font matching} + algorithm. + + \sa family(), families(), setFamily(), setStyleHint(), QFontInfo */ -QString QFont::lastResortFont() const + +void QFont::setFamilies(const QStringList &families) { - qFatal("QFont::lastResortFont: Cannot find any reasonable font"); - // Shut compiler up - return QString(); + if ((resolve_mask & QFont::FamiliesResolved) && d->request.families == families) + return; + detach(); + d->request.families = families; + resolve_mask |= QFont::FamiliesResolved; } + /***************************************************************************** QFont stream functions *****************************************************************************/ @@ -2261,6 +2328,8 @@ QDataStream &operator<<(QDataStream &s, const QFont &font) s << (quint8)font.d->request.hintingPreference; if (s.version() >= QDataStream::Qt_5_6) s << (quint8)font.d->capital; + if (s.version() >= QDataStream::Qt_5_13) + s << font.d->request.families; return s; } @@ -2356,6 +2425,11 @@ QDataStream &operator>>(QDataStream &s, QFont &font) s >> value; font.d->capital = QFont::Capitalization(value); } + if (s.version() >= QDataStream::Qt_5_13) { + QStringList value; + s >> value; + font.d->request.families = value; + } return s; } @@ -2879,9 +2953,9 @@ void QFontCache::insertEngine(const Key &key, QFontEngine *engine, bool insertMu data.timestamp = ++current_timestamp; if (insertMulti) - engineCache.insertMulti(key, data); - else engineCache.insert(key, data); + else + engineCache.replace(key, data); // only increase the cost if this is the first time we insert the engine if (++engineCacheCount[engine] == 1) increaseCost(engine->cache_cost); diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 9c250c82c3..e86f06353a 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -164,13 +164,17 @@ public: WordSpacingResolved = 0x4000, HintingPreferenceResolved = 0x8000, StyleNameResolved = 0x10000, - AllPropertiesResolved = 0x1ffff + FamiliesResolved = 0x20000, + AllPropertiesResolved = 0x3ffff }; QFont(); QFont(const QString &family, int pointSize = -1, int weight = -1, bool italic = false); - QFont(const QFont &, QPaintDevice *pd); - QFont(const QFont &); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QFont(const QFont &font, QPaintDevice *pd); +#endif + QFont(const QFont &font, const QPaintDevice *pd); + QFont(const QFont &font); ~QFont(); void swap(QFont &other) @@ -179,6 +183,9 @@ public: QString family() const; void setFamily(const QString &); + QStringList families() const; + void setFamilies(const QStringList &); + QString styleName() const; void setStyleName(const QString &); @@ -282,8 +289,10 @@ public: static void cacheStatistics(); QString defaultFamily() const; - QString lastResortFamily() const; - QString lastResortFont() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED QString lastResortFamily() const; + QT_DEPRECATED QString lastResortFont() const; +#endif QFont resolve(const QFont &) const; inline uint resolve() const { return resolve_mask; } diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index c5847f532b..e86ec31e47 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -78,6 +78,7 @@ struct QFontDef } QString family; + QStringList families; QString styleName; QStringList fallBackFamilies; @@ -109,6 +110,7 @@ struct QFontDef && styleStrategy == other.styleStrategy && ignorePitch == other.ignorePitch && fixedPitch == other.fixedPitch && family == other.family + && families == other.families && styleName == other.styleName && hintingPreference == other.hintingPreference ; @@ -122,6 +124,7 @@ struct QFontDef if (styleHint != other.styleHint) return styleHint < other.styleHint; if (styleStrategy != other.styleStrategy) return styleStrategy < other.styleStrategy; if (family != other.family) return family < other.family; + if (families != other.families) return families < other.families; if (styleName != other.styleName) return styleName < other.styleName; if (hintingPreference != other.hintingPreference) return hintingPreference < other.hintingPreference; @@ -144,6 +147,7 @@ inline uint qHash(const QFontDef &fd, uint seed = 0) Q_DECL_NOTHROW ^ qHash(fd.ignorePitch) ^ qHash(fd.fixedPitch) ^ qHash(fd.family, seed) + ^ qHash(fd.families, seed) ^ qHash(fd.styleName) ^ qHash(fd.hintingPreference) ; @@ -161,7 +165,7 @@ public: QFontEngine *engines[QChar::ScriptCount]; private: - Q_DISABLE_COPY(QFontEngineData) + Q_DISABLE_COPY_MOVE(QFontEngineData) }; @@ -270,7 +274,7 @@ public: uint hits; }; - typedef QMap<Key,Engine> EngineCache; + typedef QMultiMap<Key,Engine> EngineCache; EngineCache engineCache; QHash<QFontEngine *, int> engineCacheCount; diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 196eebb353..fa9573441a 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -696,20 +696,20 @@ static QStringList familyList(const QFontDef &req) { // list of families to try QStringList family_list; - if (req.family.isEmpty()) - return family_list; - const auto list = req.family.splitRef(QLatin1Char(',')); - const int numFamilies = list.size(); - family_list.reserve(numFamilies); - for (int i = 0; i < numFamilies; ++i) { - QStringRef str = list.at(i).trimmed(); - if ((str.startsWith(QLatin1Char('"')) && str.endsWith(QLatin1Char('"'))) - || (str.startsWith(QLatin1Char('\'')) && str.endsWith(QLatin1Char('\'')))) - str = str.mid(1, str.length() - 2); - family_list << str.toString(); + family_list << req.families; + if (!req.family.isEmpty()) { + const auto list = req.family.splitRef(QLatin1Char(',')); + const int numFamilies = list.size(); + family_list.reserve(numFamilies); + for (int i = 0; i < numFamilies; ++i) { + QStringRef str = list.at(i).trimmed(); + if ((str.startsWith(QLatin1Char('"')) && str.endsWith(QLatin1Char('"'))) + || (str.startsWith(QLatin1Char('\'')) && str.endsWith(QLatin1Char('\'')))) + str = str.mid(1, str.length() - 2); + family_list << str.toString(); + } } - // append the substitute list for each family in family_list for (int i = 0, size = family_list.size(); i < size; ++i) family_list += QFont::substitutes(family_list.at(i)); @@ -2688,9 +2688,8 @@ QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script) } QString family_name, foundry_name; - - parseFontName(request.family, foundry_name, family_name); - + const QString requestFamily = request.families.size() > 0 ? request.families.at(0) : request.family; + parseFontName(requestFamily, foundry_name, family_name); QtFontDesc desc; QList<int> blackListed; int index = match(multi ? QChar::Script_Common : script, request, family_name, foundry_name, &desc, blackListed); @@ -2703,8 +2702,8 @@ QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script) // Don't pass empty family names to the platform font database, since it will then invoke its own matching // and we will be out of sync with the matched font. - if (fontDef.family.isEmpty()) - fontDef.family = desc.family->name; + if (fontDef.families.isEmpty() && fontDef.family.isEmpty()) + fontDef.families = QStringList(desc.family->name); engine = loadEngine(script, fontDef, desc.family, desc.foundry, desc.style, desc.size); @@ -2717,13 +2716,13 @@ QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script) } if (!engine) { - if (!request.family.isEmpty()) { + if (!requestFamily.isEmpty()) { QFont::StyleHint styleHint = QFont::StyleHint(request.styleHint); if (styleHint == QFont::AnyStyle && request.fixedPitch) styleHint = QFont::TypeWriter; QStringList fallbacks = request.fallBackFamilies - + fallbacksForFamily(request.family, + + fallbacksForFamily(requestFamily, QFont::Style(request.style), styleHint, QChar::Script(script)); @@ -2741,7 +2740,7 @@ QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script) index = match(multi ? QChar::Script_Common : script, def, def.family, QLatin1String(""), &desc, blackListed); if (index >= 0) { QFontDef loadDef = def; - if (loadDef.family.isEmpty()) + if (loadDef.families.isEmpty() && loadDef.family.isEmpty()) loadDef.family = desc.family->name; engine = loadEngine(script, loadDef, desc.family, desc.foundry, desc.style, desc.size); if (engine) @@ -2782,7 +2781,10 @@ void QFontDatabase::load(const QFontPrivate *d, int script) // look for the requested font in the engine data cache // note: fallBackFamilies are not respected in the EngineData cache key; // join them with the primary selection family to avoid cache misses - req.family = fallBackFamilies.join(QLatin1Char(',')); + if (!d->request.family.isEmpty()) + req.family = fallBackFamilies.join(QLatin1Char(',')); + if (!d->request.families.isEmpty()) + req.families = fallBackFamilies; d->engineData = fontCache->findEngineData(req); if (!d->engineData) { @@ -2803,14 +2805,14 @@ void QFontDatabase::load(const QFontPrivate *d, int script) req.fallBackFamilies = fallBackFamilies; if (!req.fallBackFamilies.isEmpty()) - req.family = req.fallBackFamilies.takeFirst(); + req.families = QStringList(req.fallBackFamilies.takeFirst()); // list of families to try QStringList family_list; - if (!req.family.isEmpty()) { + if (!req.families.isEmpty()) { // Add primary selection - family_list << req.family; + family_list << req.families.at(0); // add the default family QString defaultFamily = QGuiApplication::font().family(); @@ -2824,11 +2826,11 @@ void QFontDatabase::load(const QFontPrivate *d, int script) QStringList::ConstIterator it = family_list.constBegin(), end = family_list.constEnd(); for (; !fe && it != end; ++it) { - req.family = *it; + req.families = QStringList(*it); fe = QFontDatabase::findFont(req, script); if (fe) { - if (fe->type() == QFontEngine::Box && !req.family.isEmpty()) { + if (fe->type() == QFontEngine::Box && !req.families.at(0).isEmpty()) { if (fe->ref.load() == 0) delete fe; fe = 0; diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index eb7e416dd1..cab4ca0047 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -1842,7 +1842,7 @@ QFontEngine *QFontEngineMulti::loadEngine(int at) { QFontDef request(fontDef); request.styleStrategy |= QFont::NoFontMerging; - request.family = fallbackFamilyAt(at - 1); + request.families = QStringList(fallbackFamilyAt(at - 1)); // At this point, the main script of the text has already been considered // when fetching the list of fallback families from the database, and the diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 407559ad51..c8dc8d676e 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -156,6 +156,8 @@ QFontMetrics::QFontMetrics(const QFont &font) } /*! + \since 5.13 + \fn QFontMetrics::QFontMetrics(const QFont &font, const QPaintDevice *paintdevice) Constructs a font metrics object for \a font and \a paintdevice. The font metrics will be compatible with the paintdevice passed. @@ -168,9 +170,21 @@ QFontMetrics::QFontMetrics(const QFont &font) passed in the constructor at the time it is created, and is not updated if the font's attributes are changed later. */ + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \fn QFontMetrics::QFontMetrics(const QFont &font, QPaintDevice *paintdevice) + \obsolete + Identical to QFontMetrics::QFontMetrics(const QFont &font, const QPaintDevice *paintdevice) +*/ + + QFontMetrics::QFontMetrics(const QFont &font, QPaintDevice *paintdevice) +#else +QFontMetrics::QFontMetrics(const QFont &font, const QPaintDevice *paintdevice) +#endif { - int dpi = paintdevice ? paintdevice->logicalDpiY() : qt_defaultDpi(); + const int dpi = paintdevice ? paintdevice->logicalDpiY() : qt_defaultDpi(); const int screen = 0; if (font.d->dpi != dpi || font.d->screen != screen ) { d = new QFontPrivate(*font.d); @@ -1127,6 +1141,8 @@ QFontMetricsF::QFontMetricsF(const QFont &font) } /*! + \fn QFontMetricsF::QFontMetricsF(const QFont &font, const QPaintDevice *paintdevice) + \since 5.13 Constructs a font metrics object for \a font and \a paintdevice. The font metrics will be compatible with the paintdevice passed. @@ -1139,7 +1155,20 @@ QFontMetricsF::QFontMetricsF(const QFont &font) passed in the constructor at the time it is created, and is not updated if the font's attributes are changed later. */ + + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \fn QFontMetricsF::QFontMetricsF(const QFont &font, QPaintDevice *paintdevice) + \obsolete + Identical to QFontMetricsF::QFontMetricsF(const QFont &font, const QPaintDevice *paintdevice) +*/ + + QFontMetricsF::QFontMetricsF(const QFont &font, QPaintDevice *paintdevice) +#else +QFontMetricsF::QFontMetricsF(const QFont &font, const QPaintDevice *paintdevice) +#endif { int dpi = paintdevice ? paintdevice->logicalDpiY() : qt_defaultDpi(); const int screen = 0; diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index b6167a1d47..61931fa9bc 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -59,7 +59,19 @@ class Q_GUI_EXPORT QFontMetrics { public: explicit QFontMetrics(const QFont &); - QFontMetrics(const QFont &, QPaintDevice *pd); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QFontMetrics(const QFont &font, QPaintDevice *pd); +#ifndef Q_QDOC + // the template is necessary to make QFontMetrics(font,nullptr) and QFontMetrics(font,NULL) + // not ambiguous. Implementation detail that should not be documented. + template<char = 0> +#endif + QFontMetrics(const QFont &font, const QPaintDevice *pd) + : QFontMetrics(font, const_cast<QPaintDevice*>(pd)) + {} +#else + QFontMetrics(const QFont &font, const QPaintDevice *pd); +#endif QFontMetrics(const QFontMetrics &); ~QFontMetrics(); @@ -92,8 +104,11 @@ public: int rightBearing(QChar) const; #if QT_DEPRECATED_SINCE(5, 11) + QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance") int width(const QString &, int len = -1) const; + QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance") int width(const QString &, int len, int flags) const; + QT_DEPRECATED_X("Use QFontMetrics::horizontalAdvance") int width(QChar) const; #endif @@ -137,8 +152,20 @@ Q_DECLARE_SHARED(QFontMetrics) class Q_GUI_EXPORT QFontMetricsF { public: - explicit QFontMetricsF(const QFont &); - QFontMetricsF(const QFont &, QPaintDevice *pd); + explicit QFontMetricsF(const QFont &font); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QFontMetricsF(const QFont &font, QPaintDevice *pd); +#ifndef Q_QDOC + // the template is necessary to make QFontMetrics(font,nullptr) and QFontMetrics(font,NULL) + // not ambiguous. Implementation detail that should not be documented. + template<char = 0> +#endif + QFontMetricsF(const QFont &font, const QPaintDevice *pd) + : QFontMetricsF(font, const_cast<QPaintDevice*>(pd)) + {} +#else + QFontMetricsF(const QFont &font, const QPaintDevice *pd); +#endif QFontMetricsF(const QFontMetrics &); QFontMetricsF(const QFontMetricsF &); ~QFontMetricsF(); diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h index d87f89f0fd..ad0d50a4c0 100644 --- a/src/gui/text/qsyntaxhighlighter.h +++ b/src/gui/text/qsyntaxhighlighter.h @@ -64,7 +64,7 @@ class Q_GUI_EXPORT QSyntaxHighlighter : public QObject public: explicit QSyntaxHighlighter(QObject *parent); explicit QSyntaxHighlighter(QTextDocument *parent); - virtual ~QSyntaxHighlighter(); + ~QSyntaxHighlighter(); void setDocument(QTextDocument *doc); QTextDocument *document() const; diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h index 02a6a429fa..de01a02fbb 100644 --- a/src/gui/text/qtextdocumentfragment_p.h +++ b/src/gui/text/qtextdocumentfragment_p.h @@ -109,7 +109,7 @@ public: uint importedFromPlainText : 1; private: - Q_DISABLE_COPY(QTextDocumentFragmentPrivate) + Q_DISABLE_COPY_MOVE(QTextDocumentFragmentPrivate) }; #ifndef QT_NO_TEXTHTMLPARSER diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp index 5ea04fe9e9..ee72300bc7 100644 --- a/src/gui/text/qtextdocumentwriter.cpp +++ b/src/gui/text/qtextdocumentwriter.cpp @@ -206,8 +206,8 @@ void QTextDocumentWriter::setDevice (QIODevice *device) } /*! - Returns the device currently assigned, or 0 if no device has been - assigned. + Returns the device currently assigned, or \nullptr if no device + has been assigned. */ QIODevice *QTextDocumentWriter::device () const { diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 919cdf3ff1..3bae6d4eb7 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -361,6 +361,12 @@ void QTextFormatPrivate::recalcFont() const case QTextFormat::FontFamily: f.setFamily(props.at(i).value.toString()); break; + case QTextFormat::FontFamilies: + f.setFamilies(props.at(i).value.toStringList()); + break; + case QTextFormat::FontStyleName: + f.setStyleName(props.at(i).value.toString()); + break; case QTextFormat::FontPointSize: f.setPointSizeF(props.at(i).value.toReal()); break; @@ -562,6 +568,8 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) Character properties \value FontFamily + \value FontFamilies + \value FontStyleName \value FontPointSize \value FontPixelSize \value FontSizeAdjustment Specifies the change in size given to the fontsize already set using @@ -1391,6 +1399,41 @@ QTextCharFormat::QTextCharFormat(const QTextFormat &fmt) \sa font() */ +/*! + \fn void QTextCharFormat::setFontFamilies(const QStringList &families) + \since 5.13 + + Sets the text format's font \a families. + + \sa setFont() +*/ + +/*! + \fn QStringList QTextCharFormat::fontFamilies() const + \since 5.13 + + Returns the text format's font families. + + \sa font() +*/ + +/*! + \fn void QTextCharFormat::setFontStyleName(const QString &styleName) + \since 5.13 + + Sets the text format's font \a style name. + + \sa setFont(), QFont::setStyleName() +*/ + +/*! + \fn QStringList QTextCharFormat::fontStyleName() const + \since 5.13 + + Returns the text format's font style name. + + \sa font(), QFont::styleName() +*/ /*! \fn void QTextCharFormat::setFontPointSize(qreal size) @@ -1744,6 +1787,7 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style) */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn void QTextCharFormat::setAnchorName(const QString &name) \obsolete @@ -1754,6 +1798,7 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style) hyperlink, the destination must be set with setAnchorHref() and the anchor must be enabled with setAnchor(). */ +#endif /*! \fn void QTextCharFormat::setAnchorNames(const QStringList &names) @@ -1764,6 +1809,7 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style) the anchor must be enabled with setAnchor(). */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn QString QTextCharFormat::anchorName() const \obsolete @@ -1783,6 +1829,7 @@ QString QTextCharFormat::anchorName() const return QString(); return prop.toString(); } +#endif /*! \fn QStringList QTextCharFormat::anchorNames() const @@ -1920,6 +1967,11 @@ void QTextCharFormat::setFont(const QFont &font, FontPropertiesInheritanceBehavi if (mask & QFont::FamilyResolved) setFontFamily(font.family()); + if (mask & QFont::FamiliesResolved) + setFontFamilies(font.families()); + if (mask & QFont::StyleNameResolved) + setFontStyleName(font.styleName()); + if (mask & QFont::SizeResolved) { const qreal pointSize = font.pointSizeF(); if (pointSize > 0) { diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index a8e573d5a4..80d8e82694 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -188,6 +188,8 @@ public: FontStyleStrategy = 0x1FE4, FontKerning = 0x1FE5, FontHintingPreference = 0x1FE6, + FontFamilies = 0x1FE7, + FontStyleName = 0x1FE8, FontFamily = 0x2000, FontPointSize = 0x2001, FontSizeAdjustment = 0x2002, @@ -428,6 +430,16 @@ public: inline QString fontFamily() const { return stringProperty(FontFamily); } + inline void setFontFamilies(const QStringList &families) + { setProperty(FontFamilies, QVariant(families)); } + inline QVariant fontFamilies() const + { return property(FontFamilies); } + + inline void setFontStyleName(const QString &styleName) + { setProperty(FontStyleName, styleName); } + inline QVariant fontStyleName() const + { return property(FontStyleName); } + inline void setFontPointSize(qreal size) { setProperty(FontPointSize, size); } inline qreal fontPointSize() const @@ -540,9 +552,13 @@ public: inline QString anchorHref() const { return stringProperty(AnchorHref); } +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setAnchorNames() instead") inline void setAnchorName(const QString &name) { setAnchorNames(QStringList(name)); } + QT_DEPRECATED_X("Use anchorNames() instead") QString anchorName() const; +#endif inline void setAnchorNames(const QStringList &names) { setProperty(AnchorName, names); } diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h index 3557c17a97..001a243e84 100644 --- a/src/gui/text/qtextformat_p.h +++ b/src/gui/text/qtextformat_p.h @@ -104,7 +104,7 @@ public: private: QFont defaultFnt; - Q_DISABLE_COPY(QTextFormatCollection) + Q_DISABLE_COPY_MOVE(QTextFormatCollection) }; QT_END_NAMESPACE diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index c9a2a33e5a..adc3b138f7 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -861,7 +861,8 @@ QString QTextHtmlParser::parseWord() ++pos; while (pos < len) { QChar c = txt.at(pos++); - if (c == QLatin1Char('\'')) + // Allow for escaped single quotes as they may be part of the string + if (c == QLatin1Char('\'') && (txt.length() > 1 && txt.at(pos - 2) != QLatin1Char('\\'))) break; else word += c; @@ -1543,7 +1544,7 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes) if (key == QLatin1String("href")) node->charFormat.setAnchorHref(value); else if (key == QLatin1String("name")) - node->charFormat.setAnchorName(value); + node->charFormat.setAnchorNames({value}); break; case Html_img: if (key == QLatin1String("src") || key == QLatin1String("source")) { @@ -1683,7 +1684,7 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes) node->charFormat.setToolTip(value); } else if (key == QLatin1String("id")) { node->charFormat.setAnchor(true); - node->charFormat.setAnchorName(value); + node->charFormat.setAnchorNames({value}); } } diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index f3f0caa379..a3e194f835 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -344,6 +344,8 @@ QTextLayout::QTextLayout(const QString& text) } /*! + \since 5.13 + \fn QTextLayout::QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) Constructs a text layout to lay out the given \a text with the specified \a font. @@ -351,11 +353,20 @@ QTextLayout::QTextLayout(const QString& text) the paint device, \a paintdevice. If \a paintdevice is 0 the calculations will be done in screen metrics. */ -QTextLayout::QTextLayout(const QString& text, const QFont &font, QPaintDevice *paintdevice) + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \fn QTextLayout::QTextLayout(const QString &text, const QFont &font, QPaintDevice *paintdevice) + \obsolete + Identical to QTextLayout::QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) +*/ + +QTextLayout::QTextLayout(const QString &text, const QFont &font, QPaintDevice *paintdevice) +#else +QTextLayout::QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) +#endif { - QFont f(font); - if (paintdevice) - f = QFont(font, paintdevice); + const QFont f(paintdevice ? QFont(font, paintdevice) : font); d = new QTextEngine((text.isNull() ? (const QString&)QString::fromLatin1("") : text), f); } @@ -1127,8 +1138,6 @@ void QTextLayout::draw(QPainter *p, const QPointF &pos, const QVector<FormatRang QPainterPath textDoneRegion; for (int i = 0; i < selections.size(); ++i) { FormatRange selection = selections.at(i); - const QBrush bg = selection.format.background(); - QPainterPath region; region.setFillRule(Qt::WindingFill); diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index 67bc75a6b8..a29791534e 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -107,7 +107,19 @@ public: // does itemization QTextLayout(); QTextLayout(const QString& text); - QTextLayout(const QString& text, const QFont &font, QPaintDevice *paintdevice = nullptr); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QTextLayout(const QString &text, const QFont &font, QPaintDevice *paintdevice = nullptr); +#ifndef Q_QDOC + // the template is necessary to make QTextLayout(font,text,nullptr) and QTextLayout(font,text,NULL) + // not ambiguous. Implementation detail that should not be documented. + template<char = 0> +#endif + QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) + : QTextLayout(text, font, const_cast<QPaintDevice*>(paintdevice)) + {} +#else + QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice = nullptr); +#endif QTextLayout(const QTextBlock &b); ~QTextLayout(); diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp index bec33d5f4d..5857afa048 100644 --- a/src/gui/text/qtextlist.cpp +++ b/src/gui/text/qtextlist.cpp @@ -100,6 +100,7 @@ public: \sa QTextBlock, QTextListFormat, QTextCursor */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn bool QTextList::isEmpty() const \obsolete @@ -111,6 +112,7 @@ public: \sa count() */ +#endif /*! \internal */ diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h index 3967787f03..cfb9f9456f 100644 --- a/src/gui/text/qtextlist.h +++ b/src/gui/text/qtextlist.h @@ -59,8 +59,11 @@ public: int count() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use count() instead") inline bool isEmpty() const { return count() == 0; } +#endif QTextBlock item(int i) const; diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 0ed8be8530..18c5a4f3dd 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -704,8 +704,8 @@ QTextFrame::iterator &QTextFrame::iterator::operator=(const iterator &other) Q_D #endif /*! - Returns the current frame pointed to by the iterator, or 0 if the - iterator currently points to a block. + Returns the current frame pointed to by the iterator, or \nullptr + if the iterator currently points to a block. \sa currentBlock() */ @@ -1291,12 +1291,12 @@ QVector<QTextLayout::FormatRange> QTextBlock::textFormats() const } /*! - Returns the text document this text block belongs to, or 0 if the - text block does not belong to any document. + Returns the text document this text block belongs to, or \nullptr + if the text block does not belong to any document. */ const QTextDocument *QTextBlock::document() const { - return p ? p->document() : 0; + return p ? p->document() : nullptr; } /*! @@ -1306,7 +1306,7 @@ const QTextDocument *QTextBlock::document() const QTextList *QTextBlock::textList() const { if (!isValid()) - return 0; + return nullptr; const QTextBlockFormat fmt = blockFormat(); QTextObject *obj = p->document()->objectForFormat(fmt); diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp index 103e0a8222..1a3f5309ae 100644 --- a/src/gui/text/qtextodfwriter.cpp +++ b/src/gui/text/qtextodfwriter.cpp @@ -89,7 +89,7 @@ public: contentStream = device; } - virtual ~QXmlStreamStrategy() + ~QXmlStreamStrategy() { if (contentStream) contentStream->close(); @@ -886,26 +886,30 @@ void QTextOdfWriter::tableCellStyleElement(QXmlStreamWriter &writer, const int & if (hasBorder) { writer.writeAttribute(foNS, QString::fromLatin1("border"), pixelToPoint(tableFormatTmp.border()) + QLatin1String(" ") - + borderStyleName(tableFormatTmp.borderStyle()) - + QLatin1String(" #000000")); //!! HARD-CODING color black + + borderStyleName(tableFormatTmp.borderStyle()) + QLatin1String(" ") + + tableFormatTmp.borderBrush().color().name(QColor::HexRgb)); } - qreal padding = format.topPadding(); - if (padding > 0 && padding == format.bottomPadding() - && padding == format.leftPadding() && padding == format.rightPadding()) { + qreal topPadding = format.topPadding(); + qreal padding = topPadding + tableFormatTmp.cellPadding(); + if (padding > 0 && topPadding == format.bottomPadding() + && topPadding == format.leftPadding() && topPadding == format.rightPadding()) { writer.writeAttribute(foNS, QString::fromLatin1("padding"), pixelToPoint(padding)); } else { if (padding > 0) writer.writeAttribute(foNS, QString::fromLatin1("padding-top"), pixelToPoint(padding)); - if (format.bottomPadding() > 0) + padding = format.bottomPadding() + tableFormatTmp.cellPadding(); + if (padding > 0) writer.writeAttribute(foNS, QString::fromLatin1("padding-bottom"), - pixelToPoint(format.bottomPadding())); - if (format.leftPadding() > 0) + pixelToPoint(padding)); + padding = format.leftPadding() + tableFormatTmp.cellPadding(); + if (padding > 0) writer.writeAttribute(foNS, QString::fromLatin1("padding-left"), - pixelToPoint(format.leftPadding())); - if (format.rightPadding() > 0) + pixelToPoint(padding)); + padding = format.rightPadding() + tableFormatTmp.cellPadding(); + if (padding > 0) writer.writeAttribute(foNS, QString::fromLatin1("padding-right"), - pixelToPoint(format.rightPadding())); + pixelToPoint(padding)); } if (format.hasProperty(QTextFormat::TextVerticalAlignment)) { diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h index eed6ee6a62..378072b366 100644 --- a/src/gui/text/qzipreader_p.h +++ b/src/gui/text/qzipreader_p.h @@ -116,7 +116,7 @@ public: private: QZipReaderPrivate *d; - Q_DISABLE_COPY(QZipReader) + Q_DISABLE_COPY_MOVE(QZipReader) }; Q_DECLARE_TYPEINFO(QZipReader::FileInfo, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(QZipReader::Status, Q_PRIMITIVE_TYPE); diff --git a/src/gui/text/qzipwriter_p.h b/src/gui/text/qzipwriter_p.h index 433bbab31e..b3bb5929cf 100644 --- a/src/gui/text/qzipwriter_p.h +++ b/src/gui/text/qzipwriter_p.h @@ -108,7 +108,7 @@ public: void close(); private: QZipWriterPrivate *d; - Q_DISABLE_COPY(QZipWriter) + Q_DISABLE_COPY_MOVE(QZipWriter) }; QT_END_NAMESPACE diff --git a/src/gui/util/qlayoutpolicy_p.h b/src/gui/util/qlayoutpolicy_p.h index d92896e6e3..6457aeb653 100644 --- a/src/gui/util/qlayoutpolicy_p.h +++ b/src/gui/util/qlayoutpolicy_p.h @@ -66,6 +66,7 @@ class QVariant; class Q_GUI_EXPORT QLayoutPolicy { + Q_GADGET Q_ENUMS(Policy) public: diff --git a/src/network/access/http2/bitstreams_p.h b/src/network/access/http2/bitstreams_p.h index 9eba319dc2..ca272062a6 100644 --- a/src/network/access/http2/bitstreams_p.h +++ b/src/network/access/http2/bitstreams_p.h @@ -89,7 +89,7 @@ public: void clear(); private: - Q_DISABLE_COPY(BitOStream); + Q_DISABLE_COPY_MOVE(BitOStream); std::vector<uchar> &buffer; quint64 bitsSet; diff --git a/src/network/access/http2/hpacktable_p.h b/src/network/access/http2/hpacktable_p.h index aaea89b986..5eaccbffce 100644 --- a/src/network/access/http2/hpacktable_p.h +++ b/src/network/access/http2/hpacktable_p.h @@ -227,7 +227,7 @@ private: mutable QByteArray dummyDst; - Q_DISABLE_COPY(FieldLookupTable); + Q_DISABLE_COPY_MOVE(FieldLookupTable); }; } diff --git a/src/network/access/qabstractnetworkcache.cpp b/src/network/access/qabstractnetworkcache.cpp index 2b670b2cce..0b94dff61e 100644 --- a/src/network/access/qabstractnetworkcache.cpp +++ b/src/network/access/qabstractnetworkcache.cpp @@ -331,11 +331,11 @@ QDataStream &operator<<(QDataStream &out, const QNetworkCacheMetaData &metaData) static inline QDataStream &operator<<(QDataStream &out, const QNetworkCacheMetaData::AttributesMap &hash) { out << quint32(hash.size()); - QNetworkCacheMetaData::AttributesMap::ConstIterator it = hash.end(); - QNetworkCacheMetaData::AttributesMap::ConstIterator begin = hash.begin(); - while (it != begin) { - --it; + QNetworkCacheMetaData::AttributesMap::ConstIterator it = hash.begin(); + QNetworkCacheMetaData::AttributesMap::ConstIterator end = hash.end(); + while (it != end) { out << int(it.key()) << it.value(); + ++it; } return out; } @@ -383,7 +383,7 @@ static inline QDataStream &operator>>(QDataStream &in, QNetworkCacheMetaData::At int k; QVariant t; in >> k >> t; - hash.insertMulti(QNetworkRequest::Attribute(k), t); + hash.insert(QNetworkRequest::Attribute(k), t); } if (in.status() != QDataStream::Ok) @@ -475,7 +475,7 @@ QAbstractNetworkCache::~QAbstractNetworkCache() the QIODevice when done with it. If there is no cache for \a url, the url is invalid, or if there - is an internal cache error 0 is returned. + is an internal cache error \nullptr is returned. In the base class this is a pure virtual function. @@ -496,7 +496,7 @@ QAbstractNetworkCache::~QAbstractNetworkCache() Returns the device that should be populated with the data for the cache item \a metaData. When all of the data has been written insert() should be called. If metaData is invalid or the url in - the metadata is invalid 0 is returned. + the metadata is invalid \nullptr is returned. The cache owns the device and will take care of deleting it when it is inserted or removed. diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h index bba1f9b09d..0516c3d1f9 100644 --- a/src/network/access/qftp_p.h +++ b/src/network/access/qftp_p.h @@ -158,7 +158,7 @@ Q_SIGNALS: void done(bool); private: - Q_DISABLE_COPY(QFtp) + Q_DISABLE_COPY_MOVE(QFtp) Q_DECLARE_PRIVATE(QFtp) Q_PRIVATE_SLOT(d_func(), void _q_startNextCommand()) diff --git a/src/network/access/qhstsstore_p.h b/src/network/access/qhstsstore_p.h index e82596b250..5338d15592 100644 --- a/src/network/access/qhstsstore_p.h +++ b/src/network/access/qhstsstore_p.h @@ -87,7 +87,7 @@ private: QVector<QHstsPolicy> observedPolicies; QSettings store; - Q_DISABLE_COPY(QHstsStore) + Q_DISABLE_COPY_MOVE(QHstsStore) }; QT_END_NAMESPACE diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index c58fd24a44..681d84fee8 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -641,7 +641,7 @@ QHttpNetworkReply* QHttpNetworkConnectionPrivate::queueRequest(const QHttpNetwor else { // SPDY, HTTP/2 ('h2' mode) if (!pair.second->d_func()->requestIsPrepared) prepareRequest(pair); - channels[0].spdyRequestsToSend.insertMulti(request.priority(), pair); + channels[0].spdyRequestsToSend.insert(request.priority(), pair); } #ifndef Q_OS_WINRT @@ -677,7 +677,7 @@ void QHttpNetworkConnectionPrivate::fillHttp2Queue() for (auto &pair : highPriorityQueue) { if (!pair.second->d_func()->requestIsPrepared) prepareRequest(pair); - channels[0].spdyRequestsToSend.insertMulti(QHttpNetworkRequest::HighPriority, pair); + channels[0].spdyRequestsToSend.insert(QHttpNetworkRequest::HighPriority, pair); } highPriorityQueue.clear(); @@ -685,7 +685,7 @@ void QHttpNetworkConnectionPrivate::fillHttp2Queue() for (auto &pair : lowPriorityQueue) { if (!pair.second->d_func()->requestIsPrepared) prepareRequest(pair); - channels[0].spdyRequestsToSend.insertMulti(pair.first.priority(), pair); + channels[0].spdyRequestsToSend.insert(pair.first.priority(), pair); } lowPriorityQueue.clear(); @@ -1518,6 +1518,18 @@ void QHttpNetworkConnection::preConnectFinished() d_func()->preConnectRequests--; } +QString QHttpNetworkConnection::peerVerifyName() const +{ + Q_D(const QHttpNetworkConnection); + return d->peerVerifyName; +} + +void QHttpNetworkConnection::setPeerVerifyName(const QString &peerName) +{ + Q_D(QHttpNetworkConnection); + d->peerVerifyName = peerName; +} + #ifndef QT_NO_NETWORKPROXY // only called from QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired, not // from QHttpNetworkConnectionChannel::handleAuthenticationChallenge diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 91827a6eb1..2bd727e0af 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -154,9 +154,11 @@ public: void preConnectFinished(); + QString peerVerifyName() const; + void setPeerVerifyName(const QString &peerName); private: Q_DECLARE_PRIVATE(QHttpNetworkConnection) - Q_DISABLE_COPY(QHttpNetworkConnection) + Q_DISABLE_COPY_MOVE(QHttpNetworkConnection) friend class QHttpThreadDelegate; friend class QHttpNetworkReply; friend class QHttpNetworkReplyPrivate; @@ -289,6 +291,8 @@ public: Http2::ProtocolParameters http2Parameters; + QString peerVerifyName; + friend class QHttpNetworkConnectionChannel; }; diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 5726925cb0..9df3d73dd7 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -392,6 +392,7 @@ bool QHttpNetworkConnectionChannel::ensureConnection() if (!connection->sslContext().isNull()) QSslSocketPrivate::checkSettingSslContext(sslSocket, connection->sslContext()); + sslSocket->setPeerVerifyName(connection->d_func()->peerVerifyName); sslSocket->connectToHostEncrypted(connectHost, connectPort, QIODevice::ReadWrite, networkLayerPreference); if (ignoreAllSslErrors) sslSocket->ignoreSslErrors(); diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp index 8de9760710..a3f71b8d2f 100644 --- a/src/network/access/qhttpnetworkrequest.cpp +++ b/src/network/access/qhttpnetworkrequest.cpp @@ -66,7 +66,8 @@ QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(const QHttpNetworkRequest ssl(other.ssl), preConnect(other.preConnect), redirectCount(other.redirectCount), - redirectPolicy(other.redirectPolicy) + redirectPolicy(other.redirectPolicy), + peerVerifyName(other.peerVerifyName) { } @@ -90,7 +91,8 @@ bool QHttpNetworkRequestPrivate::operator==(const QHttpNetworkRequestPrivate &ot && (withCredentials == other.withCredentials) && (ssl == other.ssl) && (preConnect == other.preConnect) - && (redirectPolicy == other.redirectPolicy); + && (redirectPolicy == other.redirectPolicy) + && (peerVerifyName == other.peerVerifyName); } QByteArray QHttpNetworkRequest::methodName() const @@ -397,6 +399,15 @@ int QHttpNetworkRequest::minorVersion() const return 1; } +QString QHttpNetworkRequest::peerVerifyName() const +{ + return d->peerVerifyName; +} + +void QHttpNetworkRequest::setPeerVerifyName(const QString &peerName) +{ + d->peerVerifyName = peerName; +} QT_END_NAMESPACE diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index bc797537ae..fb4896195b 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/src/network/access/qhttpnetworkrequest_p.h @@ -147,6 +147,8 @@ public: QByteArray methodName() const; QByteArray uri(bool throughProxy) const; + QString peerVerifyName() const; + void setPeerVerifyName(const QString &peerName); private: QSharedDataPointer<QHttpNetworkRequestPrivate> d; friend class QHttpNetworkRequestPrivate; @@ -182,6 +184,7 @@ public: bool preConnect; int redirectCount; QNetworkRequest::RedirectPolicy redirectPolicy; + QString peerVerifyName; }; diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 0e97acdd9d..1fdf28df9d 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -123,7 +123,7 @@ static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const } -static QByteArray makeCacheKey(QUrl &url, QNetworkProxy *proxy) +static QByteArray makeCacheKey(QUrl &url, QNetworkProxy *proxy, const QString &peerVerifyName) { QString result; QUrl copy = url; @@ -170,7 +170,8 @@ static QByteArray makeCacheKey(QUrl &url, QNetworkProxy *proxy) #else Q_UNUSED(proxy) #endif - + if (!peerVerifyName.isEmpty()) + result += QLatin1Char(':') + peerVerifyName; return "http-connection:" + std::move(result).toLatin1(); } @@ -317,12 +318,12 @@ void QHttpThreadDelegate::startRequest() #ifndef QT_NO_NETWORKPROXY if (transparentProxy.type() != QNetworkProxy::NoProxy) - cacheKey = makeCacheKey(urlCopy, &transparentProxy); + cacheKey = makeCacheKey(urlCopy, &transparentProxy, httpRequest.peerVerifyName()); else if (cacheProxy.type() != QNetworkProxy::NoProxy) - cacheKey = makeCacheKey(urlCopy, &cacheProxy); + cacheKey = makeCacheKey(urlCopy, &cacheProxy, httpRequest.peerVerifyName()); else #endif - cacheKey = makeCacheKey(urlCopy, 0); + cacheKey = makeCacheKey(urlCopy, 0, httpRequest.peerVerifyName()); // the http object is actually a QHttpNetworkConnection @@ -352,7 +353,7 @@ void QHttpThreadDelegate::startRequest() httpConnection->setTransparentProxy(transparentProxy); httpConnection->setCacheProxy(cacheProxy); #endif - + httpConnection->setPeerVerifyName(httpRequest.peerVerifyName()); // cache the QHttpNetworkConnection corresponding to this cache key connections.localData()->addEntry(cacheKey, httpConnection); } else { diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 85e2c492e4..62c915908b 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1181,9 +1181,37 @@ QSharedPointer<QNetworkSession> QNetworkAccessManagerPrivate::getNetworkSession( \sa connectToHost(), get(), post(), put(), deleteResource() */ + void QNetworkAccessManager::connectToHostEncrypted(const QString &hostName, quint16 port, const QSslConfiguration &sslConfiguration) { + connectToHostEncrypted(hostName, port, sslConfiguration, QString()); +} + +/*! + \since 5.13 + \overload + + Initiates a connection to the host given by \a hostName at port \a port, using + \a sslConfiguration with \a peerName set to be the hostName used for certificate + validation. This function is useful to complete the TCP and SSL handshake + to a host before the HTTPS request is made, resulting in a lower network latency. + + \note Preconnecting a SPDY connection can be done by calling setAllowedNextProtocols() + on \a sslConfiguration with QSslConfiguration::NextProtocolSpdy3_0 contained in + the list of allowed protocols. When using SPDY, one single connection per host is + enough, i.e. calling this method multiple times per host will not result in faster + network transactions. + + \note This function has no possibility to report errors. + + \sa connectToHost(), get(), post(), put(), deleteResource() +*/ + +void QNetworkAccessManager::connectToHostEncrypted(const QString &hostName, quint16 port, + const QSslConfiguration &sslConfiguration, + const QString &peerName) +{ QUrl url; url.setHost(hostName); url.setPort(port); @@ -1198,6 +1226,7 @@ void QNetworkAccessManager::connectToHostEncrypted(const QString &hostName, quin QSslConfiguration::NextProtocolSpdy3_0)) request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true); + request.setPeerVerifyName(peerName); get(request); } #endif diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 67b3a8b71b..7e2f7683d0 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -158,6 +158,9 @@ public: #ifndef QT_NO_SSL void connectToHostEncrypted(const QString &hostName, quint16 port = 443, const QSslConfiguration &sslConfiguration = QSslConfiguration::defaultConfiguration()); + void connectToHostEncrypted(const QString &hostName, quint16 port, + const QSslConfiguration &sslConfiguration, + const QString &peerName); #endif void connectToHost(const QString &hostName, quint16 port = 80); diff --git a/src/network/access/qnetworkcookiejar.cpp b/src/network/access/qnetworkcookiejar.cpp index 072a7f249d..af5b126953 100644 --- a/src/network/access/qnetworkcookiejar.cpp +++ b/src/network/access/qnetworkcookiejar.cpp @@ -45,6 +45,14 @@ #include "QtCore/qdatetime.h" #if QT_CONFIG(topleveldomain) #include "private/qtldurl_p.h" +#else +QT_BEGIN_NAMESPACE +static bool qIsEffectiveTLD(QString domain) +{ + // provide minimal checking by not accepting cookies on real TLDs + return !domain.contains(QLatin1Char('.')); +} +QT_END_NAMESPACE #endif QT_BEGIN_NAMESPACE @@ -356,19 +364,12 @@ bool QNetworkCookieJar::validateCookie(const QNetworkCookie &cookie, const QUrl // https://tools.ietf.org/html/rfc6265#section-5.3 step 5 if (host == domain) return true; -#if QT_CONFIG(topleveldomain) // the check for effective TLDs makes the "embedded dot" rule from RFC 2109 section 4.3.2 // redundant; the "leading dot" rule has been relaxed anyway, see QNetworkCookie::normalize() // we remove the leading dot for this check if it's present - if (qIsEffectiveTLD(domain)) - return false; // not accepted -#else - // provide minimal checking by not accepting cookies on real TLDs - if (!domain.contains(QLatin1Char('.'))) - return false; -#endif - - return true; + // Normally defined in qtldurl_p.h, but uses fall-back in this file when topleveldomain isn't + // configured: + return !qIsEffectiveTLD(domain); } QT_END_NAMESPACE diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index d4d3a21a7a..b55ae0ab71 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -785,6 +785,7 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq if (request.attribute(QNetworkRequest::EmitAllUploadProgressSignalsAttribute).toBool()) emitAllUploadProgressSignals = true; + httpRequest.setPeerVerifyName(newHttpRequest.peerVerifyName()); // Create the HTTP thread delegate QHttpThreadDelegate *delegate = new QHttpThreadDelegate; diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index e4c46c3183..f15c43cdd8 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -438,6 +438,7 @@ public: if (other.sslConfiguration) sslConfiguration = new QSslConfiguration(*other.sslConfiguration); #endif + peerVerifyName = other.peerVerifyName; } inline bool operator==(const QNetworkRequestPrivate &other) const @@ -446,7 +447,8 @@ public: priority == other.priority && rawHeaders == other.rawHeaders && attributes == other.attributes && - maxRedirectsAllowed == other.maxRedirectsAllowed; + maxRedirectsAllowed == other.maxRedirectsAllowed && + peerVerifyName == other.peerVerifyName; // don't compare cookedHeaders } @@ -456,6 +458,7 @@ public: mutable QSslConfiguration *sslConfiguration; #endif int maxRedirectsAllowed; + QString peerVerifyName; }; /*! @@ -789,6 +792,32 @@ void QNetworkRequest::setMaximumRedirectsAllowed(int maxRedirectsAllowed) d->maxRedirectsAllowed = maxRedirectsAllowed; } +/*! + \since 5.13 + + Returns the host name set for the certificate validation, as set by + setPeerVerifyName. By default this returns a null string. + + \sa setPeerVerifyName +*/ +QString QNetworkRequest::peerVerifyName() const +{ + return d->peerVerifyName; +} + +/*! + \since 5.13 + + Sets \a peerName as host name for the certificate validation, instead of the one used for the + TCP connection. + + \sa peerVerifyName +*/ +void QNetworkRequest::setPeerVerifyName(const QString &peerName) +{ + d->peerVerifyName = peerName; +} + static QByteArray headerName(QNetworkRequest::KnownHeaders header) { switch (header) { diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 8462eae8c8..efb9cbecba 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -173,6 +173,8 @@ public: int maximumRedirectsAllowed() const; void setMaximumRedirectsAllowed(int maximumRedirectsAllowed); + QString peerVerifyName() const; + void setPeerVerifyName(const QString &peerName); private: QSharedDataPointer<QNetworkRequestPrivate> d; friend class QNetworkRequestPrivate; diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h index 2fdb490ea0..1b1ece39b7 100644 --- a/src/network/bearer/qnetworkconfiguration_p.h +++ b/src/network/bearer/qnetworkconfiguration_p.h @@ -97,7 +97,7 @@ public: static Q_CONSTEXPR int DefaultTimeout = 30000; private: - Q_DISABLE_COPY(QNetworkConfigurationPrivate) + Q_DISABLE_COPY_MOVE(QNetworkConfigurationPrivate) }; QT_END_NAMESPACE diff --git a/src/network/configure.json b/src/network/configure.json index f3e18662aa..e6c87b550b 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -15,8 +15,10 @@ "openssl-linked": { "type": "void", "name": "openssl", "value": "linked" }, "openssl-runtime": { "type": "void", "name": "openssl", "value": "runtime" }, "dtls": "boolean", + "ocsp": "boolean", "sctp": "boolean", "securetransport": "boolean", + "schannel": "boolean", "ssl": "boolean", "system-proxies": "boolean" } @@ -184,6 +186,19 @@ ] }, "use": "openssl" + }, + "ocsp": { + "label": "OCSP stapling support in OpenSSL", + "type": "compile", + "test": { + "include": ["openssl/ssl.h", "openssl/ocsp.h"], + "tail": [ + "#if defined(OPENSSL_NO_OCSP) || defined(OPENSSL_NO_TLSEXT)", + "# error OpenSSL without OCSP stapling", + "#endif" + ] + }, + "use": "openssl" } }, @@ -229,13 +244,13 @@ "autoDetect": "!config.winrt && !config.wasm", "enable": "input.openssl == 'yes' || input.openssl == 'runtime'", "disable": "input.openssl == 'no' || input.openssl == 'linked' || input.ssl == 'no'", - "condition": "!features.securetransport && libs.openssl_headers" + "condition": "!features.securetransport && !features.schannel && libs.openssl_headers" }, "openssl-linked": { "label": " Qt directly linked to OpenSSL", "autoDetect": false, "enable": "input.openssl == 'linked'", - "condition": "!features.securetransport && libs.openssl", + "condition": "!features.securetransport && !features.schannel && libs.openssl", "output": [ "privateFeature", { "type": "define", "name": "QT_LINKED_OPENSSL" } @@ -250,9 +265,18 @@ { "type": "define", "name": "QT_SECURETRANSPORT" } ] }, + "schannel": { + "label": "Schannel", + "disable": "input.schannel == 'no' || input.ssl == 'no'", + "condition": "input.schannel == 'yes' && config.win32 && !config.winrt && (input.openssl == '' || input.openssl == 'no')", + "output": [ + "publicFeature", + { "type": "define", "name": "QT_SCHANNEL" } + ] + }, "ssl": { "label": "SSL", - "condition": "config.winrt || features.securetransport || features.openssl", + "condition": "config.winrt || features.securetransport || features.openssl || features.schannel", "output": [ "publicFeature", "feature" ] }, "dtls": { @@ -262,6 +286,13 @@ "condition": "features.openssl && tests.dtls", "output": [ "publicFeature" ] }, + "ocsp": { + "label": "OCSP-stapling", + "purpose": "Provides OCSP stapling support", + "section": "Networking", + "condition": "features.opensslv11 && tests.ocsp", + "output": [ "publicFeature" ] + }, "opensslv11": { "label": "OpenSSL 1.1", "condition": "features.openssl && tests.openssl11", @@ -391,10 +422,16 @@ For example: "args": "securetransport", "condition": "config.darwin" }, + { + "type": "feature", + "args": "schannel", + "condition": "config.win32 && !config.winrt" + }, "openssl", "openssl-linked", "opensslv11", "dtls", + "ocsp", "sctp", "system-proxies" ] diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index 34db5b4b31..47ce9ab0c6 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -465,27 +465,12 @@ QByteArray QAuthenticatorPrivate::calculateResponse(const QByteArray &requestMet methodString = ""; phase = Done; break; - case QAuthenticatorPrivate::Plain: - response = '\0' + user.toUtf8() + '\0' + password.toUtf8(); - phase = Done; - break; case QAuthenticatorPrivate::Basic: methodString = "Basic "; response = user.toLatin1() + ':' + password.toLatin1(); response = response.toBase64(); phase = Done; break; - case QAuthenticatorPrivate::Login: - if (challenge.contains("VXNlciBOYW1lAA==")) { - response = user.toUtf8().toBase64(); - phase = Phase2; - } else if (challenge.contains("UGFzc3dvcmQA")) { - response = password.toUtf8().toBase64(); - phase = Done; - } - break; - case QAuthenticatorPrivate::CramMd5: - break; case QAuthenticatorPrivate::DigestMd5: methodString = "Digest "; response = digestMd5Response(challenge, requestMethod, path); diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h index 8a1ee0ebe6..265cb7afe2 100644 --- a/src/network/kernel/qauthenticator_p.h +++ b/src/network/kernel/qauthenticator_p.h @@ -68,7 +68,7 @@ class QNtlmWindowsHandles; class Q_AUTOTEST_EXPORT QAuthenticatorPrivate { public: - enum Method { None, Basic, Plain, Login, Ntlm, CramMd5, DigestMd5 }; + enum Method { None, Basic, Ntlm, DigestMd5 }; QAuthenticatorPrivate(); ~QAuthenticatorPrivate(); diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 0973d0dd52..1c7a8da06d 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -300,25 +300,6 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver, */ /*! - \fn template<typename PointerToMemberFunction> int QHostInfo::lookupHost(const QString &name, const QObject *receiver, PointerToMemberFunction function) - - \since 5.9 - - \overload - - Looks up the IP address(es) associated with host name \a name, and - returns an ID for the lookup. When the result of the lookup is - ready, the slot or signal \a function in \a receiver is called with - a QHostInfo argument. The QHostInfo object can then be inspected - to get the results of the lookup. - - \note There is no guarantee on the order the signals will be emitted - if you start multiple requests with lookupHost(). - - \sa abortHostLookup(), addresses(), error(), fromName() -*/ - -/*! \fn template<typename Functor> int QHostInfo::lookupHost(const QString &name, Functor functor) \since 5.9 @@ -354,6 +335,16 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver, thread of \a context. The context's thread must have a running Qt event loop. + Here is an alternative signature for the function: + \code + lookupHost(const QString &name, const QObject *receiver, PointerToMemberFunction function) + \endcode + + In this case, when the result of the lookup is ready, the slot or + signal \c{function} in \c{receiver} is called with a QHostInfo + argument. The QHostInfo object can then be inspected to get the + results of the lookup. + \note There is no guarantee on the order the signals will be emitted if you start multiple requests with lookupHost(). diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index 75917a02a3..49871ad470 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -91,13 +91,10 @@ public: static QString localDomainName(); #ifdef Q_CLANG_QDOC - template<typename PointerToMemberFunction> - static int QHostInfo::lookupHost(const QString &name, const QObject *receiver, - PointerToMemberFunction function); template<typename Functor> - static int QHostInfo::lookupHost(const QString &name, Functor functor); + static int lookupHost(const QString &name, Functor functor); template<typename Functor> - static int QHostInfo::lookupHost(const QString &name, const QObject *context, Functor functor); + static int lookupHost(const QString &name, const QObject *context, Functor functor); #else // lookupHost to a QObject slot template <typename Func> diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index db51732bd3..56397814b0 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -370,7 +370,7 @@ static QList<QNetworkProxy> parseServerList(const QNetworkProxyQuery &query, con #if !defined(Q_OS_WINRT) namespace { class QRegistryWatcher { - Q_DISABLE_COPY(QRegistryWatcher) + Q_DISABLE_COPY_MOVE(QRegistryWatcher) public: QRegistryWatcher() = default; @@ -425,7 +425,7 @@ private: class QWindowsSystemProxy { - Q_DISABLE_COPY(QWindowsSystemProxy) + Q_DISABLE_COPY_MOVE(QWindowsSystemProxy) public: QWindowsSystemProxy(); ~QWindowsSystemProxy(); diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index e86793cb21..9c8f29e18a 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -914,7 +914,7 @@ void QAbstractSocketPrivate::resolveProxy(const QString &hostname, quint16 port) proxies << proxy; } else { // try the application settings instead - QNetworkProxyQuery query(hostname, port, QString(), + QNetworkProxyQuery query(hostname, port, protocolTag, socketType == QAbstractSocket::TcpSocket ? QNetworkProxyQuery::TcpSocket : socketType == QAbstractSocket::SctpSocket ? @@ -2959,6 +2959,38 @@ QNetworkProxy QAbstractSocket::proxy() const Q_D(const QAbstractSocket); return d->proxy; } + +/*! + \since 5.13 + + Returns the protocol tag for this socket. + If the protocol tag is set then this is passed to QNetworkProxyQuery + when this is created internally to indicate the protocol tag to be + used. + + \sa setProtocolTag(), QNetworkProxyQuery +*/ + +QString QAbstractSocket::protocolTag() const +{ + Q_D(const QAbstractSocket); + return d->protocolTag; +} + +/*! + \since 5.13 + + Sets the protocol tag for this socket to \a tag. + + \sa protocolTag() +*/ + +void QAbstractSocket::setProtocolTag(const QString &tag) +{ + Q_D(QAbstractSocket); + d->protocolTag = tag; +} + #endif // QT_NO_NETWORKPROXY #ifndef QT_NO_DEBUG_STREAM diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 6d5e57ac52..de09195eeb 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -197,6 +197,8 @@ public: #ifndef QT_NO_NETWORKPROXY void setProxy(const QNetworkProxy &networkProxy); QNetworkProxy proxy() const; + QString protocolTag() const; + void setProtocolTag(const QString &tag); #endif Q_SIGNALS: diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 066a35ff85..38c0caef49 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -124,6 +124,7 @@ public: #ifndef QT_NO_NETWORKPROXY QNetworkProxy proxy; QNetworkProxy proxyInUse; + QString protocolTag; void resolveProxy(const QString &hostName, quint16 port); #else inline void resolveProxy(const QString &, quint16) { } diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h index b15dd73c96..8eebb06a4d 100644 --- a/src/network/socket/qabstractsocketengine_p.h +++ b/src/network/socket/qabstractsocketengine_p.h @@ -215,7 +215,7 @@ protected: private: Q_DECLARE_PRIVATE(QAbstractSocketEngine) - Q_DISABLE_COPY(QAbstractSocketEngine) + Q_DISABLE_COPY_MOVE(QAbstractSocketEngine) }; class QAbstractSocketEnginePrivate : public QObjectPrivate diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h index cb7798694a..bbcc09eee9 100644 --- a/src/network/socket/qhttpsocketengine_p.h +++ b/src/network/socket/qhttpsocketengine_p.h @@ -160,7 +160,7 @@ private: bool readHttpHeader(); Q_DECLARE_PRIVATE(QHttpSocketEngine) - Q_DISABLE_COPY(QHttpSocketEngine) + Q_DISABLE_COPY_MOVE(QHttpSocketEngine) }; diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h index aa61b74823..2292566265 100644 --- a/src/network/socket/qnativesocketengine_p.h +++ b/src/network/socket/qnativesocketengine_p.h @@ -196,7 +196,7 @@ public Q_SLOTS: private: Q_DECLARE_PRIVATE(QNativeSocketEngine) - Q_DISABLE_COPY(QNativeSocketEngine) + Q_DISABLE_COPY_MOVE(QNativeSocketEngine) }; class QSocketNotifier; diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index c999bd2088..24e8eabb6e 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -1146,22 +1146,17 @@ qint64 QNativeSocketEnginePrivate::nativePendingDatagramSize() const qint64 ret = -1; int recvResult = 0; DWORD flags; - DWORD bufferCount = 5; - WSABUF * buf = 0; + // We start at 1500 bytes (the MTU for Ethernet V2), which should catch + // almost all uses (effective MTU for UDP under IPv4 is 1468), except + // for localhost datagrams and those reassembled by the IP layer. + char udpMessagePeekBuffer[1500]; + std::vector<WSABUF> buf; for (;;) { - // We start at 1500 bytes (the MTU for Ethernet V2), which should catch - // almost all uses (effective MTU for UDP under IPv4 is 1468), except - // for localhost datagrams and those reassembled by the IP layer. - char udpMessagePeekBuffer[1500]; - - buf = new WSABUF[bufferCount]; - for (DWORD i=0; i<bufferCount; i++) { - buf[i].buf = udpMessagePeekBuffer; - buf[i].len = sizeof(udpMessagePeekBuffer); - } + buf.resize(buf.size() + 5, {sizeof(udpMessagePeekBuffer), udpMessagePeekBuffer}); + flags = MSG_PEEK; DWORD bytesRead = 0; - recvResult = ::WSARecv(socketDescriptor, buf, bufferCount, &bytesRead, &flags, 0,0); + recvResult = ::WSARecv(socketDescriptor, buf.data(), DWORD(buf.size()), &bytesRead, &flags, nullptr, nullptr); int err = WSAGetLastError(); if (recvResult != SOCKET_ERROR) { ret = qint64(bytesRead); @@ -1169,8 +1164,6 @@ qint64 QNativeSocketEnginePrivate::nativePendingDatagramSize() const } else { switch (err) { case WSAEMSGSIZE: - bufferCount += 5; - delete[] buf; continue; case WSAECONNRESET: case WSAENETRESET: @@ -1185,9 +1178,6 @@ qint64 QNativeSocketEnginePrivate::nativePendingDatagramSize() const } } - if (buf) - delete[] buf; - #if defined (QNATIVESOCKETENGINE_DEBUG) qDebug("QNativeSocketEnginePrivate::nativePendingDatagramSize() == %lli", ret); #endif diff --git a/src/network/socket/qnativesocketengine_winrt_p.h b/src/network/socket/qnativesocketengine_winrt_p.h index 6688bfe35c..e1fe58bb97 100644 --- a/src/network/socket/qnativesocketengine_winrt_p.h +++ b/src/network/socket/qnativesocketengine_winrt_p.h @@ -188,7 +188,7 @@ private slots: private: Q_DECLARE_PRIVATE(QNativeSocketEngine) - Q_DISABLE_COPY(QNativeSocketEngine) + Q_DISABLE_COPY_MOVE(QNativeSocketEngine) }; class QNativeSocketEnginePrivate : public QAbstractSocketEnginePrivate diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h index 1942eff4ca..ef9d771753 100644 --- a/src/network/socket/qsocks5socketengine_p.h +++ b/src/network/socket/qsocks5socketengine_p.h @@ -127,7 +127,7 @@ public: private: Q_DECLARE_PRIVATE(QSocks5SocketEngine) - Q_DISABLE_COPY(QSocks5SocketEngine) + Q_DISABLE_COPY_MOVE(QSocks5SocketEngine) Q_PRIVATE_SLOT(d_func(), void _q_controlSocketConnected()) Q_PRIVATE_SLOT(d_func(), void _q_controlSocketReadNotification()) Q_PRIVATE_SLOT(d_func(), void _q_controlSocketError(QAbstractSocket::SocketError)) diff --git a/src/network/ssl/qasn1element_p.h b/src/network/ssl/qasn1element_p.h index 2068254a95..22948e3ca5 100644 --- a/src/network/ssl/qasn1element_p.h +++ b/src/network/ssl/qasn1element_p.h @@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE #define RSA_ENCRYPTION_OID QByteArrayLiteral(RSADSI_OID "1.1.1") #define DSA_ENCRYPTION_OID QByteArrayLiteral("1.2.840.10040.4.1") #define EC_ENCRYPTION_OID QByteArrayLiteral("1.2.840.10045.2.1") +#define DH_ENCRYPTION_OID QByteArrayLiteral(RSADSI_OID "1.3.1") // These are mostly from the RFC for PKCS#5 // PKCS#5: https://tools.ietf.org/html/rfc8018#appendix-B @@ -137,6 +138,7 @@ public: Rfc822NameType = 0x81, DnsNameType = 0x82, UniformResourceIdentifierType = 0x86, + IpAddressType = 0x87, // context specific Context0Type = 0xA0, diff --git a/src/network/ssl/qdtls.h b/src/network/ssl/qdtls.h index 8505b00d5e..d057eadf19 100644 --- a/src/network/ssl/qdtls.h +++ b/src/network/ssl/qdtls.h @@ -48,7 +48,9 @@ #include <QtCore/qcryptographichash.h> #include <QtCore/qobject.h> +#ifndef Q_CLANG_QDOC QT_REQUIRE_CONFIG(dtls); +#endif QT_BEGIN_NAMESPACE diff --git a/src/network/ssl/qocsp_p.h b/src/network/ssl/qocsp_p.h new file mode 100644 index 0000000000..94c1c9b445 --- /dev/null +++ b/src/network/ssl/qocsp_p.h @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QOCSP_P_H +#define QOCSP_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +// Note, this file is a workaround: on 64-bit Windows one of OpenSSL +// includes combined with openssl/ocsp.h results in macros from +// wincrypt.h exposed. OpenSSL's own very "unique" and "inventive" +// names like OCSP_RESPONSE or X509_NAME were asking to clash with +// other entities (presumably macros) with the same names. Normally, +// ossl_typ.h un-defines them, but due to a bug in OpenSSL, fails +// to do this on Win 64. Thus we have to do it here. We only undef +// 3 names, ossl_typ.h has more, but apparently we don't need them +// (no name clash so far). + +QT_REQUIRE_CONFIG(ocsp); + +#ifdef Q_OS_WIN64 +#undef X509_NAME +#undef OCSP_REQUEST +#undef OCSP_RESPONSE +#endif // Q_OS_WIN64 + +#include <openssl/ocsp.h> + +#endif // QOCSP_P_H diff --git a/src/network/ssl/qocspresponse.cpp b/src/network/ssl/qocspresponse.cpp new file mode 100644 index 0000000000..1466364af2 --- /dev/null +++ b/src/network/ssl/qocspresponse.cpp @@ -0,0 +1,219 @@ +/**************************************************************************** +** Copyright (C) 2011 Richard J. Moore <rich@kde.org> +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qocspresponse_p.h" +#include "qocspresponse.h" + +QT_BEGIN_NAMESPACE + +/*! + \class QOcspResponse + \brief This class represents Online Certificate Status Protocol response + \since 5.13 + + \ingroup network + \ingroup ssl + \inmodule QtNetwork + + The QOcspResponse class represents the revocation status of a server's certficate, + received by the client-side socket during the TLS handshake. QSslSocket must be + configured with OCSP stapling enabled. + + \sa QSslSocket, QSslSocket::ocspResponse(), certificateStatus(), + revocationReason(), responder(), subject(), OcspCertificateStatus, OcspRevocationReason, + QSslConfiguration::setOcspStaplingEnabled(), QSslConfiguration::ocspStaplingEnabled(), + QSslConfiguration::peerCertificate() +*/ + +/*! + \enum OcspCertificateStatus + \brief Describes the Online Certificate Status + \relates QOcspResponse + \since 5.13 + + \ingroup network + \ingroup ssl + \inmodule QtNetwork + + \value Good The certificate is not revoked, but this does not necessarily + mean that the certificate was ever issued or that the time at which + the response was produced is within the certificate's validity interval. + \value Revoked This state indicates that the certificate has been revoked + (either permanently or temporarily - on hold). + \value Unknown This state indicates that the responder doesn't know about + the certificate being requested. + + \sa OcspRevocationReason +*/ + +/*! + \enum OcspRevocationReason + \brief Describes the reason for revocation + \relates QOcspResponse + \since 5.13 + + \ingroup network + \ingroup ssl + \inmodule QtNetwork + + + This enumeration describes revocation reasons, defined in \l{https://tools.ietf.org/html/rfc5280#section-5.3.1}{RFC 5280, section 5.3.1} + + \value None + \value Unspecified + \value KeyCompromise + \value CACompromise + \value AffiliationChanged + \value Superseded + \value CessationOfOperation + \value CertificateHold + \value RemoveFromCRL +*/ + +/*! + \since 5.13 + + Creates a new response with status OcspCertificateStatus::Unknown + and revocation reason OcspRevocationReason::None. + + \sa OcspCertificateStatus +*/ +QOcspResponse::QOcspResponse() + : d(new QOcspResponsePrivate) +{ +} + +/*! + \since 5.13 + + Creates a new response, the copy of \a other. +*/ +QOcspResponse::QOcspResponse(const QOcspResponse &other) +{ + *d = *other.d; +} + +/*! + \since 5.13 + + Move-constructs a QOcspResponse instance from \a other. +*/ +QOcspResponse::QOcspResponse(QOcspResponse &&other) Q_DECL_NOTHROW +{ + d.swap(other.d); +} + +/*! + \since 5.13 + + Destroys the response. +*/ +QOcspResponse::~QOcspResponse() +{ +} + +/*! + \since 5.13 + + Assignes \a other to the response and returns a reference to this response. +*/ +QOcspResponse &QOcspResponse::operator=(const QOcspResponse &other) +{ + if (this != &other) + *d = *other.d; + + return *this; +} + +/*! + \since 5.13 + + Move-assigns \a other to this QOcspResponse instance. +*/ +QOcspResponse &QOcspResponse::operator=(QOcspResponse &&other) Q_DECL_NOTHROW +{ + if (this != &other) + d.swap(other.d); + + return *this; +} + +/*! + \since 5.13 + + Returns the certificate status. + + \sa OcspCertificateStatus +*/ +OcspCertificateStatus QOcspResponse::certificateStatus() const +{ + return d->certificateStatus; +} + +/*! + \since 5.13 + + Returns the reason for revocation. +*/ +OcspRevocationReason QOcspResponse::revocationReason() const +{ + return d->revocationReason; +} + +/*! + \since 5.13 + + This function returns a certificate used to sign OCSP response. +*/ +QSslCertificate QOcspResponse::responder() const +{ + return d->signerCert; +} + +/*! + \since 5.13 + + This function returns a certificate, for which this response was issued. +*/ +QSslCertificate QOcspResponse::subject() const +{ + return d->subjectCert; +} + +QT_END_NAMESPACE diff --git a/src/network/ssl/qocspresponse.h b/src/network/ssl/qocspresponse.h new file mode 100644 index 0000000000..5cff625b84 --- /dev/null +++ b/src/network/ssl/qocspresponse.h @@ -0,0 +1,101 @@ +/**************************************************************************** +** Copyright (C) 2011 Richard J. Moore <rich@kde.org> +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QOCSPRESPONSE_H +#define QOCSPRESPONSE_H + +#include <QtNetwork/qtnetworkglobal.h> + +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> + +#ifndef Q_CLANG_QDOC +QT_REQUIRE_CONFIG(ssl); +#endif + +QT_BEGIN_NAMESPACE + +enum class OcspCertificateStatus +{ + Good, + Revoked, + Unknown +}; + +enum class OcspRevocationReason +{ + None = -1, + Unspecified, + KeyCompromise, + CACompromise, + AffiliationChanged, + Superseded, + CessationOfOperation, + CertificateHold, + RemoveFromCRL +}; + +class QOcspResponsePrivate; +class QOcspResponse +{ +public: + + QOcspResponse(); + QOcspResponse(const QOcspResponse &other); + QOcspResponse(QOcspResponse && other) Q_DECL_NOEXCEPT; + ~QOcspResponse(); + + QOcspResponse &operator = (const QOcspResponse &other); + QOcspResponse &operator = (QOcspResponse &&other) Q_DECL_NOTHROW; + + OcspCertificateStatus certificateStatus() const; + OcspRevocationReason revocationReason() const; + + class QSslCertificate responder() const; + QSslCertificate subject() const; + +private: + + friend class QSslSocketBackendPrivate; + QScopedPointer<QOcspResponsePrivate> d; +}; + +QT_END_NAMESPACE + +#endif // QOCSPRESPONSE_H diff --git a/src/network/ssl/qocspresponse_p.h b/src/network/ssl/qocspresponse_p.h new file mode 100644 index 0000000000..44480df633 --- /dev/null +++ b/src/network/ssl/qocspresponse_p.h @@ -0,0 +1,73 @@ +/**************************************************************************** +** Copyright (C) 2011 Richard J. Moore <rich@kde.org> +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QOCSPRESPONSE_P_H +#define QOCSPRESPONSE_P_H + +#include <private/qtnetworkglobal_p.h> + +#include <qsslcertificate.h> +#include <qocspresponse.h> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QT_BEGIN_NAMESPACE + +class QOcspResponsePrivate +{ +public: + + OcspCertificateStatus certificateStatus = OcspCertificateStatus::Unknown; + OcspRevocationReason revocationReason = OcspRevocationReason::None; + + QSslCertificate signerCert; + QSslCertificate subjectCert; +}; + +QT_END_NAMESPACE + +#endif // QOCSPRESPONSE_P_H diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index 19d99bc489..c9fa7f85d9 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -71,7 +71,8 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl"); \value Rsa The RSA algorithm. \value Dsa The DSA algorithm. - \value Ec The Elliptic Curve algorithm + \value Ec The Elliptic Curve algorithm. + \value Dh The Diffie-Hellman algorithm. \value Opaque A key that should be treated as a 'black box' by QSslKey. The opaque key facility allows applications to add support for facilities @@ -98,6 +99,9 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl"); \value DnsEntry A DNS host name entry; the entry contains a host name entry that the certificate is valid for. The entry may contain wildcards. + \value IpAddressEntry An IP address entry; the entry contains an IP address + entry that the certificate is valid for, introduced in Qt 5.13. + \note In Qt 4, this enum was called \c {AlternateNameEntryType}. That name is deprecated in Qt 5. @@ -116,8 +120,8 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl"); Describes the protocol of the cipher. - \value SslV3 SSLv3. When using the WinRT backend this option will also enable TLSv1.0 - \value SslV2 SSLv2. Note, SSLv2 support was removed in OpenSSL 1.1. + \value SslV3 SSLv3; not supported by QSslSocket. + \value SslV2 SSLv2; not supported by QSslSocket. \value TlsV1_0 TLSv1.0 \value TlsV1_0OrLater TLSv1.0 and later versions. This option is not available when using the WinRT backend due to platform limitations. \value TlsV1 Obsolete, means the same as TlsV1_0 @@ -132,19 +136,9 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl"); \value TlsV1_3 TLSv1.3. (Since Qt 5.12) \value TlsV1_3OrLater TLSv1.3 and later versions. (Since Qt 5.12) \value UnknownProtocol The cipher's protocol cannot be determined. - \value AnyProtocol The socket understands SSLv2, SSLv3, TLSv1.0 and all - supported later versions of TLS. This value is used by QSslSocket only. - \value TlsV1SslV3 On the client side, this will send - a TLS 1.0 Client Hello, enabling TLSv1_0 and SSLv3 connections. - On the server side, this will enable both SSLv3 and TLSv1_0 connections. - \value SecureProtocols The default option, using protocols known to be secure; - currently behaves similar to TlsV1Ssl3 except denying SSLv3 connections that does - not upgrade to TLS. - - \note most servers understand both SSL and TLS, but it is recommended to use - TLS only for security reasons. However, SSL and TLS are not compatible with - each other: if you get unexpected handshake failures, verify that you chose - the correct setting for your protocol. + \value AnyProtocol Any supported protocol. This value is used by QSslSocket only. + \value TlsV1SslV3 Same as TlsV1_0. + \value SecureProtocols The default option, using protocols known to be secure. */ /*! diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h index 60362cb410..42c7b5c56d 100644 --- a/src/network/ssl/qssl.h +++ b/src/network/ssl/qssl.h @@ -62,12 +62,14 @@ namespace QSsl { Opaque, Rsa, Dsa, - Ec + Ec, + Dh, }; enum AlternativeNameEntryType { EmailEntry, - DnsEntry + DnsEntry, + IpAddressEntry }; #if QT_DEPRECATED_SINCE(5,0) diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index d153e0b929..0156b5bf96 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -121,6 +121,9 @@ #ifdef QT_SECURETRANSPORT #include "qsslsocket_mac_p.h" #endif +#if QT_CONFIG(schannel) +#include "qsslsocket_schannel_p.h" +#endif #include "qssl_p.h" #include "qsslcertificate.h" diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp index fa87cfeaaf..899c8a0d2d 100644 --- a/src/network/ssl/qsslcertificate_openssl.cpp +++ b/src/network/ssl/qsslcertificate_openssl.cpp @@ -44,13 +44,15 @@ #include "qsslkey_p.h" #include "qsslcertificateextension_p.h" +#include <QtCore/qendian.h> + #if QT_CONFIG(thread) #include <QtCore/private/qmutexpool_p.h> #endif QT_BEGIN_NAMESPACE // forward declaration -static QMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name); +static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name); bool QSslCertificate::operator==(const QSslCertificate &other) const { @@ -207,10 +209,14 @@ QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlter STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME) *)q_X509_get_ext_d2i( d->x509, NID_subject_alt_name, nullptr, nullptr); + auto altName = [](ASN1_IA5STRING *ia5, int len) { + const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(ia5)); + return QString::fromLatin1(altNameStr, len); + }; if (altNames) { for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) { const GENERAL_NAME *genName = q_sk_GENERAL_NAME_value(altNames, i); - if (genName->type != GEN_DNS && genName->type != GEN_EMAIL) + if (genName->type != GEN_DNS && genName->type != GEN_EMAIL && genName->type != GEN_IPADD) continue; int len = q_ASN1_STRING_length(genName->d.ia5); @@ -219,12 +225,32 @@ QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlter continue; } - const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_get0_data(genName->d.ia5)); - const QString altName = QString::fromLatin1(altNameStr, len); - if (genName->type == GEN_DNS) - result.insert(QSsl::DnsEntry, altName); - else if (genName->type == GEN_EMAIL) - result.insert(QSsl::EmailEntry, altName); + switch (genName->type) { + case GEN_DNS: + result.insert(QSsl::DnsEntry, altName(genName->d.ia5, len)); + break; + case GEN_EMAIL: + result.insert(QSsl::EmailEntry, altName(genName->d.ia5, len)); + break; + case GEN_IPADD: { + QHostAddress ipAddress; + switch (len) { + case 4: // IPv4 + ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast<quint32 *>(genName->d.iPAddress->data))); + break; + case 16: // IPv6 + ipAddress = QHostAddress(reinterpret_cast<quint8 *>(genName->d.iPAddress->data)); + break; + default: // Unknown IP address format + break; + } + if (!ipAddress.isNull()) + result.insert(QSsl::IpAddressEntry, ipAddress.toString()); + break; + } + default: + break; + } } q_OPENSSL_sk_pop_free((OPENSSL_STACK*)altNames, reinterpret_cast<void(*)(void*)>(q_GENERAL_NAME_free)); @@ -615,16 +641,16 @@ QByteArray QSslCertificatePrivate::asn1ObjectName(ASN1_OBJECT *object) return asn1ObjectId(object); } -static QMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) +static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) { - QMap<QByteArray, QString> info; + QMultiMap<QByteArray, QString> info; for (int i = 0; i < q_X509_NAME_entry_count(name); ++i) { X509_NAME_ENTRY *e = q_X509_NAME_get_entry(name, i); QByteArray name = QSslCertificatePrivate::asn1ObjectName(q_X509_NAME_ENTRY_get_object(e)); unsigned char *data = nullptr; int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); - info.insertMulti(name, QString::fromUtf8((char*)data, size)); + info.insert(name, QString::fromUtf8((char*)data, size)); #if QT_CONFIG(opensslv11) q_CRYPTO_free(data, nullptr, 0); #else diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h index dfdceab502..4b331d4c4e 100644 --- a/src/network/ssl/qsslcertificate_p.h +++ b/src/network/ssl/qsslcertificate_p.h @@ -75,6 +75,10 @@ struct ASN1_OBJECT; #include <windows.security.cryptography.certificates.h> #endif +#if QT_CONFIG(schannel) +#include <wincrypt.h> +#endif + QT_BEGIN_NAMESPACE // forward declaration @@ -96,14 +100,18 @@ public: if (x509) q_X509_free(x509); #endif +#if QT_CONFIG(schannel) + if (certificateContext) + CertFreeCertificateContext(certificateContext); +#endif } bool null; QByteArray versionString; QByteArray serialNumberString; - QMap<QByteArray, QString> issuerInfo; - QMap<QByteArray, QString> subjectInfo; + QMultiMap<QByteArray, QString> issuerInfo; + QMultiMap<QByteArray, QString> subjectInfo; QDateTime notValidAfter; QDateTime notValidBefore; @@ -143,6 +151,12 @@ public: static QSslCertificate QSslCertificate_from_Certificate(ABI::Windows::Security::Cryptography::Certificates::ICertificate *iCertificate); #endif + +#if QT_CONFIG(schannel) + const CERT_CONTEXT *certificateContext = nullptr; + + static QSslCertificate QSslCertificate_from_CERT_CONTEXT(const CERT_CONTEXT *certificateContext); +#endif }; QT_END_NAMESPACE diff --git a/src/network/ssl/qsslcertificate_qt.cpp b/src/network/ssl/qsslcertificate_qt.cpp index dfdfd529e5..cce59b5ef3 100644 --- a/src/network/ssl/qsslcertificate_qt.cpp +++ b/src/network/ssl/qsslcertificate_qt.cpp @@ -50,6 +50,8 @@ #include "qasn1element_p.h" #include <QtCore/qdatastream.h> +#include <QtCore/qendian.h> +#include <QtNetwork/qhostaddress.h> QT_BEGIN_NAMESPACE @@ -139,7 +141,7 @@ QDateTime QSslCertificate::expiryDate() const return d->notValidAfter; } -#ifndef Q_OS_WINRT // implemented in qsslcertificate_winrt.cpp +#if !defined(Q_OS_WINRT) && !QT_CONFIG(schannel) // implemented in qsslcertificate_{winrt,schannel}.cpp Qt::HANDLE QSslCertificate::handle() const { Q_UNIMPLEMENTED(); @@ -206,6 +208,10 @@ void QSslCertificatePrivate::init(const QByteArray &data, QSsl::EncodingFormat f : certificatesFromDer(data, 1); if (!certs.isEmpty()) { *this = *certs.first().d; +#if QT_CONFIG(schannel) + if (certificateContext) + certificateContext = CertDuplicateCertificateContext(certificateContext); +#endif } } } @@ -399,10 +405,32 @@ bool QSslCertificatePrivate::parse(const QByteArray &data) QDataStream nameStream(sanElem.value()); QAsn1Element nameElem; while (nameElem.read(nameStream)) { - if (nameElem.type() == QAsn1Element::Rfc822NameType) { + switch (nameElem.type()) { + case QAsn1Element::Rfc822NameType: subjectAlternativeNames.insert(QSsl::EmailEntry, nameElem.toString()); - } else if (nameElem.type() == QAsn1Element::DnsNameType) { + break; + case QAsn1Element::DnsNameType: subjectAlternativeNames.insert(QSsl::DnsEntry, nameElem.toString()); + break; + case QAsn1Element::IpAddressType: { + QHostAddress ipAddress; + QByteArray ipAddrValue = nameElem.value(); + switch (ipAddrValue.length()) { + case 4: // IPv4 + ipAddress = QHostAddress(qFromBigEndian(*reinterpret_cast<quint32 *>(ipAddrValue.data()))); + break; + case 16: // IPv6 + ipAddress = QHostAddress(reinterpret_cast<quint8 *>(ipAddrValue.data())); + break; + default: // Unknown IP address format + break; + } + if (!ipAddress.isNull()) + subjectAlternativeNames.insert(QSsl::IpAddressEntry, ipAddress.toString()); + break; + } + default: + break; } } } diff --git a/src/network/ssl/qsslcertificate_schannel.cpp b/src/network/ssl/qsslcertificate_schannel.cpp new file mode 100644 index 0000000000..5ea713612a --- /dev/null +++ b/src/network/ssl/qsslcertificate_schannel.cpp @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qsslcertificate.h" +#include "qsslcertificate_p.h" + +#include <wincrypt.h> + +QT_BEGIN_NAMESPACE + +QSslCertificate QSslCertificatePrivate::QSslCertificate_from_CERT_CONTEXT(const CERT_CONTEXT *certificateContext) +{ + QByteArray derData = QByteArray((const char *)certificateContext->pbCertEncoded, + certificateContext->cbCertEncoded); + + QSslCertificate certificate(derData, QSsl::Der); + certificate.d->certificateContext = CertDuplicateCertificateContext(certificateContext); + return certificate; +} + +Qt::HANDLE QSslCertificate::handle() const +{ + return Qt::HANDLE(d->certificateContext); +} + +QT_END_NAMESPACE diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 3f732b4646..7e92d3a526 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -228,7 +228,8 @@ bool QSslConfiguration::operator==(const QSslConfiguration &other) const d->nextAllowedProtocols == other.d->nextAllowedProtocols && d->nextNegotiatedProtocol == other.d->nextNegotiatedProtocol && d->nextProtocolNegotiationStatus == other.d->nextProtocolNegotiationStatus && - d->dtlsCookieEnabled == other.d->dtlsCookieEnabled; + d->dtlsCookieEnabled == other.d->dtlsCookieEnabled && + d->ocspStaplingEnabled == other.d->ocspStaplingEnabled; } /*! @@ -272,7 +273,8 @@ bool QSslConfiguration::isNull() const d->preSharedKeyIdentityHint.isNull() && d->nextAllowedProtocols.isEmpty() && d->nextNegotiatedProtocol.isNull() && - d->nextProtocolNegotiationStatus == QSslConfiguration::NextProtocolNegotiationNone); + d->nextProtocolNegotiationStatus == QSslConfiguration::NextProtocolNegotiationNone && + d->ocspStaplingEnabled == false); } /*! @@ -585,6 +587,8 @@ void QSslConfiguration::setPrivateKey(const QSslKey &key) ciphers. You can revert to using the entire set by calling setCiphers() with the list returned by QSslSocket::supportedCiphers(). + \note This is not currently supported in the Schannel backend. + \sa setCiphers(), QSslSocket::supportedCiphers() */ QList<QSslCipher> QSslConfiguration::ciphers() const @@ -600,6 +604,8 @@ QList<QSslCipher> QSslConfiguration::ciphers() const Restricting the cipher suite must be done before the handshake phase, where the session cipher is chosen. + \note This is not currently supported in the Schannel backend. + \sa ciphers(), QSslSocket::supportedCiphers() */ void QSslConfiguration::setCiphers(const QList<QSslCipher> &ciphers) @@ -1094,6 +1100,37 @@ void QSslConfiguration::setDefaultDtlsConfiguration(const QSslConfiguration &con #endif // dtls +/*! + \since 5.13 + If \a enabled is true, client QSslSocket will send a certificate status request + to its peer when initiating a handshake. During the handshake QSslSocket will + verify the server's response. This value must be set before the handshake + starts. + + \sa ocspStaplingEnabled() +*/ +void QSslConfiguration::setOcspStaplingEnabled(bool enabled) +{ +#if QT_CONFIG(ocsp) + d->ocspStaplingEnabled = enabled; +#else + if (enabled) + qCWarning(lcSsl, "Enabling OCSP-stapling requires the feature 'ocsp'"); +#endif // ocsp +} + +/*! + \since 5.13 + Returns true if OCSP stapling was enabled by setOCSPStaplingEnabled(), + otherwise false (which is the default value). + + \sa setOcspStaplingEnabled() +*/ +bool QSslConfiguration::ocspStaplingEnabled() const +{ + return d->ocspStaplingEnabled; +} + /*! \internal */ bool QSslConfigurationPrivate::peerSessionWasShared(const QSslConfiguration &configuration) { diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 454ac0cee3..8f53e25a53 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -170,6 +170,9 @@ public: static void setDefaultDtlsConfiguration(const QSslConfiguration &configuration); #endif // dtls + void setOcspStaplingEnabled(bool enable); + bool ocspStaplingEnabled() const; + enum NextProtocolNegotiationStatus { NextProtocolNegotiationNone, NextProtocolNegotiationNegotiated, diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h index 6c23165c6a..83126bb9a0 100644 --- a/src/network/ssl/qsslconfiguration_p.h +++ b/src/network/ssl/qsslconfiguration_p.h @@ -143,6 +143,12 @@ public: const bool dtlsCookieEnabled = false; #endif // dtls +#if QT_CONFIG(ocsp) + bool ocspStaplingEnabled = false; +#else + const bool ocspStaplingEnabled = false; +#endif + // in qsslsocket.cpp: static QSslConfiguration defaultConfiguration(); static void setDefaultConfiguration(const QSslConfiguration &configuration); diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp index 35cca9f01a..e81e5582f4 100644 --- a/src/network/ssl/qsslcontext_openssl.cpp +++ b/src/network/ssl/qsslcontext_openssl.cpp @@ -243,12 +243,28 @@ QString QSslContext::errorString() const return errorStr; } +#if QT_CONFIG(ocsp) +extern "C" int qt_OCSP_status_server_callback(SSL *ssl, void *); // Defined in qsslsocket_openssl.cpp. +#endif // ocsp // static void QSslContext::applyBackendConfig(QSslContext *sslContext) { - if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) + const QMap<QByteArray, QVariant> &conf = sslContext->sslConfiguration.backendConfiguration(); + if (conf.isEmpty()) return; +#if QT_CONFIG(ocsp) + auto ocspResponsePos = conf.find("Qt-OCSP-response"); + if (ocspResponsePos != conf.end()) { + // This is our private, undocumented configuration option, existing only for + // the purpose of testing OCSP status responses. We don't even check this + // callback was set. If no - the test must fail. + q_SSL_CTX_set_tlsext_status_cb(sslContext->ctx, qt_OCSP_status_server_callback); + if (conf.size() == 1) + return; + } +#endif // ocsp + #if OPENSSL_VERSION_NUMBER >= 0x10002000L if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); @@ -256,8 +272,10 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); q_SSL_CONF_CTX_set_flags(cctx.data(), SSL_CONF_FLAG_FILE); - const auto &backendConfig = sslContext->sslConfiguration.backendConfiguration(); - for (auto i = backendConfig.constBegin(); i != backendConfig.constEnd(); ++i) { + for (auto i = conf.constBegin(); i != conf.constEnd(); ++i) { + if (i.key() == "Qt-OCSP-response") // This never goes to SSL_CONF_cmd(). + continue; + if (!i.value().canConvert(QMetaType::QByteArray)) { sslContext->errorCode = QSslError::UnspecifiedError; sslContext->errorStr = msgErrorSettingBackendConfig( diff --git a/src/network/ssl/qsslcontext_openssl11.cpp b/src/network/ssl/qsslcontext_openssl11.cpp index c96a48dac1..21a5c779f7 100644 --- a/src/network/ssl/qsslcontext_openssl11.cpp +++ b/src/network/ssl/qsslcontext_openssl11.cpp @@ -95,6 +95,10 @@ init_context: // SSL 2 is no longer supported, but chosen deliberately -> error sslContext->ctx = nullptr; unsupportedProtocol = true; + } else if (sslContext->sslConfiguration.protocol() == QSsl::SslV3) { + // SSL 3 is no longer supported, but chosen deliberately -> error + sslContext->ctx = nullptr; + unsupportedProtocol = true; } else { switch (sslContext->sslConfiguration.protocol()) { case QSsl::DtlsV1_0: @@ -151,11 +155,6 @@ init_context: long maxVersion = anyVersion; switch (sslContext->sslConfiguration.protocol()) { - // The single-protocol versions first: - case QSsl::SslV3: - minVersion = SSL3_VERSION; - maxVersion = SSL3_VERSION; - break; case QSsl::TlsV1_0: minVersion = TLS1_VERSION; maxVersion = TLS1_VERSION; @@ -181,9 +180,6 @@ init_context: // Ranges: case QSsl::TlsV1SslV3: case QSsl::AnyProtocol: - minVersion = SSL3_VERSION; - maxVersion = 0; - break; case QSsl::SecureProtocols: case QSsl::TlsV1_0OrLater: minVersion = TLS1_VERSION; @@ -227,8 +223,9 @@ init_context: break; #endif // TLS1_3_VERSION case QSsl::SslV2: - // This protocol is not supported by OpenSSL 1.1 and we handle - // it as an error (see the code above). + case QSsl::SslV3: + // These protocols are not supported, and we handle + // them as an error (see the code above). Q_UNREACHABLE(); break; case QSsl::UnknownProtocol: diff --git a/src/network/ssl/qsslcontext_opensslpre11.cpp b/src/network/ssl/qsslcontext_opensslpre11.cpp index 34537d1da4..956c5c32ec 100644 --- a/src/network/ssl/qsslcontext_opensslpre11.cpp +++ b/src/network/ssl/qsslcontext_opensslpre11.cpp @@ -115,32 +115,19 @@ init_context: break; #endif // dtls case QSsl::SslV2: -#ifndef OPENSSL_NO_SSL2 - sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method()); -#else - // SSL 2 not supported by the system, but chosen deliberately -> error - sslContext->ctx = 0; - unsupportedProtocol = true; -#endif - break; case QSsl::SslV3: -#ifndef OPENSSL_NO_SSL3_METHOD - sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); -#else - // SSL 3 not supported by the system, but chosen deliberately -> error + // We don't support SSLv2 / SSLv3. sslContext->ctx = 0; unsupportedProtocol = true; -#endif break; case QSsl::SecureProtocols: // SSLv2 and SSLv3 will be disabled by SSL options // But we need q_SSLv23_server_method() otherwise AnyProtocol will be unable to connect on Win32. - case QSsl::TlsV1SslV3: - // SSLv2 will will be disabled by SSL options case QSsl::AnyProtocol: default: sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); break; + case QSsl::TlsV1SslV3: case QSsl::TlsV1_0: sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); break; @@ -212,12 +199,9 @@ init_context: long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); q_SSL_CTX_set_options(sslContext->ctx, options); -#if OPENSSL_VERSION_NUMBER >= 0x10000000L // Tell OpenSSL to release memory early // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html - if (q_SSLeay() >= 0x10000000L) - q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); -#endif + q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); // Initialize ciphers QByteArray cipherString; diff --git a/src/network/ssl/qsslellipticcurve.cpp b/src/network/ssl/qsslellipticcurve.cpp index 88baa1ff6c..5608d32fa7 100644 --- a/src/network/ssl/qsslellipticcurve.cpp +++ b/src/network/ssl/qsslellipticcurve.cpp @@ -64,6 +64,8 @@ QT_BEGIN_NAMESPACE QSslEllipticCurve instances can be compared for equality and can be used as keys in QHash and QSet. They cannot be used as key in a QMap. + + \note This class is currently only supported in OpenSSL. */ /*! diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp index 3f79d1a037..02dd16a58d 100644 --- a/src/network/ssl/qsslerror.cpp +++ b/src/network/ssl/qsslerror.cpp @@ -86,6 +86,18 @@ \value UnspecifiedError \value NoSslSupport \value CertificateBlacklisted + \value OcspNoResponseFound + \value OcspMalformedRequest + \value OcspMalformedResponse + \value OcspInternalError + \value OcspTryLater + \value OcspSigRequred + \value OcspUnauthorized + \value OcspResponseCannotBeTrusted + \value OcspResponseCertIdUnknown + \value OcspResponseExpired + \value OcspStatusUnknown + \sa QSslError::errorString() */ @@ -292,6 +304,39 @@ QString QSslError::errorString() const case CertificateBlacklisted: errStr = QSslSocket::tr("The peer certificate is blacklisted"); break; + case OcspNoResponseFound: + errStr = QSslSocket::tr("No OCSP status response found"); + break; + case OcspMalformedRequest: + errStr = QSslSocket::tr("The OCSP status request had invalid syntax"); + break; + case OcspMalformedResponse: + errStr = QSslSocket::tr("OCSP response contains an unexpected number of SingleResponse structures"); + break; + case OcspInternalError: + errStr = QSslSocket::tr("OCSP responder reached an inconsistent internal state"); + break; + case OcspTryLater: + errStr = QSslSocket::tr("OCSP responder was unable to return a status for the requested certificate"); + break; + case OcspSigRequred: + errStr = QSslSocket::tr("The server requires the client to sign the OCSP request in order to construct a response"); + break; + case OcspUnauthorized: + errStr = QSslSocket::tr("The client is not authorized to request OCSP status from this server"); + break; + case OcspResponseCannotBeTrusted: + errStr = QSslSocket::tr("OCSP responder's identity cannot be verified"); + break; + case OcspResponseCertIdUnknown: + errStr = QSslSocket::tr("The identity of a certificate in an OCSP response cannot be established"); + break; + case OcspResponseExpired: + errStr = QSslSocket::tr("The certificate status response has expired"); + break; + case OcspStatusUnknown: + errStr = QSslSocket::tr("The certificate's status is unknown"); + break; default: errStr = QSslSocket::tr("Unknown error"); break; diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index d7c959423d..513b8afd7f 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -80,6 +80,18 @@ public: HostNameMismatch, NoSslSupport, CertificateBlacklisted, + CertificateStatusUnknown, + OcspNoResponseFound, + OcspMalformedRequest, + OcspMalformedResponse, + OcspInternalError, + OcspTryLater, + OcspSigRequred, + OcspUnauthorized, + OcspResponseCannotBeTrusted, + OcspResponseCertIdUnknown, + OcspResponseExpired, + OcspStatusUnknown, UnspecifiedError = -1 }; diff --git a/src/network/ssl/qsslkey_openssl.cpp b/src/network/ssl/qsslkey_openssl.cpp index 9a43e67772..99c1a39c73 100644 --- a/src/network/ssl/qsslkey_openssl.cpp +++ b/src/network/ssl/qsslkey_openssl.cpp @@ -69,6 +69,11 @@ void QSslKeyPrivate::clear(bool deep) q_DSA_free(dsa); dsa = nullptr; } + if (algorithm == QSsl::Dh && dh) { + if (deep) + q_DH_free(dh); + dh = nullptr; + } #ifndef OPENSSL_NO_EC if (algorithm == QSsl::Ec && ec) { if (deep) @@ -105,6 +110,12 @@ bool QSslKeyPrivate::fromEVP_PKEY(EVP_PKEY *pkey) type = QSsl::PrivateKey; dsa = q_EVP_PKEY_get1_DSA(pkey); return true; + } else if (keyType == EVP_PKEY_DH) { + isNull = false; + algorithm = QSsl::Dh; + type = QSsl::PrivateKey; + dh = q_EVP_PKEY_get1_DH(pkey); + return true; } #ifndef OPENSSL_NO_EC else if (keyType == EVP_PKEY_EC) { @@ -160,6 +171,15 @@ void QSslKeyPrivate::decodePem(const QByteArray &pem, const QByteArray &passPhra : q_PEM_read_bio_DSAPrivateKey(bio, &dsa, nullptr, phrase); if (dsa && dsa == result) isNull = false; + } else if (algorithm == QSsl::Dh) { + EVP_PKEY *result = (type == QSsl::PublicKey) + ? q_PEM_read_bio_PUBKEY(bio, nullptr, nullptr, phrase) + : q_PEM_read_bio_PrivateKey(bio, nullptr, nullptr, phrase); + if (result) + dh = q_EVP_PKEY_get1_DH(result); + if (dh) + isNull = false; + q_EVP_PKEY_free(result); #ifndef OPENSSL_NO_EC } else if (algorithm == QSsl::Ec) { EC_KEY *result = (type == QSsl::PublicKey) @@ -181,6 +201,7 @@ int QSslKeyPrivate::length() const switch (algorithm) { case QSsl::Rsa: return q_RSA_bits(rsa); case QSsl::Dsa: return q_DSA_bits(dsa); + case QSsl::Dh: return q_DH_bits(dh); #ifndef OPENSSL_NO_EC case QSsl::Ec: return q_EC_GROUP_get_degree(q_EC_KEY_get0_group(ec)); #endif @@ -215,7 +236,7 @@ QByteArray QSslKeyPrivate::toPem(const QByteArray &passPhrase) const fail = true; } else { if (!q_PEM_write_bio_RSAPrivateKey( - bio, rsa, cipher, const_cast<uchar *>((const uchar *)passPhrase.data()), + bio, rsa, cipher, (uchar *)passPhrase.data(), passPhrase.size(), nullptr, nullptr)) { fail = true; } @@ -226,20 +247,33 @@ QByteArray QSslKeyPrivate::toPem(const QByteArray &passPhrase) const fail = true; } else { if (!q_PEM_write_bio_DSAPrivateKey( - bio, dsa, cipher, const_cast<uchar *>((const uchar *)passPhrase.data()), + bio, dsa, cipher, (uchar *)passPhrase.data(), passPhrase.size(), nullptr, nullptr)) { fail = true; } } + } else if (algorithm == QSsl::Dh) { + EVP_PKEY *result = q_EVP_PKEY_new(); + if (!result || !q_EVP_PKEY_set1_DH(result, dh)) { + fail = true; + } else if (type == QSsl::PublicKey) { + if (!q_PEM_write_bio_PUBKEY(bio, result)) + fail = true; + } else if (!q_PEM_write_bio_PrivateKey( + bio, result, cipher, (uchar *)passPhrase.data(), + passPhrase.size(), nullptr, nullptr)) { + fail = true; + } + q_EVP_PKEY_free(result); #ifndef OPENSSL_NO_EC } else if (algorithm == QSsl::Ec) { if (type == QSsl::PublicKey) { if (!q_PEM_write_bio_EC_PUBKEY(bio, ec)) fail = true; } else { - if (!q_PEM_write_bio_ECPrivateKey(bio, ec, cipher, - const_cast<uchar *>((const uchar *)passPhrase.data()), - passPhrase.size(), nullptr, nullptr)) { + if (!q_PEM_write_bio_ECPrivateKey( + bio, ec, cipher, (uchar *)passPhrase.data(), + passPhrase.size(), nullptr, nullptr)) { fail = true; } } @@ -267,6 +301,8 @@ Qt::HANDLE QSslKeyPrivate::handle() const return Qt::HANDLE(rsa); case QSsl::Dsa: return Qt::HANDLE(dsa); + case QSsl::Dh: + return Qt::HANDLE(dh); #ifndef OPENSSL_NO_EC case QSsl::Ec: return Qt::HANDLE(ec); diff --git a/src/network/ssl/qsslkey_p.cpp b/src/network/ssl/qsslkey_p.cpp index 28e3e2efd8..b29b38beab 100644 --- a/src/network/ssl/qsslkey_p.cpp +++ b/src/network/ssl/qsslkey_p.cpp @@ -116,6 +116,8 @@ QByteArray QSslKeyPrivate::pemHeader() const return QByteArrayLiteral("-----BEGIN DSA PRIVATE KEY-----"); else if (algorithm == QSsl::Ec) return QByteArrayLiteral("-----BEGIN EC PRIVATE KEY-----"); + else if (algorithm == QSsl::Dh) + return QByteArrayLiteral("-----BEGIN PRIVATE KEY-----"); Q_UNREACHABLE(); return QByteArray(); @@ -141,6 +143,8 @@ QByteArray QSslKeyPrivate::pemFooter() const return QByteArrayLiteral("-----END DSA PRIVATE KEY-----"); else if (algorithm == QSsl::Ec) return QByteArrayLiteral("-----END EC PRIVATE KEY-----"); + else if (algorithm == QSsl::Dh) + return QByteArrayLiteral("-----END PRIVATE KEY-----"); Q_UNREACHABLE(); return QByteArray(); @@ -535,7 +539,9 @@ QDebug operator<<(QDebug debug, const QSslKey &key) debug << "QSslKey(" << (key.type() == QSsl::PublicKey ? "PublicKey" : "PrivateKey") << ", " << (key.algorithm() == QSsl::Opaque ? "OPAQUE" : - (key.algorithm() == QSsl::Rsa ? "RSA" : ((key.algorithm() == QSsl::Dsa) ? "DSA" : "EC"))) + (key.algorithm() == QSsl::Rsa ? "RSA" : + (key.algorithm() == QSsl::Dsa ? "DSA" : + (key.algorithm() == QSsl::Dh ? "DH" : "EC")))) << ", " << key.length() << ')'; return debug; diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h index 7ae2cc740b..06403b5479 100644 --- a/src/network/ssl/qsslkey_p.h +++ b/src/network/ssl/qsslkey_p.h @@ -116,6 +116,7 @@ public: EVP_PKEY *opaque; RSA *rsa; DSA *dsa; + DH *dh; #ifndef OPENSSL_NO_EC EC_KEY *ec; #endif @@ -129,7 +130,7 @@ public: QAtomicInt ref; private: - Q_DISABLE_COPY(QSslKeyPrivate) + Q_DISABLE_COPY_MOVE(QSslKeyPrivate) }; QT_END_NAMESPACE diff --git a/src/network/ssl/qsslkey_qt.cpp b/src/network/ssl/qsslkey_qt.cpp index a13275f3bb..5ebd8ac3bd 100644 --- a/src/network/ssl/qsslkey_qt.cpp +++ b/src/network/ssl/qsslkey_qt.cpp @@ -165,6 +165,7 @@ static int extractPkcs8KeyLength(const QVector<QAsn1Element> &items, QSslKeyPriv switch (algorithm){ case QSsl::Rsa: return "RSA"; case QSsl::Dsa: return "DSA"; + case QSsl::Dh: return "DH"; case QSsl::Ec: return "EC"; case QSsl::Opaque: return "Opaque"; } @@ -217,6 +218,21 @@ static int extractPkcs8KeyLength(const QVector<QAsn1Element> &items, QSslKeyPriv if (dsaInfo.size() != 3 || dsaInfo[0].type() != QAsn1Element::IntegerType) return -1; keyLength = numberOfBits(dsaInfo[0].value()); + } else if (value == DH_ENCRYPTION_OID) { + if (Q_UNLIKELY(that->algorithm != QSsl::Dh)) { + // As above for RSA. + qWarning() << "QSslKey: Found DH when asked to use" << getName(that->algorithm) + << "\nLoading will fail."; + return -1; + } + // DH's structure is documented here: + // https://www.cryptsoft.com/pkcs11doc/STANDARD/v201-95.pdf in section 11.9. + if (pkcs8Info[1].type() != QAsn1Element::SequenceType) + return -1; + const QVector<QAsn1Element> dhInfo = pkcs8Info[1].toVector(); + if (dhInfo.size() < 2 || dhInfo.size() > 3 || dhInfo[0].type() != QAsn1Element::IntegerType) + return -1; + keyLength = numberOfBits(dhInfo[0].value()); } else { // in case of unexpected formats: qWarning() << "QSslKey: Unsupported PKCS#8 key algorithm:" << value @@ -268,6 +284,16 @@ void QSslKeyPrivate::decodeDer(const QByteArray &der, const QByteArray &passPhra if (params.isEmpty() || params[0].type() != QAsn1Element::IntegerType) return; keyLength = numberOfBits(params[0].value()); + } else if (algorithm == QSsl::Dh) { + if (infoItems[0].toObjectId() != DH_ENCRYPTION_OID) + return; + if (infoItems[1].type() != QAsn1Element::SequenceType) + return; + // key params + const QVector<QAsn1Element> params = infoItems[1].toVector(); + if (params.isEmpty() || params[0].type() != QAsn1Element::IntegerType) + return; + keyLength = numberOfBits(params[0].value()); } else if (algorithm == QSsl::Ec) { if (infoItems[0].toObjectId() != EC_ENCRYPTION_OID) return; @@ -307,6 +333,12 @@ void QSslKeyPrivate::decodeDer(const QByteArray &der, const QByteArray &passPhra if (items.size() != 6 || items[1].type() != QAsn1Element::IntegerType) return; keyLength = numberOfBits(items[1].value()); + } else if (algorithm == QSsl::Dh) { + if (versionHex != "00") + return; + if (items.size() < 5 || items.size() > 6 || items[1].type() != QAsn1Element::IntegerType) + return; + keyLength = numberOfBits(items[1].value()); } else if (algorithm == QSsl::Ec) { if (versionHex != "01") return; diff --git a/src/network/ssl/qsslkey_schannel.cpp b/src/network/ssl/qsslkey_schannel.cpp new file mode 100644 index 0000000000..5694068860 --- /dev/null +++ b/src/network/ssl/qsslkey_schannel.cpp @@ -0,0 +1,174 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qssl_p.h" +#include "qsslkey.h" +#include "qsslkey_p.h" +#include "qsslcertificate_p.h" + +#include <QtCore/qbytearray.h> +#include <QtCore/qscopeguard.h> + +QT_BEGIN_NAMESPACE + +namespace { +const wchar_t *getName(QSslKeyPrivate::Cipher cipher) +{ + switch (cipher) { + case QSslKeyPrivate::Cipher::DesCbc: + return BCRYPT_DES_ALGORITHM; + case QSslKeyPrivate::Cipher::DesEde3Cbc: + return BCRYPT_3DES_ALGORITHM; + case QSslKeyPrivate::Cipher::Rc2Cbc: + return BCRYPT_RC2_ALGORITHM; + } + Q_UNREACHABLE(); +} + +BCRYPT_ALG_HANDLE getHandle(QSslKeyPrivate::Cipher cipher) +{ + BCRYPT_ALG_HANDLE handle; + NTSTATUS status = BCryptOpenAlgorithmProvider( + &handle, // phAlgorithm + getName(cipher), // pszAlgId + nullptr, // pszImplementation + 0 // dwFlags + ); + if (status < 0) { + qCWarning(lcSsl, "Failed to open algorithm handle (%ld)!", status); + return nullptr; + } + + return handle; +} + +BCRYPT_KEY_HANDLE generateSymmetricKey(BCRYPT_ALG_HANDLE handle, + const QByteArray &key) +{ + BCRYPT_KEY_HANDLE keyHandle; + NTSTATUS status = BCryptGenerateSymmetricKey( + handle, // hAlgorithm + &keyHandle, // phKey + nullptr, // pbKeyObject (can ignore) + 0, // cbKeyObject (also ignoring) + reinterpret_cast<unsigned char *>(const_cast<char *>(key.data())), // pbSecret + ULONG(key.length()), // cbSecret + 0 // dwFlags + ); + if (status < 0) { + qCWarning(lcSsl, "Failed to generate symmetric key (%ld)!", status); + return nullptr; + } + + status = BCryptSetProperty( + keyHandle, // hObject + BCRYPT_CHAINING_MODE, // pszProperty + reinterpret_cast<UCHAR *>(const_cast<wchar_t *>(BCRYPT_CHAIN_MODE_CBC)), // pbInput + ARRAYSIZE(BCRYPT_CHAIN_MODE_CBC), // cbInput + 0 // dwFlags + ); + if (status < 0) { + BCryptDestroyKey(keyHandle); + qCWarning(lcSsl, "Failed to change the symmetric key's chaining mode (%ld)!", status); + return nullptr; + } + return keyHandle; +} + +QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, const QByteArray &key, + const QByteArray &iv, bool encrypt) +{ + BCRYPT_ALG_HANDLE handle = getHandle(cipher); + if (!handle) + return {}; + auto handleDealloc = qScopeGuard([&handle]() { + BCryptCloseAlgorithmProvider(handle, 0); + }); + + BCRYPT_KEY_HANDLE keyHandle = generateSymmetricKey(handle, key); + if (!keyHandle) + return {}; + auto keyHandleDealloc = qScopeGuard([&keyHandle]() { + BCryptDestroyKey(keyHandle); + }); + + QByteArray ivCopy = iv; // This gets modified, so we take a copy + + ULONG sizeNeeded = 0; + QVarLengthArray<unsigned char> output; + auto cryptFunction = encrypt ? BCryptEncrypt : BCryptDecrypt; + for (int i = 0; i < 2; i++) { + output.resize(int(sizeNeeded)); + auto input = reinterpret_cast<unsigned char *>(const_cast<char *>(data.data())); + // Need to call it twice because the first iteration lets us know the size needed. + NTSTATUS status = cryptFunction( + keyHandle, // hKey + input, // pbInput + ULONG(data.length()), // cbInput + nullptr, // pPaddingInfo + reinterpret_cast<unsigned char *>(ivCopy.data()), // pbIV + ULONG(ivCopy.length()), // cbIV + sizeNeeded ? output.data() : nullptr, // pbOutput + ULONG(output.length()), // cbOutput + &sizeNeeded, // pcbResult + BCRYPT_BLOCK_PADDING // dwFlags + ); + if (status < 0) { + qCWarning(lcSsl, "%s failed (%ld)!", encrypt ? "Encrypt" : "Decrypt", status); + return {}; + } + } + + return QByteArray(reinterpret_cast<const char *>(output.constData()), int(sizeNeeded)); +} +} // anonymous namespace + +QByteArray QSslKeyPrivate::decrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, + const QByteArray &iv) +{ + return doCrypt(cipher, data, key, iv, false); +} + +QByteArray QSslKeyPrivate::encrypt(Cipher cipher, const QByteArray &data, const QByteArray &key, + const QByteArray &iv) +{ + return doCrypt(cipher, data, key, iv, true); +} + +QT_END_NAMESPACE diff --git a/src/network/ssl/qsslpresharedkeyauthenticator.cpp b/src/network/ssl/qsslpresharedkeyauthenticator.cpp index 3bb2719026..01e1501763 100644 --- a/src/network/ssl/qsslpresharedkeyauthenticator.cpp +++ b/src/network/ssl/qsslpresharedkeyauthenticator.cpp @@ -94,6 +94,8 @@ QSslPreSharedKeyAuthenticatorPrivate::QSslPreSharedKeyAuthenticatorPrivate() \note PSK ciphersuites are supported only when using OpenSSL 1.0.1 (or greater) as the SSL backend. + \note PSK is currently only supported in OpenSSL. + \sa QSslSocket */ diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 4f49a71e8a..fdd3e8efba 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -133,7 +133,8 @@ \list \li The socket's cryptographic cipher suite can be customized before - the handshake phase with setCiphers() and setDefaultCiphers(). + the handshake phase with QSslConfiguration::setCiphers() + and QSslConfiguration::setDefaultCiphers(). \li The socket's local certificate and private key can be customized before the handshake phase with setLocalCertificate() and setPrivateKey(). @@ -202,6 +203,7 @@ does not require this certificate to be valid. This is useful when you want to display peer certificate details to the user without affecting the actual SSL handshake. This mode is the default for servers. + Note: In Schannel this value acts the same as VerifyNone. \value VerifyPeer QSslSocket will request a certificate from the peer during the SSL handshake phase, and requires that this certificate is @@ -312,6 +314,7 @@ #include "qssl_p.h" #include "qsslsocket.h" #include "qsslcipher.h" +#include "qocspresponse.h" #ifndef QT_NO_OPENSSL #include "qsslsocket_openssl_p.h" #endif @@ -321,6 +324,9 @@ #ifdef QT_SECURETRANSPORT #include "qsslsocket_mac_p.h" #endif +#if QT_CONFIG(schannel) +#include "qsslsocket_schannel_p.h" +#endif #include "qsslconfiguration_p.h" #include <QtCore/qdebug.h> @@ -459,6 +465,9 @@ void QSslSocket::connectToHostEncrypted(const QString &hostName, quint16 port, O return; } + if (!d->verifyProtocolSupported("QSslSocket::connectToHostEncrypted:")) + return; + d->init(); d->autoStartHandshake = true; d->initialized = true; @@ -906,7 +915,8 @@ void QSslSocket::abort() time without notice. \sa localCertificate(), peerCertificate(), peerCertificateChain(), - sessionCipher(), privateKey(), ciphers(), caCertificates() + sessionCipher(), privateKey(), QSslConfiguration::ciphers(), + QSslConfiguration::caCertificates() */ QSslConfiguration QSslSocket::sslConfiguration() const { @@ -930,7 +940,8 @@ QSslConfiguration QSslSocket::sslConfiguration() const It is not possible to set the SSL-state related fields. - \sa setLocalCertificate(), setPrivateKey(), setCaCertificates(), setCiphers() + \sa setLocalCertificate(), setPrivateKey(), QSslConfiguration::setCaCertificates(), + QSslConfiguration::setCiphers() */ void QSslSocket::setSslConfiguration(const QSslConfiguration &configuration) { @@ -952,6 +963,9 @@ void QSslSocket::setSslConfiguration(const QSslConfiguration &configuration) d->configuration.nextAllowedProtocols = configuration.allowedNextProtocols(); d->configuration.nextNegotiatedProtocol = configuration.nextNegotiatedProtocol(); d->configuration.nextProtocolNegotiationStatus = configuration.nextProtocolNegotiationStatus(); +#if QT_CONFIG(ocsp) + d->configuration.ocspStaplingEnabled = configuration.ocspStaplingEnabled(); +#endif // if the CA certificates were set explicitly (either via // QSslConfiguration::setCaCertificates() or QSslSocket::setCaCertificates(), @@ -1113,8 +1127,10 @@ QList<QSslCertificate> QSslSocket::peerCertificateChain() const session cipher. This ordered list must be in place before the handshake phase begins. - \sa ciphers(), setCiphers(), setDefaultCiphers(), defaultCiphers(), - supportedCiphers() + \sa QSslConfiguration::ciphers(), QSslConfiguration::setCiphers(), + QSslConfiguration::setDefaultCiphers(), + QSslConfiguration::defaultCiphers(), + QSslConfiguration::supportedCiphers() */ QSslCipher QSslSocket::sessionCipher() const { @@ -1136,6 +1152,20 @@ QSsl::SslProtocol QSslSocket::sessionProtocol() const return d->sessionProtocol(); } +/*! + \since 5.13 + + This function returns Online Certificate Status Protocol responses that + a server may send during a TLS handshake using OCSP stapling. The vector + is empty if no definitive response or no response at all was received. + + \sa QSslConfiguration::setOcspStaplingEnabled() +*/ +QVector<QOcspResponse> QSslSocket::ocspResponses() const +{ + Q_D(const QSslSocket); + return d->ocspResponses; +} /*! Sets the socket's private \l {QSslKey} {key} to \a key. The @@ -1376,7 +1406,8 @@ bool QSslSocket::addCaCertificates(const QString &path, QSsl::EncodingFormat for To add multiple certificates, use addCaCertificates(). - \sa caCertificates(), setCaCertificates() + \sa QSslConfiguration::caCertificates(), + QSslConfiguration::setCaCertificates() */ void QSslSocket::addCaCertificate(const QSslCertificate &certificate) { @@ -1391,7 +1422,7 @@ void QSslSocket::addCaCertificate(const QSslCertificate &certificate) For more precise control, use addCaCertificate(). - \sa caCertificates(), addDefaultCaCertificate() + \sa QSslConfiguration::caCertificates(), addDefaultCaCertificate() */ void QSslSocket::addCaCertificates(const QList<QSslCertificate> &certificates) { @@ -1454,7 +1485,8 @@ QList<QSslCertificate> QSslSocket::caCertificates() const Each SSL socket's CA certificate database is initialized to the default CA certificate database. - \sa defaultCaCertificates(), addCaCertificates(), addDefaultCaCertificate() + \sa QSslConfiguration::defaultCaCertificates(), addCaCertificates(), + addDefaultCaCertificate() */ bool QSslSocket::addDefaultCaCertificates(const QString &path, QSsl::EncodingFormat encoding, QRegExp::PatternSyntax syntax) @@ -1467,7 +1499,7 @@ bool QSslSocket::addDefaultCaCertificates(const QString &path, QSsl::EncodingFor SSL socket's CA certificate database is initialized to the default CA certificate database. - \sa defaultCaCertificates(), addCaCertificates() + \sa QSslConfiguration::defaultCaCertificates(), addCaCertificates() */ void QSslSocket::addDefaultCaCertificate(const QSslCertificate &certificate) { @@ -1479,7 +1511,7 @@ void QSslSocket::addDefaultCaCertificate(const QSslCertificate &certificate) SSL socket's CA certificate database is initialized to the default CA certificate database. - \sa defaultCaCertificates(), addCaCertificates() + \sa QSslConfiguration::defaultCaCertificates(), addCaCertificates() */ void QSslSocket::addDefaultCaCertificates(const QList<QSslCertificate> &certificates) { @@ -1597,6 +1629,8 @@ bool QSslSocket::waitForEncrypted(int msecs) return false; if (d->mode == UnencryptedMode && !d->autoStartHandshake) return false; + if (!d->verifyProtocolSupported("QSslSocket::waitForEncrypted:")) + return false; QElapsedTimer stopWatch; stopWatch.start(); @@ -1846,6 +1880,10 @@ void QSslSocket::startClientEncryption() d->setErrorAndEmit(QAbstractSocket::SslInternalError, tr("TLS initialization failed")); return; } + + if (!d->verifyProtocolSupported("QSslSocket::startClientEncryption:")) + return; + #ifdef QSSLSOCKET_DEBUG qCDebug(lcSsl) << "QSslSocket::startClientEncryption()"; #endif @@ -1889,6 +1927,9 @@ void QSslSocket::startServerEncryption() d->setErrorAndEmit(QAbstractSocket::SslInternalError, tr("TLS initialization failed")); return; } + if (!d->verifyProtocolSupported("QSslSocket::startServerEncryption")) + return; + d->mode = SslServerMode; emit modeChanged(d->mode); d->startServerEncryption(); @@ -1974,6 +2015,7 @@ void QSslSocket::connectToHost(const QString &hostName, quint16 port, OpenMode o d->createPlainSocket(openMode); } #ifndef QT_NO_NETWORKPROXY + d->plainSocket->setProtocolTag(d->protocolTag); d->plainSocket->setProxy(proxy()); #endif QIODevice::open(openMode); @@ -2108,6 +2150,7 @@ void QSslSocketPrivate::init() shutdown = false; pendingClose = false; flushTriggered = false; + ocspResponses.clear(); // we don't want to clear the ignoreErrorsList, so // that it is possible setting it before connecting @@ -2122,6 +2165,20 @@ void QSslSocketPrivate::init() /*! \internal */ +bool QSslSocketPrivate::verifyProtocolSupported(const char *where) +{ + if (configuration.protocol == QSsl::SslV2 || configuration.protocol == QSsl::SslV3) { + qCWarning(lcSsl) << where << "Attempted to use an unsupported protocol."; + setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError, + QSslSocket::tr("Attempted to use an unsupported protocol.")); + return false; + } + return true; +} + +/*! + \internal +*/ QList<QSslCipher> QSslSocketPrivate::defaultCiphers() { QSslSocketPrivate::ensureInitialized(); @@ -2324,6 +2381,9 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri #if QT_CONFIG(dtls) ptr->dtlsCookieEnabled = global->dtlsCookieEnabled; #endif +#if QT_CONFIG(ocsp) + ptr->ocspStaplingEnabled = global->ocspStaplingEnabled; +#endif } /*! @@ -2822,6 +2882,17 @@ QSharedPointer<QSslContext> QSslSocketPrivate::sslContext(QSslSocket *socket) bool QSslSocketPrivate::isMatchingHostname(const QSslCertificate &cert, const QString &peerName) { + QHostAddress hostAddress(peerName); + if (!hostAddress.isNull()) { + const auto subjectAlternativeNames = cert.subjectAlternativeNames(); + const auto ipAddresses = subjectAlternativeNames.equal_range(QSsl::AlternativeNameEntryType::IpAddressEntry); + + for (auto it = ipAddresses.first; it != ipAddresses.second; it++) { + if (QHostAddress(*it).isEqual(hostAddress, QHostAddress::StrictConversion)) + return true; + } + } + const QString lowerPeerName = QString::fromLatin1(QUrl::toAce(peerName)); const QStringList commonNames = cert.subjectInfo(QSslCertificate::CommonName); diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index c66ebdde54..4a695a6b01 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -60,6 +60,8 @@ class QSslCertificate; class QSslConfiguration; class QSslEllipticCurve; class QSslPreSharedKeyAuthenticator; +class QOcspResponse; +template<class> class QVector; class QSslSocketPrivate; class Q_NETWORK_EXPORT QSslSocket : public QTcpSocket @@ -142,6 +144,7 @@ public: QList<QSslCertificate> peerCertificateChain() const; QSslCipher sessionCipher() const; QSsl::SslProtocol sessionProtocol() const; + QVector<QOcspResponse> ocspResponses() const; // Private keys, for server sockets. void setPrivateKey(const QSslKey &key); @@ -228,7 +231,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_flushWriteBuffer()) Q_PRIVATE_SLOT(d_func(), void _q_flushReadBuffer()) Q_PRIVATE_SLOT(d_func(), void _q_resumeImplementation()) -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && !QT_CONFIG(schannel) Q_PRIVATE_SLOT(d_func(), void _q_caRootLoaded(QSslCertificate,QSslCertificate)) #endif friend class QSslSocketBackendPrivate; diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index 7c5f4310f8..487e975db6 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -89,7 +89,7 @@ struct EphemeralSecKeychain ~EphemeralSecKeychain(); SecKeychainRef keychain = nullptr; - Q_DISABLE_COPY(EphemeralSecKeychain) + Q_DISABLE_COPY_MOVE(EphemeralSecKeychain) }; EphemeralSecKeychain::EphemeralSecKeychain() @@ -995,9 +995,6 @@ void QSslSocketBackendPrivate::destroySslContext() context.reset(nullptr); } -static QByteArray _q_makePkcs12(const QList<QSslCertificate> &certs, const QSslKey &key, const QString &passPhrase); - - bool QSslSocketBackendPrivate::setSessionCertificate(QString &errorDescription, QAbstractSocket::SocketError &errorCode) { Q_ASSERT_X(context, Q_FUNC_INFO, "invalid SSL context (null)"); @@ -1112,6 +1109,12 @@ bool QSslSocketBackendPrivate::setSessionProtocol() return false; } + // SslV3 is unsupported. + if (configuration.protocol == QSsl::SslV3) { + qCDebug(lcSsl) << "protocol QSsl::SslV3 is disabled"; + return false; + } + // SecureTransport has kTLSProtocol13 constant and also, kTLSProtocolMaxSupported. // Calling SSLSetProtocolVersionMax/Min with any of these two constants results // in errInvalidParam and a failure to set the protocol version. This means @@ -1126,14 +1129,7 @@ bool QSslSocketBackendPrivate::setSessionProtocol() OSStatus err = errSecSuccess; - if (configuration.protocol == QSsl::SslV3) { - #ifdef QSSLSOCKET_DEBUG - qCDebug(lcSsl) << plainSocket << "requesting : SSLv3"; - #endif - err = SSLSetProtocolVersionMin(context, kSSLProtocol3); - if (err == errSecSuccess) - err = SSLSetProtocolVersionMax(context, kSSLProtocol3); - } else if (configuration.protocol == QSsl::TlsV1_0) { + if (configuration.protocol == QSsl::TlsV1_0) { #ifdef QSSLSOCKET_DEBUG qCDebug(lcSsl) << plainSocket << "requesting : TLSv1.0"; #endif @@ -1158,13 +1154,14 @@ bool QSslSocketBackendPrivate::setSessionProtocol() #ifdef QSSLSOCKET_DEBUG qCDebug(lcSsl) << plainSocket << "requesting : any"; #endif - // kSSLProtocol3, since kSSLProtocol2 is disabled: - err = SSLSetProtocolVersionMin(context, kSSLProtocol3); + err = SSLSetProtocolVersionMin(context, kTLSProtocol1); } else if (configuration.protocol == QSsl::TlsV1SslV3) { #ifdef QSSLSOCKET_DEBUG qCDebug(lcSsl) << plainSocket << "requesting : SSLv3 - TLSv1.2"; #endif - err = SSLSetProtocolVersionMin(context, kSSLProtocol3); + err = SSLSetProtocolVersionMin(context, kTLSProtocol1); + if (err == errSecSuccess) + err = SSLSetProtocolVersionMax(context, kTLSProtocol1); } else if (configuration.protocol == QSsl::SecureProtocols) { #ifdef QSSLSOCKET_DEBUG qCDebug(lcSsl) << plainSocket << "requesting : TLSv1 - TLSv1.2"; @@ -1210,7 +1207,7 @@ bool QSslSocketBackendPrivate::verifySessionProtocol() const if (configuration.protocol == QSsl::AnyProtocol) protocolOk = true; else if (configuration.protocol == QSsl::TlsV1SslV3) - protocolOk = (sessionProtocol() >= QSsl::SslV3); + protocolOk = (sessionProtocol() == QSsl::TlsV1_0); else if (configuration.protocol == QSsl::SecureProtocols) protocolOk = (sessionProtocol() >= QSsl::TlsV1_0); else if (configuration.protocol == QSsl::TlsV1_0OrLater) @@ -1503,264 +1500,4 @@ bool QSslSocketBackendPrivate::startHandshake() } } -/* - PKCS12 helpers. -*/ - -static QAsn1Element wrap(quint8 type, const QAsn1Element &child) -{ - QByteArray value; - QDataStream stream(&value, QIODevice::WriteOnly); - child.write(stream); - return QAsn1Element(type, value); -} - -static QAsn1Element _q_PKCS7_data(const QByteArray &data) -{ - QVector<QAsn1Element> items; - items << QAsn1Element::fromObjectId("1.2.840.113549.1.7.1"); - items << wrap(QAsn1Element::Context0Type, - QAsn1Element(QAsn1Element::OctetStringType, data)); - return QAsn1Element::fromVector(items); -} - -/*! - PKCS #12 key derivation. - - Some test vectors: - http://www.drh-consultancy.demon.co.uk/test.txt -*/ -static QByteArray _q_PKCS12_keygen(char id, const QByteArray &salt, const QString &passPhrase, int n, int r) -{ - const int u = 20; - const int v = 64; - - // password formatting - QByteArray passUnicode(passPhrase.size() * 2 + 2, '\0'); - char *p = passUnicode.data(); - for (int i = 0; i < passPhrase.size(); ++i) { - quint16 ch = passPhrase[i].unicode(); - *(p++) = (ch & 0xff00) >> 8; - *(p++) = (ch & 0xff); - } - - // prepare I - QByteArray D(64, id); - QByteArray S, P; - const int sSize = v * ((salt.size() + v - 1) / v); - S.resize(sSize); - for (int i = 0; i < sSize; ++i) { - S[i] = salt[i % salt.size()]; - } - const int pSize = v * ((passUnicode.size() + v - 1) / v); - P.resize(pSize); - for (int i = 0; i < pSize; ++i) { - P[i] = passUnicode[i % passUnicode.size()]; - } - QByteArray I = S + P; - - // apply hashing - const int c = (n + u - 1) / u; - QByteArray A; - QByteArray B; - B.resize(v); - QCryptographicHash hash(QCryptographicHash::Sha1); - for (int i = 0; i < c; ++i) { - // hash r iterations - QByteArray Ai = D + I; - for (int j = 0; j < r; ++j) { - hash.reset(); - hash.addData(Ai); - Ai = hash.result(); - } - - for (int j = 0; j < v; ++j) { - B[j] = Ai[j % u]; - } - - // modify I as Ij = (Ij + B + 1) modulo 2^v - for (int p = 0; p < I.size(); p += v) { - quint8 carry = 1; - for (int j = v - 1; j >= 0; --j) { - quint16 v = quint8(I[p+j]) + quint8(B[j]) + carry; - I[p+j] = v & 0xff; - carry = (v & 0xff00) >> 8; - } - } - A += Ai; - } - return A.left(n); -} - -static QByteArray _q_PKCS12_salt() -{ - QByteArray salt; - salt.resize(8); - for (int i = 0; i < salt.size(); ++i) { - salt[i] = (qrand() & 0xff); - } - return salt; -} - -static QByteArray _q_PKCS12_certBag(const QSslCertificate &cert) -{ - QVector<QAsn1Element> items; - items << QAsn1Element::fromObjectId("1.2.840.113549.1.12.10.1.3"); - - // certificate - QVector<QAsn1Element> certItems; - certItems << QAsn1Element::fromObjectId("1.2.840.113549.1.9.22.1"); - certItems << wrap(QAsn1Element::Context0Type, - QAsn1Element(QAsn1Element::OctetStringType, cert.toDer())); - items << wrap(QAsn1Element::Context0Type, - QAsn1Element::fromVector(certItems)); - - // local key id - const QByteArray localKeyId = cert.digest(QCryptographicHash::Sha1); - QVector<QAsn1Element> idItems; - idItems << QAsn1Element::fromObjectId("1.2.840.113549.1.9.21"); - idItems << wrap(QAsn1Element::SetType, - QAsn1Element(QAsn1Element::OctetStringType, localKeyId)); - items << wrap(QAsn1Element::SetType, QAsn1Element::fromVector(idItems)); - - // dump - QAsn1Element root = wrap(QAsn1Element::SequenceType, QAsn1Element::fromVector(items)); - QByteArray ba; - QDataStream stream(&ba, QIODevice::WriteOnly); - root.write(stream); - return ba; -} - -static QAsn1Element _q_PKCS12_key(const QSslKey &key) -{ - Q_ASSERT(key.algorithm() == QSsl::Rsa || key.algorithm() == QSsl::Dsa); - - QVector<QAsn1Element> keyItems; - keyItems << QAsn1Element::fromInteger(0); - QVector<QAsn1Element> algoItems; - if (key.algorithm() == QSsl::Rsa) - algoItems << QAsn1Element::fromObjectId(RSA_ENCRYPTION_OID); - else if (key.algorithm() == QSsl::Dsa) - algoItems << QAsn1Element::fromObjectId(DSA_ENCRYPTION_OID); - algoItems << QAsn1Element(QAsn1Element::NullType); - keyItems << QAsn1Element::fromVector(algoItems); - keyItems << QAsn1Element(QAsn1Element::OctetStringType, key.toDer()); - return QAsn1Element::fromVector(keyItems); -} - -static QByteArray _q_PKCS12_shroudedKeyBag(const QSslKey &key, const QString &passPhrase, const QByteArray &localKeyId) -{ - const int iterations = 2048; - QByteArray salt = _q_PKCS12_salt(); - QByteArray cKey = _q_PKCS12_keygen(1, salt, passPhrase, 24, iterations); - QByteArray cIv = _q_PKCS12_keygen(2, salt, passPhrase, 8, iterations); - - // prepare and encrypt data - QByteArray plain; - QDataStream plainStream(&plain, QIODevice::WriteOnly); - _q_PKCS12_key(key).write(plainStream); - QByteArray crypted = QSslKeyPrivate::encrypt(QSslKeyPrivate::DesEde3Cbc, - plain, cKey, cIv); - - QVector<QAsn1Element> items; - items << QAsn1Element::fromObjectId("1.2.840.113549.1.12.10.1.2"); - - // key - QVector<QAsn1Element> keyItems; - QVector<QAsn1Element> algoItems; - algoItems << QAsn1Element::fromObjectId("1.2.840.113549.1.12.1.3"); - QVector<QAsn1Element> paramItems; - paramItems << QAsn1Element(QAsn1Element::OctetStringType, salt); - paramItems << QAsn1Element::fromInteger(iterations); - algoItems << QAsn1Element::fromVector(paramItems); - keyItems << QAsn1Element::fromVector(algoItems); - keyItems << QAsn1Element(QAsn1Element::OctetStringType, crypted); - items << wrap(QAsn1Element::Context0Type, - QAsn1Element::fromVector(keyItems)); - - // local key id - QVector<QAsn1Element> idItems; - idItems << QAsn1Element::fromObjectId("1.2.840.113549.1.9.21"); - idItems << wrap(QAsn1Element::SetType, - QAsn1Element(QAsn1Element::OctetStringType, localKeyId)); - items << wrap(QAsn1Element::SetType, - QAsn1Element::fromVector(idItems)); - - // dump - QAsn1Element root = wrap(QAsn1Element::SequenceType, QAsn1Element::fromVector(items)); - QByteArray ba; - QDataStream stream(&ba, QIODevice::WriteOnly); - root.write(stream); - return ba; -} - -static QByteArray _q_PKCS12_bag(const QList<QSslCertificate> &certs, const QSslKey &key, const QString &passPhrase) -{ - QVector<QAsn1Element> items; - - // certs - for (int i = 0; i < certs.size(); ++i) - items << _q_PKCS7_data(_q_PKCS12_certBag(certs[i])); - - // key - const QByteArray localKeyId = certs.first().digest(QCryptographicHash::Sha1); - items << _q_PKCS7_data(_q_PKCS12_shroudedKeyBag(key, passPhrase, localKeyId)); - - // dump - QAsn1Element root = QAsn1Element::fromVector(items); - QByteArray ba; - QDataStream stream(&ba, QIODevice::WriteOnly); - root.write(stream); - return ba; -} - -static QAsn1Element _q_PKCS12_mac(const QByteArray &data, const QString &passPhrase) -{ - const int iterations = 2048; - - // salt generation - QByteArray macSalt = _q_PKCS12_salt(); - QByteArray key = _q_PKCS12_keygen(3, macSalt, passPhrase, 20, iterations); - - // HMAC calculation - QMessageAuthenticationCode hmac(QCryptographicHash::Sha1, key); - hmac.addData(data); - - QVector<QAsn1Element> algoItems; - algoItems << QAsn1Element::fromObjectId("1.3.14.3.2.26"); - algoItems << QAsn1Element(QAsn1Element::NullType); - - QVector<QAsn1Element> digestItems; - digestItems << QAsn1Element::fromVector(algoItems); - digestItems << QAsn1Element(QAsn1Element::OctetStringType, hmac.result()); - - QVector<QAsn1Element> macItems; - macItems << QAsn1Element::fromVector(digestItems); - macItems << QAsn1Element(QAsn1Element::OctetStringType, macSalt); - macItems << QAsn1Element::fromInteger(iterations); - return QAsn1Element::fromVector(macItems); -} - -QByteArray _q_makePkcs12(const QList<QSslCertificate> &certs, const QSslKey &key, const QString &passPhrase) -{ - QVector<QAsn1Element> items; - - // version - items << QAsn1Element::fromInteger(3); - - // auth safe - const QByteArray data = _q_PKCS12_bag(certs, key, passPhrase); - items << _q_PKCS7_data(data); - - // HMAC - items << _q_PKCS12_mac(data, passPhrase); - - // dump - QAsn1Element root = QAsn1Element::fromVector(items); - QByteArray ba; - QDataStream stream(&ba, QIODevice::WriteOnly); - root.write(stream); - return ba; -} - QT_END_NAMESPACE diff --git a/src/network/ssl/qsslsocket_mac_p.h b/src/network/ssl/qsslsocket_mac_p.h index e37171e56a..48aca964a1 100644 --- a/src/network/ssl/qsslsocket_mac_p.h +++ b/src/network/ssl/qsslsocket_mac_p.h @@ -75,7 +75,7 @@ public: private: SSLContextRef context; - Q_DISABLE_COPY(QSecureTransportContext) + Q_DISABLE_COPY_MOVE(QSecureTransportContext) }; class QSslSocketBackendPrivate : public QSslSocketPrivate @@ -129,7 +129,7 @@ private: QSecureTransportContext context; bool renegotiating = false; - Q_DISABLE_COPY(QSslSocketBackendPrivate) + Q_DISABLE_COPY_MOVE(QSslSocketBackendPrivate) }; QT_END_NAMESPACE diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index b5b098502d..9f5a11294d 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -65,6 +65,7 @@ #include "qsslellipticcurve.h" #include "qsslpresharedkeyauthenticator.h" #include "qsslpresharedkeyauthenticator_p.h" +#include "qocspresponse_p.h" #ifdef Q_OS_WIN #include "qwindowscarootfetcher_p.h" @@ -83,16 +84,16 @@ #include <QtCore/qvarlengtharray.h> #include <QtCore/qscopedvaluerollback.h> +#if QT_CONFIG(ocsp) +#include "qocsp_p.h" +#endif + +#include <algorithm> + #include <string.h> QT_BEGIN_NAMESPACE -#if defined(Q_OS_WIN) - PtrCertOpenSystemStoreW QSslSocketPrivate::ptrCertOpenSystemStoreW = nullptr; - PtrCertFindCertificateInStore QSslSocketPrivate::ptrCertFindCertificateInStore = nullptr; - PtrCertCloseStore QSslSocketPrivate::ptrCertCloseStore = nullptr; -#endif - bool QSslSocketPrivate::s_libraryLoaded = false; bool QSslSocketPrivate::s_loadedCiphersAndCerts = false; bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; @@ -137,6 +138,37 @@ static unsigned int q_ssl_psk_server_callback(SSL *ssl, return d->tlsPskServerCallback(identity, psk, max_psk_len); } #endif + +#if QT_CONFIG(ocsp) + +int qt_OCSP_status_server_callback(SSL *ssl, void *ocspRequest) +{ + Q_UNUSED(ocspRequest) + if (!ssl) + return SSL_TLSEXT_ERR_ALERT_FATAL; + + auto d = static_cast<QSslSocketBackendPrivate *>(q_SSL_get_ex_data(ssl, QSslSocketBackendPrivate::s_indexForSSLExtraData)); + if (!d) + return SSL_TLSEXT_ERR_ALERT_FATAL; + + Q_ASSERT(d->mode == QSslSocket::SslServerMode); + const QByteArray &response = d->ocspResponseDer; + Q_ASSERT(response.size()); + + unsigned char *derCopy = static_cast<unsigned char *>(q_OPENSSL_malloc(size_t(response.size()))); + if (!derCopy) + return SSL_TLSEXT_ERR_ALERT_FATAL; + + std::copy(response.data(), response.data() + response.size(), derCopy); + // We don't check the return value: internally OpenSSL simply assignes the + // pointer (it assumes it now owns this memory btw!) and the length. + q_SSL_set_tlsext_status_ocsp_resp(ssl, derCopy, response.size()); + + return SSL_TLSEXT_ERR_OK; +} + +#endif // ocsp + } // extern "C" QSslSocketBackendPrivate::QSslSocketBackendPrivate() @@ -204,8 +236,120 @@ QSslErrorEntry QSslErrorEntry::fromStoreContext(X509_STORE_CTX *ctx) }; } +#if QT_CONFIG(ocsp) + +QSslError qt_OCSP_response_status_to_QSslError(long code) +{ + switch (code) { + case OCSP_RESPONSE_STATUS_MALFORMEDREQUEST: + return QSslError::OcspMalformedRequest; + case OCSP_RESPONSE_STATUS_INTERNALERROR: + return QSslError::OcspInternalError; + case OCSP_RESPONSE_STATUS_TRYLATER: + return QSslError::OcspTryLater; + case OCSP_RESPONSE_STATUS_SIGREQUIRED: + return QSslError::OcspSigRequred; + case OCSP_RESPONSE_STATUS_UNAUTHORIZED: + return QSslError::OcspUnauthorized; + case OCSP_RESPONSE_STATUS_SUCCESSFUL: + default: + return {}; + } + Q_UNREACHABLE(); +} + +OcspRevocationReason qt_OCSP_revocation_reason(int reason) +{ + switch (reason) { + case OCSP_REVOKED_STATUS_NOSTATUS: + return OcspRevocationReason::None; + case OCSP_REVOKED_STATUS_UNSPECIFIED: + return OcspRevocationReason::Unspecified; + case OCSP_REVOKED_STATUS_KEYCOMPROMISE: + return OcspRevocationReason::KeyCompromise; + case OCSP_REVOKED_STATUS_CACOMPROMISE: + return OcspRevocationReason::CACompromise; + case OCSP_REVOKED_STATUS_AFFILIATIONCHANGED: + return OcspRevocationReason::AffiliationChanged; + case OCSP_REVOKED_STATUS_SUPERSEDED: + return OcspRevocationReason::Superseded; + case OCSP_REVOKED_STATUS_CESSATIONOFOPERATION: + return OcspRevocationReason::CessationOfOperation; + case OCSP_REVOKED_STATUS_CERTIFICATEHOLD: + return OcspRevocationReason::CertificateHold; + case OCSP_REVOKED_STATUS_REMOVEFROMCRL: + return OcspRevocationReason::RemoveFromCRL; + default: + return OcspRevocationReason::None; + } + + Q_UNREACHABLE(); +} + +bool qt_OCSP_certificate_match(OCSP_SINGLERESP *singleResponse, X509 *peerCert, X509 *issuer) +{ + // OCSP_basic_verify does verify that the responder is legit, the response is + // correctly signed, CertID is correct. But it does not know which certificate + // we were presented with by our peer, so it does not check if it's a response + // for our peer's certificate. + Q_ASSERT(singleResponse && peerCert && issuer); + + const OCSP_CERTID *certId = q_OCSP_SINGLERESP_get0_id(singleResponse); // Does not increment refcount. + if (!certId) { + qCWarning(lcSsl, "A SingleResponse without CertID"); + return false; + } + + ASN1_OBJECT *md = nullptr; + ASN1_INTEGER *reportedSerialNumber = nullptr; + const int result = q_OCSP_id_get0_info(nullptr, &md, nullptr, &reportedSerialNumber, const_cast<OCSP_CERTID *>(certId)); + if (result != 1 || !md || !reportedSerialNumber) { + qCWarning(lcSsl, "Failed to extract a hash and serial number from CertID structure"); + return false; + } + + if (!q_X509_get_serialNumber(peerCert)) { + // Is this possible at all? But we have to check this, + // ASN1_INTEGER_cmp (called from OCSP_id_cmp) dereferences + // without any checks at all. + qCWarning(lcSsl, "No serial number in peer's ceritificate"); + return false; + } + + const int nid = q_OBJ_obj2nid(md); + if (nid == NID_undef) { + qCWarning(lcSsl, "Unknown hash algorithm in CertID"); + return false; + } + + const EVP_MD *digest = q_EVP_get_digestbynid(nid); // Does not increment refcount. + if (!digest) { + qCWarning(lcSsl) << "No digest for nid" << nid; + return false; + } + + OCSP_CERTID *recreatedId = q_OCSP_cert_to_id(digest, peerCert, issuer); + if (!recreatedId) { + qCWarning(lcSsl, "Failed to re-create CertID"); + return false; + } + const QSharedPointer<OCSP_CERTID> guard(recreatedId, q_OCSP_CERTID_free); + + if (q_OCSP_id_cmp(const_cast<OCSP_CERTID *>(certId), recreatedId)) { + qDebug(lcSsl, "Certificate ID mismatch"); + return false; + } + // Bingo! + return true; +} + +#endif // ocsp + // ### This list is shared between all threads, and protected by a -// mutex. Investigate using thread local storage instead. +// mutex. Investigate using thread local storage instead. Or better properly +// use OpenSSL's ability to attach application data to an SSL/SSL_CTX +// and extract it in a callback. See how it's done, for example, in PSK +// callback or in DTLS verification callback. struct QSslErrorList { QMutex mutex; @@ -280,7 +424,7 @@ long QSslSocketBackendPrivate::setupOpenSslOptions(QSsl::SslProtocol protocol, Q { long options; if (protocol == QSsl::TlsV1SslV3) - options = SSL_OP_ALL|SSL_OP_NO_SSLv2; + options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3; else if (protocol == QSsl::SecureProtocols) options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3; else if (protocol == QSsl::TlsV1_0OrLater) @@ -357,7 +501,7 @@ bool QSslSocketBackendPrivate::initSslContext() if (configuration.protocol != QSsl::SslV2 && configuration.protocol != QSsl::SslV3 && configuration.protocol != QSsl::UnknownProtocol && - mode == QSslSocket::SslClientMode && QSslSocket::sslLibraryVersionNumber() >= 0x00090806fL) { + mode == QSslSocket::SslClientMode) { // Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format. QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName; if (tlsHostName.isEmpty()) @@ -412,6 +556,40 @@ bool QSslSocketBackendPrivate::initSslContext() } #endif +#if QT_CONFIG(ocsp) + if (configuration.ocspStaplingEnabled) { + if (mode == QSslSocket::SslServerMode) { + setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError, + QSslSocket::tr("Server-side QSslSocket does not support OCSP stapling")); + return false; + } + if (q_SSL_set_tlsext_status_type(ssl, TLSEXT_STATUSTYPE_ocsp) != 1) { + setErrorAndEmit(QAbstractSocket::SslInternalError, + QSslSocket::tr("Failed to enable OCSP stapling")); + return false; + } + } + + ocspResponseDer.clear(); + auto responsePos = configuration.backendConfig.find("Qt-OCSP-response"); + if (responsePos != configuration.backendConfig.end()) { + // This is our private, undocumented 'API' we use for the auto-testing of + // OCSP-stapling. It must be a der-encoded OCSP response, presumably set + // by tst_QOcsp. + const QVariant data(responsePos.value()); + if (data.canConvert<QByteArray>()) + ocspResponseDer = data.toByteArray(); + } + + if (ocspResponseDer.size()) { + if (mode != QSslSocket::SslServerMode) { + setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError, + QSslSocket::tr("Client-side sockets do not send OCSP responses")); + return false; + } + } +#endif // ocsp + return true; } @@ -552,22 +730,20 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() #endif QList<QSslCertificate> systemCerts; #if defined(Q_OS_WIN) - if (ptrCertOpenSystemStoreW && ptrCertFindCertificateInStore && ptrCertCloseStore) { - HCERTSTORE hSystemStore; - hSystemStore = ptrCertOpenSystemStoreW(0, L"ROOT"); - if (hSystemStore) { - PCCERT_CONTEXT pc = nullptr; - while (1) { - pc = ptrCertFindCertificateInStore(hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, nullptr, pc); - if (!pc) - break; - QByteArray der(reinterpret_cast<const char *>(pc->pbCertEncoded), - static_cast<int>(pc->cbCertEncoded)); - QSslCertificate cert(der, QSsl::Der); - systemCerts.append(cert); - } - ptrCertCloseStore(hSystemStore, 0); + HCERTSTORE hSystemStore; + hSystemStore = CertOpenSystemStoreW(0, L"ROOT"); + if (hSystemStore) { + PCCERT_CONTEXT pc = nullptr; + while (1) { + pc = CertFindCertificateInStore(hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, nullptr, pc); + if (!pc) + break; + QByteArray der(reinterpret_cast<const char *>(pc->pbCertEncoded), + static_cast<int>(pc->cbCertEncoded)); + QSslCertificate cert(der, QSsl::Der); + systemCerts.append(cert); } + CertCloseStore(hSystemStore, 0); } #elif defined(Q_OS_UNIX) QSet<QString> certFiles; @@ -1005,9 +1181,33 @@ bool QSslSocketBackendPrivate::startHandshake() } } - bool doVerifyPeer = configuration.peerVerifyMode == QSslSocket::VerifyPeer - || (configuration.peerVerifyMode == QSslSocket::AutoVerifyPeer - && mode == QSslSocket::SslClientMode); + const bool doVerifyPeer = configuration.peerVerifyMode == QSslSocket::VerifyPeer + || (configuration.peerVerifyMode == QSslSocket::AutoVerifyPeer + && mode == QSslSocket::SslClientMode); + +#if QT_CONFIG(ocsp) + // For now it's always QSslSocket::SslClientMode - initSslContext() will bail out early, + // if it's enabled in QSslSocket::SslServerMode. This can change. + if (!configuration.peerCertificate.isNull() && configuration.ocspStaplingEnabled && doVerifyPeer) { + if (!checkOcspStatus()) { + if (ocspErrors.isEmpty()) { + { + const ScopedBool bg(inSetAndEmitError, true); + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, ocspErrorDescription); + } + q->abort(); + return false; + } + + for (const QSslError &error : ocspErrors) { + errors << error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + } + } +#endif // ocsp // Check the peer certificate itself. First try the subject's common name // (CN) as a wildcard, then try all alternate subject name DNS entries the @@ -1254,6 +1454,193 @@ void QSslSocketBackendPrivate::_q_caRootLoaded(QSslCertificate cert, QSslCertifi #endif +#if QT_CONFIG(ocsp) + +bool QSslSocketBackendPrivate::checkOcspStatus() +{ + Q_ASSERT(ssl); + Q_ASSERT(mode == QSslSocket::SslClientMode); // See initSslContext() for SslServerMode + Q_ASSERT(configuration.peerVerifyMode != QSslSocket::VerifyNone); + + ocspResponses.clear(); + ocspErrorDescription.clear(); + ocspErrors.clear(); + + const unsigned char *responseData = nullptr; + const long responseLength = q_SSL_get_tlsext_status_ocsp_resp(ssl, &responseData); + if (responseLength <= 0 || !responseData) { + ocspErrors.push_back(QSslError::OcspNoResponseFound); + return false; + } + + OCSP_RESPONSE *response = q_d2i_OCSP_RESPONSE(nullptr, &responseData, responseLength); + if (!response) { + // Treat this as a fatal SslHandshakeError. + ocspErrorDescription = QSslSocket::tr("Failed to decode OCSP response"); + return false; + } + const QSharedPointer<OCSP_RESPONSE> responseGuard(response, q_OCSP_RESPONSE_free); + + const int ocspStatus = q_OCSP_response_status(response); + if (ocspStatus != OCSP_RESPONSE_STATUS_SUCCESSFUL) { + // It's not a definitive response, it's an error message (not signed by the responder). + ocspErrors.push_back(qt_OCSP_response_status_to_QSslError(ocspStatus)); + return false; + } + + OCSP_BASICRESP *basicResponse = q_OCSP_response_get1_basic(response); + if (!basicResponse) { + // SslHandshakeError. + ocspErrorDescription = QSslSocket::tr("Failed to extract basic OCSP response"); + return false; + } + const QSharedPointer<OCSP_BASICRESP> basicResponseGuard(basicResponse, q_OCSP_BASICRESP_free); + + SSL_CTX *ctx = q_SSL_get_SSL_CTX(ssl); // Does not increment refcount. + Q_ASSERT(ctx); + X509_STORE *store = q_SSL_CTX_get_cert_store(ctx); // Does not increment refcount. + if (!store) { + // SslHandshakeError. + ocspErrorDescription = QSslSocket::tr("No certificate verification store, cannot verify OCSP response"); + return false; + } + + STACK_OF(X509) *peerChain = q_SSL_get_peer_cert_chain(ssl); // Does not increment refcount. + X509 *peerX509 = q_SSL_get_peer_certificate(ssl); + Q_ASSERT(peerChain || peerX509); + const QSharedPointer<X509> peerX509Guard(peerX509, q_X509_free); + // OCSP_basic_verify with 0 as verificationFlags: + // + // 0) Tries to find the OCSP responder's certificate in either peerChain + // or basicResponse->certs. If not found, verification fails. + // 1) It checks the signature using the responder's public key. + // 2) Then it tries to validate the responder's cert (building a chain + // etc.) + // 3) It checks CertID in response. + // 4) Ensures the responder is authorized to sign the status respond. + // + // Here it's important to notice that it calls X509_cert_verify and + // as a result, possibly, our verification callback. Given this callback + // at the moment uses a global variable, we have to lock. This will change + // as soon as we fix our verification procedure. + // Also note, OpenSSL prior to 1.0.2b would only use bs->certs to + // verify the responder's chain (see their commit 4ba9a4265bd). + // Working this around - is too much fuss for ancient versions we + // are dropping quite soon anyway. + { + const unsigned long verificationFlags = 0; + const QMutexLocker locker(&_q_sslErrorList()->mutex); + // Before unlocking the mutex, startHandshake() stores errors (found in SSL_connect() + // or SSL_accept()) into the local variable, so it's safe to clear it here - as soon + // as we managed to lock, whoever had the lock before, already stored their own copy + // of errors. + _q_sslErrorList()->errors.clear(); + const int success = q_OCSP_basic_verify(basicResponse, peerChain, store, verificationFlags); + if (success <= 0 || _q_sslErrorList()->errors.size()) { + _q_sslErrorList()->errors.clear(); + ocspErrors.push_back(QSslError::OcspResponseCannotBeTrusted); + } + } + + if (q_OCSP_resp_count(basicResponse) != 1) { + ocspErrors.push_back(QSslError::OcspMalformedResponse); + return false; + } + + OCSP_SINGLERESP *singleResponse = q_OCSP_resp_get0(basicResponse, 0); + if (!singleResponse) { + ocspErrors.clear(); + // A fatal problem -> SslHandshakeError. + ocspErrorDescription = QSslSocket::tr("Failed to decode a SingleResponse from OCSP status response"); + return false; + } + + // Let's make sure the response is for the correct certificate - we + // can re-create this CertID using our peer's certificate and its + // issuer's public key. + ocspResponses.push_back(QOcspResponse()); + QOcspResponsePrivate *dResponse = ocspResponses.back().d.data(); + dResponse->subjectCert = configuration.peerCertificate; + bool matchFound = false; + if (configuration.peerCertificate.isSelfSigned()) { + dResponse->signerCert = configuration.peerCertificate; + matchFound = qt_OCSP_certificate_match(singleResponse, peerX509, peerX509); + } else { + const STACK_OF(X509) *certs = q_SSL_get_peer_cert_chain(ssl); + if (!certs) // Oh, what a cataclysm! Last try: + certs = q_OCSP_resp_get0_certs(basicResponse); + if (certs) { + // It could be the first certificate in 'certs' is our peer's + // certificate. Since it was not captured by the 'self-signed' branch + // above, the CertID will not match and we'll just iterate on to the + // next certificate. So we start from 0, not 1. + for (int i = 0, e = q_sk_X509_num(certs); i < e; ++i) { + X509 *issuer = q_sk_X509_value(certs, i); + matchFound = qt_OCSP_certificate_match(singleResponse, peerX509, issuer); + if (matchFound) { + if (q_X509_check_issued(issuer, peerX509) == X509_V_OK) { + dResponse->signerCert = QSslCertificatePrivate::QSslCertificate_from_X509(issuer); + break; + } + matchFound = false; + } + } + } + } + + if (!matchFound) { + dResponse->signerCert.clear(); + ocspErrors.push_back({QSslError::OcspResponseCertIdUnknown, configuration.peerCertificate}); + } + + // Check if the response is valid time-wise: + ASN1_GENERALIZEDTIME *revTime = nullptr; + ASN1_GENERALIZEDTIME *thisUpdate = nullptr; + ASN1_GENERALIZEDTIME *nextUpdate = nullptr; + int reason; + const int certStatus = q_OCSP_single_get0_status(singleResponse, &reason, &revTime, &thisUpdate, &nextUpdate); + if (!thisUpdate) { + // This is unexpected, treat as SslHandshakeError, OCSP_check_validity assumes this pointer + // to be != nullptr. + ocspErrors.clear(); + ocspResponses.clear(); + ocspErrorDescription = QSslSocket::tr("Failed to extract 'this update time' from the SingleResponse"); + return false; + } + + // OCSP_check_validity(this, next, nsec, maxsec) does this check: + // this <= now <= next. They allow some freedom to account + // for delays/time inaccuracy. + // this > now + nsec ? -> NOT_YET_VALID + // if maxsec >= 0: + // now - maxsec > this ? -> TOO_OLD + // now - nsec > next ? -> EXPIRED + // next < this ? -> NEXT_BEFORE_THIS + // OK. + if (!q_OCSP_check_validity(thisUpdate, nextUpdate, 60, -1)) + ocspErrors.push_back({QSslError::OcspResponseExpired, configuration.peerCertificate}); + + // And finally, the status: + switch (certStatus) { + case V_OCSP_CERTSTATUS_GOOD: + // This certificate was not found among the revoked ones. + dResponse->certificateStatus = OcspCertificateStatus::Good; + break; + case V_OCSP_CERTSTATUS_REVOKED: + dResponse->certificateStatus = OcspCertificateStatus::Revoked; + dResponse->revocationReason = qt_OCSP_revocation_reason(reason); + ocspErrors.push_back({QSslError::CertificateRevoked, configuration.peerCertificate}); + break; + case V_OCSP_CERTSTATUS_UNKNOWN: + dResponse->certificateStatus = OcspCertificateStatus::Unknown; + ocspErrors.push_back({QSslError::OcspStatusUnknown, configuration.peerCertificate}); + } + + return !ocspErrors.size(); +} + +#endif // ocsp + void QSslSocketBackendPrivate::disconnectFromHost() { if (ssl) { diff --git a/src/network/ssl/qsslsocket_openssl11.cpp b/src/network/ssl/qsslsocket_openssl11.cpp index 2a2667bd48..b60b8be41f 100644 --- a/src/network/ssl/qsslsocket_openssl11.cpp +++ b/src/network/ssl/qsslsocket_openssl11.cpp @@ -122,21 +122,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded() #if QT_CONFIG(library) //load symbols needed to receive certificates from system store -#if defined(Q_OS_WIN) - HINSTANCE hLib = LoadLibraryW(L"Crypt32"); - if (hLib) { - ptrCertOpenSystemStoreW = reinterpret_cast<PtrCertOpenSystemStoreW>( - reinterpret_cast<QFunctionPointer>(GetProcAddress(hLib, "CertOpenSystemStoreW"))); - ptrCertFindCertificateInStore = reinterpret_cast<PtrCertFindCertificateInStore>( - reinterpret_cast<QFunctionPointer>(GetProcAddress(hLib, "CertFindCertificateInStore"))); - ptrCertCloseStore = reinterpret_cast<PtrCertCloseStore>( - reinterpret_cast<QFunctionPointer>(GetProcAddress(hLib, "CertCloseStore"))); - if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) - qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen - } else { - qCWarning(lcSsl, "could not load crypt32 library"); // should never happen - } -#elif defined(Q_OS_QNX) +#if defined(Q_OS_QNX) s_loadRootCertsOnDemand = true; #elif defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h index fae007e12d..a44d00a830 100644 --- a/src/network/ssl/qsslsocket_openssl11_symbols_p.h +++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h @@ -84,12 +84,12 @@ int q_DSA_bits(DSA *a); int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); int q_EVP_PKEY_base_id(EVP_PKEY *a); int q_RSA_bits(RSA *a); -int q_OPENSSL_sk_num(OPENSSL_STACK *a); -void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); -OPENSSL_STACK *q_OPENSSL_sk_new_null(); -void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); -void q_OPENSSL_sk_free(OPENSSL_STACK *a); -void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); +Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); +Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); +Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); +Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); +Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); +Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); int q_SSL_session_reused(SSL *a); unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); @@ -102,6 +102,7 @@ const SSL_METHOD *q_TLS_server_method(); ASN1_TIME *q_X509_getm_notBefore(X509 *a); ASN1_TIME *q_X509_getm_notAfter(X509 *a); +Q_AUTOTEST_EXPORT void q_X509_up_ref(X509 *a); long q_X509_get_version(X509 *a); EVP_PKEY *q_X509_get_pubkey(X509 *a); void q_X509_STORE_set_verify_cb(X509_STORE *ctx, X509_STORE_CTX_verify_cb verify_cb); @@ -172,6 +173,10 @@ void q_BIO_set_init(BIO *a, int init); int q_BIO_get_shutdown(BIO *a); void q_BIO_set_shutdown(BIO *a, int shut); +#if QT_CONFIG(ocsp) +const OCSP_CERTID *q_OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP *x); +#endif // ocsp + #define q_SSL_CTX_set_min_proto_version(ctx, version) \ q_SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, nullptr) diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index c16b9d5f76..c23234e291 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -69,6 +69,9 @@ #include <QtNetwork/private/qtnetworkglobal_p.h> #include "qsslsocket_p.h" +#include <QtCore/qvector.h> +#include <QtCore/qstring.h> + #ifdef Q_OS_WIN #include <qt_windows.h> #if defined(OCSP_RESPONSE) @@ -152,6 +155,16 @@ public: void _q_caRootLoaded(QSslCertificate,QSslCertificate) override; #endif +#if QT_CONFIG(ocsp) + bool checkOcspStatus(); +#endif + + // This decription will go to setErrorAndEmit(SslHandshakeError, ocspErrorDescription) + QString ocspErrorDescription; + // These will go to sslErrors() + QVector<QSslError> ocspErrors; + QByteArray ocspResponseDer; + Q_AUTOTEST_EXPORT static long setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions); static QSslCipher QSslCipher_from_SSL_CIPHER(const SSL_CIPHER *cipher); static QList<QSslCertificate> STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509); diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 299df6b685..aa1dc681e0 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -172,6 +172,7 @@ DEFINEFUNC2(unsigned long, SSL_set_options, SSL *ssl, ssl, unsigned long op, op, DEFINEFUNC(const SSL_METHOD *, TLS_method, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return nullptr, return) +DEFINEFUNC(void, X509_up_ref, X509 *a, a, return, DUMMYARG) DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *a, a, return nullptr, return) DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *a, a, return nullptr, return) DEFINEFUNC(long, X509_get_version, X509 *a, a, return -1, return) @@ -199,6 +200,35 @@ DEFINEFUNC2(int, BIO_meth_set_create, BIO_METHOD *biom, biom, DgramCreateCallbac DEFINEFUNC2(int, BIO_meth_set_destroy, BIO_METHOD *biom, biom, DgramDestroyCallback dtr, dtr, return 0, return) #endif // dtls +#if QT_CONFIG(ocsp) +DEFINEFUNC(const OCSP_CERTID *, OCSP_SINGLERESP_get0_id, const OCSP_SINGLERESP *x, x, return nullptr, return) +DEFINEFUNC3(OCSP_RESPONSE *, d2i_OCSP_RESPONSE, OCSP_RESPONSE **a, a, const unsigned char **in, in, long len, len, return nullptr, return) +DEFINEFUNC(void, OCSP_RESPONSE_free, OCSP_RESPONSE *rs, rs, return, DUMMYARG) +DEFINEFUNC(OCSP_BASICRESP *, OCSP_response_get1_basic, OCSP_RESPONSE *resp, resp, return nullptr, return) +DEFINEFUNC(void, OCSP_BASICRESP_free, OCSP_BASICRESP *bs, bs, return, DUMMYARG) +DEFINEFUNC(int, OCSP_response_status, OCSP_RESPONSE *resp, resp, return OCSP_RESPONSE_STATUS_INTERNALERROR, return) +DEFINEFUNC4(int, OCSP_basic_verify, OCSP_BASICRESP *bs, bs, STACK_OF(X509) *certs, certs, X509_STORE *st, st, unsigned long flags, flags, return -1, return) +DEFINEFUNC(int, OCSP_resp_count, OCSP_BASICRESP *bs, bs, return 0, return) +DEFINEFUNC2(OCSP_SINGLERESP *, OCSP_resp_get0, OCSP_BASICRESP *bs, bs, int idx, idx, return nullptr, return) +DEFINEFUNC5(int, OCSP_single_get0_status, OCSP_SINGLERESP *single, single, int *reason, reason, ASN1_GENERALIZEDTIME **revtime, revtime, + ASN1_GENERALIZEDTIME **thisupd, thisupd, ASN1_GENERALIZEDTIME **nextupd, nextupd, return -1, return) +DEFINEFUNC4(int, OCSP_check_validity, ASN1_GENERALIZEDTIME *thisupd, thisupd, ASN1_GENERALIZEDTIME *nextupd, nextupd, long nsec, nsec, long maxsec, maxsec, return 0, return) +DEFINEFUNC3(OCSP_CERTID *, OCSP_cert_to_id, const EVP_MD *dgst, dgst, X509 *subject, subject, X509 *issuer, issuer, return nullptr, return) +DEFINEFUNC(void, OCSP_CERTID_free, OCSP_CERTID *cid, cid, return, DUMMYARG) +DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, ASN1_OBJECT **pmd, pmd, + ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, + return 0, return) +DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) +DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return) +DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) +DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, + int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) +DEFINEFUNC(OCSP_BASICRESP *, OCSP_BASICRESP_new, DUMMYARG, DUMMYARG, return nullptr, return) +DEFINEFUNC2(int, i2d_OCSP_RESPONSE, OCSP_RESPONSE *r, r, unsigned char **ppout, ppout, return 0, return) +DEFINEFUNC6(int, OCSP_basic_sign, OCSP_BASICRESP *br, br, X509 *signer, signer, EVP_PKEY *key, key, + const EVP_MD *dg, dg, STACK_OF(X509) *cs, cs, unsigned long flags, flags, return 0, return) +#endif // ocsp + DEFINEFUNC2(void, BIO_set_data, BIO *a, a, void *ptr, ptr, return, DUMMYARG) DEFINEFUNC(void *, BIO_get_data, BIO *a, a, return nullptr, return) DEFINEFUNC2(void, BIO_set_init, BIO *a, a, int init, init, return, DUMMYARG) @@ -235,17 +265,10 @@ DEFINEFUNC6(void *, PEM_ASN1_write_bio, d2i_of_void *a, a, const char *b, b, BIO DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) -#else -DEFINEFUNC(STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) -DEFINEFUNC2(void, sk_push, STACK *a, a, char *b, b, return, DUMMYARG) -DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) -DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return nullptr, return) -#endif // OPENSSL_VERSION_NUMBER >= 0x10000000L DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) @@ -254,49 +277,18 @@ DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) DEFINEFUNC5(int, SSL_get_ex_new_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) #endif // OPENSSL_VERSION_NUMBER >= 0x10001000L -#if OPENSSL_VERSION_NUMBER >= 0x10000000L -#ifndef OPENSSL_NO_SSL2 -DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return nullptr, return) #if OPENSSL_VERSION_NUMBER >= 0x10001000L DEFINEFUNC(const SSL_METHOD *, TLSv1_1_client_method, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(const SSL_METHOD *, TLSv1_2_client_method, DUMMYARG, DUMMYARG, return nullptr, return) #endif -#ifndef OPENSSL_NO_SSL2 -DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return nullptr, return) #if OPENSSL_VERSION_NUMBER >= 0x10001000L DEFINEFUNC(const SSL_METHOD *, TLSv1_1_server_method, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(const SSL_METHOD *, TLSv1_2_server_method, DUMMYARG, DUMMYARG, return nullptr, return) #endif -#else -#ifndef OPENSSL_NO_SSL2 -DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif -DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return nullptr, return) -DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return nullptr, return) -#ifndef OPENSSL_NO_SSL2 -DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif -DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return nullptr, return) -DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return nullptr, return) -#endif DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return nullptr, return) @@ -329,6 +321,7 @@ DEFINEFUNC(const char *, SSLeay_version, int a, a, return nullptr, return) #endif // QT_CONFIG(opensslv11) DEFINEFUNC(long, ASN1_INTEGER_get, ASN1_INTEGER *a, a, return 0, return) +DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return) DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) @@ -357,6 +350,7 @@ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *typ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return) DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return) +DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return) #ifndef OPENSSL_NO_DES DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(const EVP_CIPHER *, EVP_des_ede3_cbc, DUMMYARG, DUMMYARG, return nullptr, return) @@ -368,12 +362,14 @@ DEFINEFUNC(const EVP_MD *, EVP_sha1, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC3(int, EVP_PKEY_assign, EVP_PKEY *a, a, int b, b, char *c, c, return -1, return) DEFINEFUNC2(int, EVP_PKEY_set1_RSA, EVP_PKEY *a, a, RSA *b, b, return -1, return) DEFINEFUNC2(int, EVP_PKEY_set1_DSA, EVP_PKEY *a, a, DSA *b, b, return -1, return) +DEFINEFUNC2(int, EVP_PKEY_set1_DH, EVP_PKEY *a, a, DH *b, b, return -1, return) #ifndef OPENSSL_NO_EC DEFINEFUNC2(int, EVP_PKEY_set1_EC_KEY, EVP_PKEY *a, a, EC_KEY *b, b, return -1, return) #endif DEFINEFUNC(void, EVP_PKEY_free, EVP_PKEY *a, a, return, DUMMYARG) DEFINEFUNC(DSA *, EVP_PKEY_get1_DSA, EVP_PKEY *a, a, return nullptr, return) DEFINEFUNC(RSA *, EVP_PKEY_get1_RSA, EVP_PKEY *a, a, return nullptr, return) +DEFINEFUNC(DH *, EVP_PKEY_get1_DH, EVP_PKEY *a, a, return nullptr, return) #ifndef OPENSSL_NO_EC DEFINEFUNC(EC_KEY *, EVP_PKEY_get1_EC_KEY, EVP_PKEY *a, a, return nullptr, return) #endif @@ -399,6 +395,7 @@ DEFINEFUNC4(EC_KEY *, PEM_read_bio_ECPrivateKey, BIO *a, a, EC_KEY **b, b, pem_p DEFINEFUNC4(DH *, PEM_read_bio_DHparams, BIO *a, a, DH **b, b, pem_password_cb *c, c, void *d, d, return nullptr, return) DEFINEFUNC7(int, PEM_write_bio_DSAPrivateKey, BIO *a, a, DSA *b, b, const EVP_CIPHER *c, c, unsigned char *d, d, int e, e, pem_password_cb *f, f, void *g, g, return 0, return) DEFINEFUNC7(int, PEM_write_bio_RSAPrivateKey, BIO *a, a, RSA *b, b, const EVP_CIPHER *c, c, unsigned char *d, d, int e, e, pem_password_cb *f, f, void *g, g, return 0, return) +DEFINEFUNC7(int, PEM_write_bio_PrivateKey, BIO *a, a, EVP_PKEY *b, b, const EVP_CIPHER *c, c, unsigned char *d, d, int e, e, pem_password_cb *f, f, void *g, g, return 0, return) #ifndef OPENSSL_NO_EC DEFINEFUNC7(int, PEM_write_bio_ECPrivateKey, BIO *a, a, EC_KEY *b, b, const EVP_CIPHER *c, c, unsigned char *d, d, int e, e, pem_password_cb *f, f, void *g, g, return 0, return) #endif @@ -411,6 +408,7 @@ DEFINEFUNC4(EC_KEY *, PEM_read_bio_EC_PUBKEY, BIO *a, a, EC_KEY **b, b, pem_pass #endif DEFINEFUNC2(int, PEM_write_bio_DSA_PUBKEY, BIO *a, a, DSA *b, b, return 0, return) DEFINEFUNC2(int, PEM_write_bio_RSA_PUBKEY, BIO *a, a, RSA *b, b, return 0, return) +DEFINEFUNC2(int, PEM_write_bio_PUBKEY, BIO *a, a, EVP_PKEY *b, b, return 0, return) #ifndef OPENSSL_NO_EC DEFINEFUNC2(int, PEM_write_bio_EC_PUBKEY, BIO *a, a, EC_KEY *b, b, return 0, return) #endif @@ -428,12 +426,9 @@ DEFINEFUNC(int, SSL_connect, SSL *a, a, return -1, return) DEFINEFUNC(int, SSL_CTX_check_private_key, const SSL_CTX *a, a, return -1, return) DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(void, SSL_CTX_free, SSL_CTX *a, a, return, DUMMYARG) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L DEFINEFUNC(SSL_CTX *, SSL_CTX_new, const SSL_METHOD *a, a, return nullptr, return) -#else -DEFINEFUNC(SSL_CTX *, SSL_CTX_new, SSL_METHOD *a, a, return nullptr, return) -#endif DEFINEFUNC2(int, SSL_CTX_set_cipher_list, SSL_CTX *a, a, const char *b, b, return -1, return) +DEFINEFUNC3(long, SSL_CTX_callback_ctrl, SSL_CTX *ctx, ctx, int dst, dst, GenericCallbackType cb, cb, return 0, return) DEFINEFUNC(int, SSL_CTX_set_default_verify_paths, SSL_CTX *a, a, return -1, return) DEFINEFUNC3(void, SSL_CTX_set_verify, SSL_CTX *a, a, int b, b, int (*c)(int, X509_STORE_CTX *), c, return, DUMMYARG) DEFINEFUNC2(void, SSL_CTX_set_verify_depth, SSL_CTX *a, a, int b, b, return, DUMMYARG) @@ -453,22 +448,14 @@ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char #endif DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -#else -DEFINEFUNC(SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -#endif DEFINEFUNC(int, SSL_version, const SSL *a, a, return 0, return) DEFINEFUNC2(int, SSL_get_error, SSL *a, a, int b, b, return -1, return) DEFINEFUNC(STACK_OF(X509) *, SSL_get_peer_cert_chain, SSL *a, a, return nullptr, return) DEFINEFUNC(X509 *, SSL_get_peer_certificate, SSL *a, a, return nullptr, return) -#if OPENSSL_VERSION_NUMBER >= 0x00908000L -// 0.9.8 broke SC and BC by changing this function's signature. DEFINEFUNC(long, SSL_get_verify_result, const SSL *a, a, return -1, return) -#else -DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return) -#endif DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return nullptr, return) +DEFINEFUNC(SSL_CTX *, SSL_get_SSL_CTX, SSL *a, a, return nullptr, return) DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return) DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, BIO *c, c, return, DUMMYARG) @@ -498,6 +485,9 @@ DEFINEFUNC(X509 *, X509_dup, X509 *a, a, return nullptr, return) DEFINEFUNC2(void, X509_print, BIO *a, a, X509 *b, b, return, DUMMYARG); DEFINEFUNC(ASN1_OBJECT *, X509_EXTENSION_get_object, X509_EXTENSION *a, a, return nullptr, return) DEFINEFUNC(void, X509_free, X509 *a, a, return, DUMMYARG) +//Q_AUTOTEST_EXPORT ASN1_TIME *q_X509_gmtime_adj(ASN1_TIME *s, long adj); +DEFINEFUNC2(ASN1_TIME *, X509_gmtime_adj, ASN1_TIME *s, s, long adj, adj, return nullptr, return) +DEFINEFUNC(void, ASN1_TIME_free, ASN1_TIME *t, t, return, DUMMYARG) DEFINEFUNC2(X509_EXTENSION *, X509_get_ext, X509 *a, a, int b, b, return nullptr, return) DEFINEFUNC(int, X509_get_ext_count, X509 *a, a, return 0, return) DEFINEFUNC4(void *, X509_get_ext_d2i, X509 *a, a, int b, b, int *c, c, int *d, d, return nullptr, return) @@ -508,11 +498,7 @@ DEFINEFUNC(ASN1_OCTET_STRING *, X509_EXTENSION_get_data, X509_EXTENSION *a, a, r DEFINEFUNC(void, BASIC_CONSTRAINTS_free, BASIC_CONSTRAINTS *a, a, return, DUMMYARG) DEFINEFUNC(void, AUTHORITY_KEYID_free, AUTHORITY_KEYID *a, a, return, DUMMYARG) DEFINEFUNC(void, GENERAL_NAME_free, GENERAL_NAME *a, a, return, DUMMYARG) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L DEFINEFUNC2(int, ASN1_STRING_print, BIO *a, a, const ASN1_STRING *b, b, return 0, return) -#else -DEFINEFUNC2(int, ASN1_STRING_print, BIO *a, a, ASN1_STRING *b, b, return 0, return) -#endif DEFINEFUNC2(int, X509_check_issued, X509 *a, a, X509 *b, b, return -1, return) DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return nullptr, return) DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return nullptr, return) @@ -577,6 +563,7 @@ DEFINEFUNC2(void, BIO_clear_flags, BIO *b, b, int flags, flags, return, DUMMYARG DEFINEFUNC2(void *, BIO_get_ex_data, BIO *b, b, int idx, idx, return nullptr, return) DEFINEFUNC3(int, BIO_set_ex_data, BIO *b, b, int idx, idx, void *data, data, return -1, return) +DEFINEFUNC3(void *, CRYPTO_malloc, size_t num, num, const char *file, file, int line, line, return nullptr, return) DEFINEFUNC(DH *, DH_new, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC(void, DH_free, DH *dh, dh, return, DUMMYARG) DEFINEFUNC3(DH *, d2i_DHparams, DH**a, a, const unsigned char **pp, pp, long length, length, return nullptr, return) @@ -990,6 +977,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(TLS_method) RESOLVEFUNC(TLS_client_method) RESOLVEFUNC(TLS_server_method) + RESOLVEFUNC(X509_up_ref) RESOLVEFUNC(X509_STORE_CTX_get0_chain) RESOLVEFUNC(X509_getm_notBefore) RESOLVEFUNC(X509_getm_notAfter) @@ -1025,7 +1013,30 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(BIO_meth_set_create) RESOLVEFUNC(BIO_meth_set_destroy) #endif // dtls - +#if QT_CONFIG(ocsp) + RESOLVEFUNC(OCSP_SINGLERESP_get0_id) + RESOLVEFUNC(d2i_OCSP_RESPONSE) + RESOLVEFUNC(OCSP_RESPONSE_free) + RESOLVEFUNC(OCSP_response_status) + RESOLVEFUNC(OCSP_response_get1_basic) + RESOLVEFUNC(OCSP_BASICRESP_free) + RESOLVEFUNC(OCSP_basic_verify) + RESOLVEFUNC(OCSP_resp_count) + RESOLVEFUNC(OCSP_resp_get0) + RESOLVEFUNC(OCSP_single_get0_status) + RESOLVEFUNC(OCSP_check_validity) + RESOLVEFUNC(OCSP_cert_to_id) + RESOLVEFUNC(OCSP_id_get0_info) + RESOLVEFUNC(OCSP_resp_get0_certs) + RESOLVEFUNC(OCSP_basic_sign) + RESOLVEFUNC(OCSP_response_create) + RESOLVEFUNC(i2d_OCSP_RESPONSE) + RESOLVEFUNC(OCSP_basic_add1_status) + RESOLVEFUNC(OCSP_BASICRESP_new) + RESOLVEFUNC(OCSP_CERTID_free) + RESOLVEFUNC(OCSP_cert_to_id) + RESOLVEFUNC(OCSP_id_cmp) +#endif // ocsp RESOLVEFUNC(BIO_set_data) RESOLVEFUNC(BIO_get_data) RESOLVEFUNC(BIO_set_init) @@ -1064,24 +1075,12 @@ bool q_resolveOpenSslSymbols() #if OPENSSL_VERSION_NUMBER >= 0x10001000L RESOLVEFUNC(SSL_get_ex_new_index) #endif -#ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_client_method) -#endif -#ifndef OPENSSL_NO_SSL3_METHOD - RESOLVEFUNC(SSLv3_client_method) -#endif RESOLVEFUNC(SSLv23_client_method) RESOLVEFUNC(TLSv1_client_method) #if OPENSSL_VERSION_NUMBER >= 0x10001000L RESOLVEFUNC(TLSv1_1_client_method) RESOLVEFUNC(TLSv1_2_client_method) #endif -#ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_server_method) -#endif -#ifndef OPENSSL_NO_SSL3_METHOD - RESOLVEFUNC(SSLv3_server_method) -#endif RESOLVEFUNC(SSLv23_server_method) RESOLVEFUNC(TLSv1_server_method) #if OPENSSL_VERSION_NUMBER >= 0x10001000L @@ -1132,6 +1131,7 @@ bool q_resolveOpenSslSymbols() #endif // !opensslv11 RESOLVEFUNC(ASN1_INTEGER_get) + RESOLVEFUNC(ASN1_INTEGER_cmp) RESOLVEFUNC(ASN1_STRING_length) RESOLVEFUNC(ASN1_STRING_to_UTF8) RESOLVEFUNC(BIO_ctrl) @@ -1168,6 +1168,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CipherInit_ex) RESOLVEFUNC(EVP_CipherUpdate) RESOLVEFUNC(EVP_CipherFinal) + RESOLVEFUNC(EVP_get_digestbyname) #ifndef OPENSSL_NO_DES RESOLVEFUNC(EVP_des_cbc) RESOLVEFUNC(EVP_des_ede3_cbc) @@ -1179,12 +1180,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_PKEY_assign) RESOLVEFUNC(EVP_PKEY_set1_RSA) RESOLVEFUNC(EVP_PKEY_set1_DSA) + RESOLVEFUNC(EVP_PKEY_set1_DH) #ifndef OPENSSL_NO_EC RESOLVEFUNC(EVP_PKEY_set1_EC_KEY) #endif RESOLVEFUNC(EVP_PKEY_free) RESOLVEFUNC(EVP_PKEY_get1_DSA) RESOLVEFUNC(EVP_PKEY_get1_RSA) + RESOLVEFUNC(EVP_PKEY_get1_DH) #ifndef OPENSSL_NO_EC RESOLVEFUNC(EVP_PKEY_get1_EC_KEY) #endif @@ -1208,6 +1211,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(PEM_read_bio_DHparams) RESOLVEFUNC(PEM_write_bio_DSAPrivateKey) RESOLVEFUNC(PEM_write_bio_RSAPrivateKey) + RESOLVEFUNC(PEM_write_bio_PrivateKey) #ifndef OPENSSL_NO_EC RESOLVEFUNC(PEM_write_bio_ECPrivateKey) #endif @@ -1221,6 +1225,7 @@ bool q_resolveOpenSslSymbols() #endif RESOLVEFUNC(PEM_write_bio_DSA_PUBKEY) RESOLVEFUNC(PEM_write_bio_RSA_PUBKEY) + RESOLVEFUNC(PEM_write_bio_PUBKEY) #ifndef OPENSSL_NO_EC RESOLVEFUNC(PEM_write_bio_EC_PUBKEY) #endif @@ -1237,6 +1242,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_free) RESOLVEFUNC(SSL_CTX_new) RESOLVEFUNC(SSL_CTX_set_cipher_list) + RESOLVEFUNC(SSL_CTX_callback_ctrl) RESOLVEFUNC(SSL_CTX_set_default_verify_paths) RESOLVEFUNC(SSL_CTX_set_verify) RESOLVEFUNC(SSL_CTX_set_verify_depth) @@ -1266,6 +1272,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_get_peer_certificate) RESOLVEFUNC(SSL_get_verify_result) RESOLVEFUNC(SSL_new) + RESOLVEFUNC(SSL_get_SSL_CTX) RESOLVEFUNC(SSL_ctrl) RESOLVEFUNC(SSL_read) RESOLVEFUNC(SSL_set_accept_state) @@ -1313,6 +1320,8 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(X509_digest) RESOLVEFUNC(X509_EXTENSION_get_object) RESOLVEFUNC(X509_free) + RESOLVEFUNC(X509_gmtime_adj) + RESOLVEFUNC(ASN1_TIME_free) RESOLVEFUNC(X509_get_ext) RESOLVEFUNC(X509_get_ext_count) RESOLVEFUNC(X509_get_ext_d2i) @@ -1350,6 +1359,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(DTLS_server_method) RESOLVEFUNC(DTLS_client_method) #endif // dtls + RESOLVEFUNC(CRYPTO_malloc) RESOLVEFUNC(DH_new) RESOLVEFUNC(DH_free) RESOLVEFUNC(d2i_DHparams) diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h index bfdfbf0efc..e09820b2f2 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -72,6 +72,10 @@ #include "qsslsocket_openssl_p.h" #include <QtCore/qglobal.h> +#if QT_CONFIG(ocsp) +#include "qocsp_p.h" +#endif + QT_BEGIN_NAMESPACE #define DUMMYARG @@ -224,6 +228,7 @@ QT_BEGIN_NAMESPACE bool q_resolveOpenSslSymbols(); long q_ASN1_INTEGER_get(ASN1_INTEGER *a); +int q_ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y); int q_ASN1_STRING_length(ASN1_STRING *a); int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b); long q_BIO_ctrl(BIO *a, int b, long c, void *d); @@ -267,6 +272,8 @@ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc); int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl); int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); +const EVP_MD *q_EVP_get_digestbyname(const char *name); + #ifndef OPENSSL_NO_DES const EVP_CIPHER *q_EVP_des_cbc(); const EVP_CIPHER *q_EVP_des_ede3_cbc(); @@ -274,16 +281,18 @@ const EVP_CIPHER *q_EVP_des_ede3_cbc(); #ifndef OPENSSL_NO_RC2 const EVP_CIPHER *q_EVP_rc2_cbc(); #endif -const EVP_MD *q_EVP_sha1(); +Q_AUTOTEST_EXPORT const EVP_MD *q_EVP_sha1(); int q_EVP_PKEY_assign(EVP_PKEY *a, int b, char *c); Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_RSA(EVP_PKEY *a, RSA *b); int q_EVP_PKEY_set1_DSA(EVP_PKEY *a, DSA *b); +int q_EVP_PKEY_set1_DH(EVP_PKEY *a, DH *b); #ifndef OPENSSL_NO_EC int q_EVP_PKEY_set1_EC_KEY(EVP_PKEY *a, EC_KEY *b); #endif -void q_EVP_PKEY_free(EVP_PKEY *a); +Q_AUTOTEST_EXPORT void q_EVP_PKEY_free(EVP_PKEY *a); RSA *q_EVP_PKEY_get1_RSA(EVP_PKEY *a); DSA *q_EVP_PKEY_get1_DSA(EVP_PKEY *a); +DH *q_EVP_PKEY_get1_DH(EVP_PKEY *a); #ifndef OPENSSL_NO_EC EC_KEY *q_EVP_PKEY_get1_EC_KEY(EVP_PKEY *a); #endif @@ -297,6 +306,7 @@ int q_OBJ_ln2nid(const char *s); int q_i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *obj); int q_OBJ_obj2txt(char *buf, int buf_len, ASN1_OBJECT *obj, int no_name); int q_OBJ_obj2nid(const ASN1_OBJECT *a); +#define q_EVP_get_digestbynid(a) q_EVP_get_digestbyname(q_OBJ_nid2sn(a)) #ifdef SSLEAY_MACROS // ### verify void *q_PEM_ASN1_read_bio(d2i_of_void *a, const char *b, BIO *c, void **d, pem_password_cb *e, @@ -314,6 +324,8 @@ int q_PEM_write_bio_DSAPrivateKey(BIO *a, DSA *b, const EVP_CIPHER *c, unsigned int e, pem_password_cb *f, void *g); int q_PEM_write_bio_RSAPrivateKey(BIO *a, RSA *b, const EVP_CIPHER *c, unsigned char *d, int e, pem_password_cb *f, void *g); +int q_PEM_write_bio_PrivateKey(BIO *a, EVP_PKEY *b, const EVP_CIPHER *c, unsigned char *d, + int e, pem_password_cb *f, void *g); #ifndef OPENSSL_NO_EC int q_PEM_write_bio_ECPrivateKey(BIO *a, EC_KEY *b, const EVP_CIPHER *c, unsigned char *d, int e, pem_password_cb *f, void *g); @@ -327,6 +339,7 @@ EC_KEY *q_PEM_read_bio_EC_PUBKEY(BIO *a, EC_KEY **b, pem_password_cb *c, void *d #endif int q_PEM_write_bio_DSA_PUBKEY(BIO *a, DSA *b); int q_PEM_write_bio_RSA_PUBKEY(BIO *a, RSA *b); +int q_PEM_write_bio_PUBKEY(BIO *a, EVP_PKEY *b); #ifndef OPENSSL_NO_EC int q_PEM_write_bio_EC_PUBKEY(BIO *a, EC_KEY *b); #endif @@ -344,15 +357,15 @@ int q_SSL_connect(SSL *a); int q_SSL_CTX_check_private_key(const SSL_CTX *a); long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d); void q_SSL_CTX_free(SSL_CTX *a); -#if OPENSSL_VERSION_NUMBER >= 0x10000000L SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a); -#else -SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a); -#endif int q_SSL_CTX_set_cipher_list(SSL_CTX *a, const char *b); int q_SSL_CTX_set_default_verify_paths(SSL_CTX *a); void q_SSL_CTX_set_verify(SSL_CTX *a, int b, int (*c)(int, X509_STORE_CTX *)); void q_SSL_CTX_set_verify_depth(SSL_CTX *a, int b); +extern "C" { +typedef void (*GenericCallbackType)(); +} +long q_SSL_CTX_callback_ctrl(SSL_CTX *, int, GenericCallbackType); int q_SSL_CTX_use_certificate(SSL_CTX *a, X509 *b); int q_SSL_CTX_use_certificate_file(SSL_CTX *a, const char *b, int c); int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); @@ -369,17 +382,14 @@ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); #endif void q_SSL_free(SSL *a); STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); -#if OPENSSL_VERSION_NUMBER >= 0x10000000L const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); -#else -SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); -#endif int q_SSL_version(const SSL *a); int q_SSL_get_error(SSL *a, int b); STACK_OF(X509) *q_SSL_get_peer_cert_chain(SSL *a); X509 *q_SSL_get_peer_certificate(SSL *a); long q_SSL_get_verify_result(const SSL *a); SSL *q_SSL_new(SSL_CTX *a); +SSL_CTX *q_SSL_get_SSL_CTX(SSL *a); long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg); int q_SSL_read(SSL *a, void *b, int c); void q_SSL_set_bio(SSL *a, BIO *b, BIO *c); @@ -414,7 +424,9 @@ X509 *q_X509_dup(X509 *a); void q_X509_print(BIO *a, X509*b); int q_X509_digest(const X509 *x509, const EVP_MD *type, unsigned char *md, unsigned int *len); ASN1_OBJECT *q_X509_EXTENSION_get_object(X509_EXTENSION *a); -void q_X509_free(X509 *a); +Q_AUTOTEST_EXPORT void q_X509_free(X509 *a); +Q_AUTOTEST_EXPORT ASN1_TIME *q_X509_gmtime_adj(ASN1_TIME *s, long adj); +Q_AUTOTEST_EXPORT void q_ASN1_TIME_free(ASN1_TIME *t); X509_EXTENSION *q_X509_get_ext(X509 *a, int b); int q_X509_get_ext_count(X509 *a); void *q_X509_get_ext_d2i(X509 *a, int b, int *c, int *d); @@ -424,11 +436,7 @@ int q_X509_EXTENSION_get_critical(X509_EXTENSION *a); ASN1_OCTET_STRING *q_X509_EXTENSION_get_data(X509_EXTENSION *a); void q_BASIC_CONSTRAINTS_free(BASIC_CONSTRAINTS *a); void q_AUTHORITY_KEYID_free(AUTHORITY_KEYID *a); -#if OPENSSL_VERSION_NUMBER >= 0x10000000L int q_ASN1_STRING_print(BIO *a, const ASN1_STRING *b); -#else -int q_ASN1_STRING_print(BIO *a, ASN1_STRING *b); -#endif int q_X509_check_issued(X509 *a, X509 *b); X509_NAME *q_X509_get_issuer_name(X509 *a); X509_NAME *q_X509_get_subject_name(X509 *a); @@ -571,6 +579,57 @@ int q_BIO_set_ex_data(BIO *b, int idx, void *data); class QDateTime; QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime); +#ifndef OPENSSL_NO_TLSEXT + +#define q_SSL_set_tlsext_status_type(ssl, type) \ + q_SSL_ctrl((ssl), SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE, (type), nullptr) + +#endif // OPENSSL_NO_TLSEXT + +#if QT_CONFIG(ocsp) + +OCSP_RESPONSE *q_d2i_OCSP_RESPONSE(OCSP_RESPONSE **a, const unsigned char **in, long len); +Q_AUTOTEST_EXPORT int q_i2d_OCSP_RESPONSE(OCSP_RESPONSE *r, unsigned char **ppout); +Q_AUTOTEST_EXPORT OCSP_RESPONSE *q_OCSP_response_create(int status, OCSP_BASICRESP *bs); +Q_AUTOTEST_EXPORT void q_OCSP_RESPONSE_free(OCSP_RESPONSE *rs); +int q_OCSP_response_status(OCSP_RESPONSE *resp); +OCSP_BASICRESP *q_OCSP_response_get1_basic(OCSP_RESPONSE *resp); +Q_AUTOTEST_EXPORT OCSP_SINGLERESP *q_OCSP_basic_add1_status(OCSP_BASICRESP *rsp, OCSP_CERTID *cid, + int status, int reason, ASN1_TIME *revtime, + ASN1_TIME *thisupd, ASN1_TIME *nextupd); +Q_AUTOTEST_EXPORT int q_OCSP_basic_sign(OCSP_BASICRESP *brsp, X509 *signer, EVP_PKEY *key, const EVP_MD *dgst, + STACK_OF(X509) *certs, unsigned long flags); +Q_AUTOTEST_EXPORT OCSP_BASICRESP *q_OCSP_BASICRESP_new(); +Q_AUTOTEST_EXPORT void q_OCSP_BASICRESP_free(OCSP_BASICRESP *bs); +int q_OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs, X509_STORE *st, unsigned long flags); +int q_OCSP_resp_count(OCSP_BASICRESP *bs); +OCSP_SINGLERESP *q_OCSP_resp_get0(OCSP_BASICRESP *bs, int idx); +int q_OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason, ASN1_GENERALIZEDTIME **revtime, + ASN1_GENERALIZEDTIME **thisupd, ASN1_GENERALIZEDTIME **nextupd); +int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *nextupd, long nsec, long maxsec); +int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, + ASN1_INTEGER **pserial, OCSP_CERTID *cid); + +const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); +Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); +Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); +int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); + +#define q_SSL_get_tlsext_status_ocsp_resp(ssl, arg) \ + q_SSL_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP, 0, arg) + +#define q_SSL_CTX_set_tlsext_status_cb(ssl, cb) \ + q_SSL_CTX_callback_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB, GenericCallbackType(cb)) + +# define q_SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \ + q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP, arglen, arg) + +#endif // ocsp + + +void *q_CRYPTO_malloc(size_t num, const char *file, int line); +#define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) + QT_END_NAMESPACE #endif diff --git a/src/network/ssl/qsslsocket_opensslpre11.cpp b/src/network/ssl/qsslsocket_opensslpre11.cpp index bc4fd9dc85..f5aab821ea 100644 --- a/src/network/ssl/qsslsocket_opensslpre11.cpp +++ b/src/network/ssl/qsslsocket_opensslpre11.cpp @@ -251,21 +251,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded() #if QT_CONFIG(library) //load symbols needed to receive certificates from system store -#if defined(Q_OS_WIN) - HINSTANCE hLib = LoadLibraryW(L"Crypt32"); - if (hLib) { - ptrCertOpenSystemStoreW = reinterpret_cast<PtrCertOpenSystemStoreW>( - reinterpret_cast<QFunctionPointer>(GetProcAddress(hLib, "CertOpenSystemStoreW"))); - ptrCertFindCertificateInStore = reinterpret_cast<PtrCertFindCertificateInStore>( - reinterpret_cast<QFunctionPointer>(GetProcAddress(hLib, "CertFindCertificateInStore"))); - ptrCertCloseStore = reinterpret_cast<PtrCertCloseStore>( - reinterpret_cast<QFunctionPointer>(GetProcAddress(hLib, "CertCloseStore"))); - if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) - qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen - } else { - qCWarning(lcSsl, "could not load crypt32 library"); // should never happen - } -#elif defined(Q_OS_QNX) +#if defined(Q_OS_QNX) s_loadRootCertsOnDemand = true; #elif defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h index b7bac5d2a2..46b6505346 100644 --- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h +++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h @@ -89,9 +89,7 @@ void q_ERR_free_strings(); void q_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a); void q_EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a); -#if OPENSSL_VERSION_NUMBER >= 0x10000000L typedef _STACK STACK; -#endif // The typedef we use to make our pre 1.1 code look more like 1.1 (less ifdefs). typedef STACK OPENSSL_STACK; @@ -111,22 +109,13 @@ void q_sk_free(STACK *a); // address of this: #define q_OPENSSL_sk_free q_sk_free -#if OPENSSL_VERSION_NUMBER >= 0x10000000L void *q_sk_value(STACK *a, int b); void q_sk_push(STACK *st, void *data); -#else -char *q_sk_value(STACK *a, int b); -void q_sk_push(STACK *st, char *data); -#endif // OPENSSL_VERSION_NUMBER >= 0x10000000L #define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) #define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) -#if OPENSSL_VERSION_NUMBER >= 0x10000000L SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a); -#else -SSL_CTX *q_SSL_CTX_new(SSL_METHOD *a); -#endif int q_SSL_library_init(); void q_SSL_load_error_strings(); @@ -135,49 +124,14 @@ void q_SSL_load_error_strings(); int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); #endif -#if OPENSSL_VERSION_NUMBER >= 0x10000000L -#ifndef OPENSSL_NO_SSL2 -const SSL_METHOD *q_SSLv2_client_method(); -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -const SSL_METHOD *q_SSLv3_client_method(); -#endif const SSL_METHOD *q_SSLv23_client_method(); const SSL_METHOD *q_TLSv1_client_method(); const SSL_METHOD *q_TLSv1_1_client_method(); const SSL_METHOD *q_TLSv1_2_client_method(); -#ifndef OPENSSL_NO_SSL2 -const SSL_METHOD *q_SSLv2_server_method(); -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -const SSL_METHOD *q_SSLv3_server_method(); -#endif const SSL_METHOD *q_SSLv23_server_method(); const SSL_METHOD *q_TLSv1_server_method(); const SSL_METHOD *q_TLSv1_1_server_method(); const SSL_METHOD *q_TLSv1_2_server_method(); -#else -#ifndef OPENSSL_NO_SSL2 -SSL_METHOD *q_SSLv2_client_method(); -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -SSL_METHOD *q_SSLv3_client_method(); -#endif -SSL_METHOD *q_SSLv23_client_method(); -SSL_METHOD *q_TLSv1_client_method(); -SSL_METHOD *q_TLSv1_1_client_method(); -SSL_METHOD *q_TLSv1_2_client_method(); -#ifndef OPENSSL_NO_SSL2 -SSL_METHOD *q_SSLv2_server_method(); -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -SSL_METHOD *q_SSLv3_server_method(); -#endif -SSL_METHOD *q_SSLv23_server_method(); -SSL_METHOD *q_TLSv1_server_method(); -SSL_METHOD *q_TLSv1_1_server_method(); -SSL_METHOD *q_TLSv1_2_server_method(); -#endif STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); @@ -218,6 +172,7 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length); #define q_SSL_SESSION_get_ticket_lifetime_hint(s) ((s)->tlsext_tick_lifetime_hint) #define q_RSA_bits(rsa) q_BN_num_bits((rsa)->n) #define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) +#define q_DH_bits(dsa) q_BN_num_bits((dh)->p) #define q_X509_STORE_set_verify_cb(s,c) X509_STORE_set_verify_cb_func((s),(c)) char *q_CONF_get1_default_config_file(); diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 6f34c6c888..daa9be23f4 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -58,6 +58,7 @@ #include <private/qtcpsocket_p.h> #include "qsslkey.h" #include "qsslconfiguration_p.h" +#include "qocspresponse.h" #ifndef QT_NO_OPENSSL #include <private/qsslcontext_openssl_p.h> #else @@ -65,7 +66,7 @@ class QSslContext; #endif #include <QtCore/qstringlist.h> - +#include <QtCore/qvector.h> #include <private/qringbuffer_p.h> #if defined(Q_OS_MAC) @@ -89,14 +90,6 @@ QT_BEGIN_NAMESPACE typedef OSStatus (*PtrSecTrustCopyAnchorCertificates)(CFArrayRef*); #endif -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) - typedef HCERTSTORE (WINAPI *PtrCertOpenSystemStoreW)(HCRYPTPROV_LEGACY, LPCWSTR); - typedef PCCERT_CONTEXT (WINAPI *PtrCertFindCertificateInStore)(HCERTSTORE, DWORD, DWORD, DWORD, const void*, PCCERT_CONTEXT); - typedef BOOL (WINAPI *PtrCertCloseStore)(HCERTSTORE, DWORD); -#endif // Q_OS_WIN && !Q_OS_WINRT - - - class QSslSocketPrivate : public QTcpSocketPrivate { Q_DECLARE_PUBLIC(QSslSocket) @@ -105,6 +98,7 @@ public: virtual ~QSslSocketPrivate(); void init(); + bool verifyProtocolSupported(const char *where); bool initialized; QSslSocket::SslMode mode; @@ -155,12 +149,6 @@ public: const QString &peerName); Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) - static PtrCertOpenSystemStoreW ptrCertOpenSystemStoreW; - static PtrCertFindCertificateInStore ptrCertFindCertificateInStore; - static PtrCertCloseStore ptrCertCloseStore; -#endif // Q_OS_WIN && !Q_OS_WINRT - // The socket itself, including private slots. QTcpSocket *plainSocket; void createPlainSocket(QIODevice::OpenMode openMode); @@ -184,7 +172,7 @@ public: void _q_flushWriteBuffer(); void _q_flushReadBuffer(); void _q_resumeImplementation(); -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && !QT_CONFIG(schannel) virtual void _q_caRootLoaded(QSslCertificate,QSslCertificate) = 0; #endif @@ -220,8 +208,14 @@ protected: bool verifyErrorsHaveBeenIgnored(); bool paused; bool flushTriggered; + QVector<QOcspResponse> ocspResponses; }; +#if QT_CONFIG(securetransport) || QT_CONFIG(schannel) +// Implemented in qsslsocket_qt.cpp +QByteArray _q_makePkcs12(const QList<QSslCertificate> &certs, const QSslKey &key, const QString &passPhrase); +#endif + QT_END_NAMESPACE #endif diff --git a/src/network/ssl/qsslsocket_qt.cpp b/src/network/ssl/qsslsocket_qt.cpp new file mode 100644 index 0000000000..b0fb60ea76 --- /dev/null +++ b/src/network/ssl/qsslsocket_qt.cpp @@ -0,0 +1,307 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Jeremy Lainé <jeremy.laine@m4x.org> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <QtCore/qbytearray.h> +#include <QtCore/qdatastream.h> +#include <QtCore/qmessageauthenticationcode.h> + +#include "qsslsocket_p.h" +#include "qasn1element_p.h" +#include "qsslkey_p.h" + +QT_BEGIN_NAMESPACE + +/* + PKCS12 helpers. +*/ + +static QAsn1Element wrap(quint8 type, const QAsn1Element &child) +{ + QByteArray value; + QDataStream stream(&value, QIODevice::WriteOnly); + child.write(stream); + return QAsn1Element(type, value); +} + +static QAsn1Element _q_PKCS7_data(const QByteArray &data) +{ + QVector<QAsn1Element> items; + items << QAsn1Element::fromObjectId("1.2.840.113549.1.7.1"); + items << wrap(QAsn1Element::Context0Type, + QAsn1Element(QAsn1Element::OctetStringType, data)); + return QAsn1Element::fromVector(items); +} + +/*! + PKCS #12 key derivation. + + Some test vectors: + http://www.drh-consultancy.demon.co.uk/test.txt +*/ +static QByteArray _q_PKCS12_keygen(char id, const QByteArray &salt, const QString &passPhrase, int n, int r) +{ + const int u = 20; + const int v = 64; + + // password formatting + QByteArray passUnicode(passPhrase.size() * 2 + 2, '\0'); + char *p = passUnicode.data(); + for (int i = 0; i < passPhrase.size(); ++i) { + quint16 ch = passPhrase[i].unicode(); + *(p++) = (ch & 0xff00) >> 8; + *(p++) = (ch & 0xff); + } + + // prepare I + QByteArray D(64, id); + QByteArray S, P; + const int sSize = v * ((salt.size() + v - 1) / v); + S.resize(sSize); + for (int i = 0; i < sSize; ++i) + S[i] = salt[i % salt.size()]; + const int pSize = v * ((passUnicode.size() + v - 1) / v); + P.resize(pSize); + for (int i = 0; i < pSize; ++i) + P[i] = passUnicode[i % passUnicode.size()]; + QByteArray I = S + P; + + // apply hashing + const int c = (n + u - 1) / u; + QByteArray A; + QByteArray B; + B.resize(v); + QCryptographicHash hash(QCryptographicHash::Sha1); + for (int i = 0; i < c; ++i) { + // hash r iterations + QByteArray Ai = D + I; + for (int j = 0; j < r; ++j) { + hash.reset(); + hash.addData(Ai); + Ai = hash.result(); + } + + for (int j = 0; j < v; ++j) + B[j] = Ai[j % u]; + + // modify I as Ij = (Ij + B + 1) modulo 2^v + for (int p = 0; p < I.size(); p += v) { + quint8 carry = 1; + for (int j = v - 1; j >= 0; --j) { + quint16 v = quint8(I[p + j]) + quint8(B[j]) + carry; + I[p + j] = v & 0xff; + carry = (v & 0xff00) >> 8; + } + } + A += Ai; + } + return A.left(n); +} + +static QByteArray _q_PKCS12_salt() +{ + QByteArray salt; + salt.resize(8); + for (int i = 0; i < salt.size(); ++i) + salt[i] = (qrand() & 0xff); + return salt; +} + +static QByteArray _q_PKCS12_certBag(const QSslCertificate &cert) +{ + QVector<QAsn1Element> items; + items << QAsn1Element::fromObjectId("1.2.840.113549.1.12.10.1.3"); + + // certificate + QVector<QAsn1Element> certItems; + certItems << QAsn1Element::fromObjectId("1.2.840.113549.1.9.22.1"); + certItems << wrap(QAsn1Element::Context0Type, + QAsn1Element(QAsn1Element::OctetStringType, cert.toDer())); + items << wrap(QAsn1Element::Context0Type, + QAsn1Element::fromVector(certItems)); + + // local key id + const QByteArray localKeyId = cert.digest(QCryptographicHash::Sha1); + QVector<QAsn1Element> idItems; + idItems << QAsn1Element::fromObjectId("1.2.840.113549.1.9.21"); + idItems << wrap(QAsn1Element::SetType, + QAsn1Element(QAsn1Element::OctetStringType, localKeyId)); + items << wrap(QAsn1Element::SetType, QAsn1Element::fromVector(idItems)); + + // dump + QAsn1Element root = wrap(QAsn1Element::SequenceType, QAsn1Element::fromVector(items)); + QByteArray ba; + QDataStream stream(&ba, QIODevice::WriteOnly); + root.write(stream); + return ba; +} + +static QAsn1Element _q_PKCS12_key(const QSslKey &key) +{ + Q_ASSERT(key.algorithm() == QSsl::Rsa || key.algorithm() == QSsl::Dsa); + + QVector<QAsn1Element> keyItems; + keyItems << QAsn1Element::fromInteger(0); + QVector<QAsn1Element> algoItems; + if (key.algorithm() == QSsl::Rsa) + algoItems << QAsn1Element::fromObjectId(RSA_ENCRYPTION_OID); + else if (key.algorithm() == QSsl::Dsa) + algoItems << QAsn1Element::fromObjectId(DSA_ENCRYPTION_OID); + algoItems << QAsn1Element(QAsn1Element::NullType); + keyItems << QAsn1Element::fromVector(algoItems); + keyItems << QAsn1Element(QAsn1Element::OctetStringType, key.toDer()); + return QAsn1Element::fromVector(keyItems); +} + +static QByteArray _q_PKCS12_shroudedKeyBag(const QSslKey &key, const QString &passPhrase, const QByteArray &localKeyId) +{ + const int iterations = 2048; + QByteArray salt = _q_PKCS12_salt(); + QByteArray cKey = _q_PKCS12_keygen(1, salt, passPhrase, 24, iterations); + QByteArray cIv = _q_PKCS12_keygen(2, salt, passPhrase, 8, iterations); + + // prepare and encrypt data + QByteArray plain; + QDataStream plainStream(&plain, QIODevice::WriteOnly); + _q_PKCS12_key(key).write(plainStream); + QByteArray crypted = QSslKeyPrivate::encrypt(QSslKeyPrivate::DesEde3Cbc, + plain, cKey, cIv); + + QVector<QAsn1Element> items; + items << QAsn1Element::fromObjectId("1.2.840.113549.1.12.10.1.2"); + + // key + QVector<QAsn1Element> keyItems; + QVector<QAsn1Element> algoItems; + algoItems << QAsn1Element::fromObjectId("1.2.840.113549.1.12.1.3"); + QVector<QAsn1Element> paramItems; + paramItems << QAsn1Element(QAsn1Element::OctetStringType, salt); + paramItems << QAsn1Element::fromInteger(iterations); + algoItems << QAsn1Element::fromVector(paramItems); + keyItems << QAsn1Element::fromVector(algoItems); + keyItems << QAsn1Element(QAsn1Element::OctetStringType, crypted); + items << wrap(QAsn1Element::Context0Type, + QAsn1Element::fromVector(keyItems)); + + // local key id + QVector<QAsn1Element> idItems; + idItems << QAsn1Element::fromObjectId("1.2.840.113549.1.9.21"); + idItems << wrap(QAsn1Element::SetType, + QAsn1Element(QAsn1Element::OctetStringType, localKeyId)); + items << wrap(QAsn1Element::SetType, + QAsn1Element::fromVector(idItems)); + + // dump + QAsn1Element root = wrap(QAsn1Element::SequenceType, QAsn1Element::fromVector(items)); + QByteArray ba; + QDataStream stream(&ba, QIODevice::WriteOnly); + root.write(stream); + return ba; +} + +static QByteArray _q_PKCS12_bag(const QList<QSslCertificate> &certs, const QSslKey &key, const QString &passPhrase) +{ + QVector<QAsn1Element> items; + + // certs + for (int i = 0; i < certs.size(); ++i) + items << _q_PKCS7_data(_q_PKCS12_certBag(certs[i])); + + // key + if (!key.isNull()) { + const QByteArray localKeyId = certs.first().digest(QCryptographicHash::Sha1); + items << _q_PKCS7_data(_q_PKCS12_shroudedKeyBag(key, passPhrase, localKeyId)); + } + + // dump + QAsn1Element root = QAsn1Element::fromVector(items); + QByteArray ba; + QDataStream stream(&ba, QIODevice::WriteOnly); + root.write(stream); + return ba; +} + +static QAsn1Element _q_PKCS12_mac(const QByteArray &data, const QString &passPhrase) +{ + const int iterations = 2048; + + // salt generation + QByteArray macSalt = _q_PKCS12_salt(); + QByteArray key = _q_PKCS12_keygen(3, macSalt, passPhrase, 20, iterations); + + // HMAC calculation + QMessageAuthenticationCode hmac(QCryptographicHash::Sha1, key); + hmac.addData(data); + + QVector<QAsn1Element> algoItems; + algoItems << QAsn1Element::fromObjectId("1.3.14.3.2.26"); + algoItems << QAsn1Element(QAsn1Element::NullType); + + QVector<QAsn1Element> digestItems; + digestItems << QAsn1Element::fromVector(algoItems); + digestItems << QAsn1Element(QAsn1Element::OctetStringType, hmac.result()); + + QVector<QAsn1Element> macItems; + macItems << QAsn1Element::fromVector(digestItems); + macItems << QAsn1Element(QAsn1Element::OctetStringType, macSalt); + macItems << QAsn1Element::fromInteger(iterations); + return QAsn1Element::fromVector(macItems); +} + +QByteArray _q_makePkcs12(const QList<QSslCertificate> &certs, const QSslKey &key, const QString &passPhrase) +{ + QVector<QAsn1Element> items; + + // version + items << QAsn1Element::fromInteger(3); + + // auth safe + const QByteArray data = _q_PKCS12_bag(certs, key, passPhrase); + items << _q_PKCS7_data(data); + + // HMAC + items << _q_PKCS12_mac(data, passPhrase); + + // dump + QAsn1Element root = QAsn1Element::fromVector(items); + QByteArray ba; + QDataStream stream(&ba, QIODevice::WriteOnly); + root.write(stream); + return ba; +} + +QT_END_NAMESPACE diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp new file mode 100644 index 0000000000..965e9bf2f3 --- /dev/null +++ b/src/network/ssl/qsslsocket_schannel.cpp @@ -0,0 +1,2003 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// #define QSSLSOCKET_DEBUG + +#include "qssl_p.h" +#include "qsslsocket.h" +#include "qsslsocket_schannel_p.h" +#include "qsslcertificate.h" +#include "qsslcertificateextension.h" +#include "qsslcertificate_p.h" +#include "qsslcipher_p.h" + +#include <QtCore/qscopeguard.h> +#include <QtCore/qoperatingsystemversion.h> +#include <QtCore/qregularexpression.h> +#include <QtCore/qdatastream.h> +#include <QtCore/qmutex.h> + +#define SECURITY_WIN32 +#include <security.h> +#include <schnlsp.h> + +#if NTDDI_VERSION >= NTDDI_WINBLUE && !defined(Q_CC_MINGW) +// ALPN = Application Layer Protocol Negotiation +#define SUPPORTS_ALPN 1 +#endif + +// Not defined in MinGW +#ifndef SECBUFFER_ALERT +#define SECBUFFER_ALERT 17 +#endif +#ifndef SECPKG_ATTR_APPLICATION_PROTOCOL +#define SECPKG_ATTR_APPLICATION_PROTOCOL 35 +#endif + +// Another missing MinGW define +#ifndef SEC_E_APPLICATION_PROTOCOL_MISMATCH +#define SEC_E_APPLICATION_PROTOCOL_MISMATCH _HRESULT_TYPEDEF_(0x80090367L) +#endif + +// Also not defined in MinGW....... +#ifndef SP_PROT_TLS1_SERVER +#define SP_PROT_TLS1_SERVER 0x00000040 +#endif +#ifndef SP_PROT_TLS1_CLIENT +#define SP_PROT_TLS1_CLIENT 0x00000080 +#endif +#ifndef SP_PROT_TLS1_0_SERVER +#define SP_PROT_TLS1_0_SERVER SP_PROT_TLS1_SERVER +#endif +#ifndef SP_PROT_TLS1_0_CLIENT +#define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT +#endif +#ifndef SP_PROT_TLS1_0 +#define SP_PROT_TLS1_0 (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_0_SERVER) +#endif +#ifndef SP_PROT_TLS1_1_SERVER +#define SP_PROT_TLS1_1_SERVER 0x00000100 +#endif +#ifndef SP_PROT_TLS1_1_CLIENT +#define SP_PROT_TLS1_1_CLIENT 0x00000200 +#endif +#ifndef SP_PROT_TLS1_1 +#define SP_PROT_TLS1_1 (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER) +#endif +#ifndef SP_PROT_TLS1_2_SERVER +#define SP_PROT_TLS1_2_SERVER 0x00000400 +#endif +#ifndef SP_PROT_TLS1_2_CLIENT +#define SP_PROT_TLS1_2_CLIENT 0x00000800 +#endif +#ifndef SP_PROT_TLS1_2 +#define SP_PROT_TLS1_2 (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER) +#endif +#ifndef SP_PROT_TLS1_3_SERVER +#define SP_PROT_TLS1_3_SERVER 0x00001000 +#endif +#ifndef SP_PROT_TLS1_3_CLIENT +#define SP_PROT_TLS1_3_CLIENT 0x00002000 +#endif +#ifndef SP_PROT_TLS1_3 +#define SP_PROT_TLS1_3 (SP_PROT_TLS1_3_CLIENT | SP_PROT_TLS1_3_SERVER) +#endif + +/* + @future!: + + - Transmitting intermediate certificates + - Look for a way to avoid putting intermediate certificates in the certificate store + - No documentation on how to send the chain + - A stackoverflow question on this from 3 years ago implies schannel only sends intermediate + certificates if it's "in the system or user certificate store". + - https://stackoverflow.com/q/30156584/2493610 + - This can be done by users, but we shouldn't add any and all local intermediate + certs to the stores automatically. + - PSK support + - Was added in Windows 10 (it seems), documentation at time of writing is sparse/non-existent. + - Specifically about how to supply credentials when they're requested. + - Or how to recognize that they're requested in the first place. + - Skip certificate verification. + - Check if "PSK-only" is still required to do PSK _at all_ (all-around bad solution). + - Check if SEC_I_INCOMPLETE_CREDENTIALS is still returned for both "missing certificate" and + "missing PSK" when calling InitializeSecurityContext in "performHandshake". + + Medium priority: + - Setting cipher-suites (or ALG_ID) + - People have survived without it in WinRT + - ALPN: + For HTTP2. Note: Windows 8.1 and up ONLY. + + Low priority: + - Possibly make RAII wrappers for SecBuffer (which I commonly create QScopeGuards for) + - Perform the '@future' optimization in "transmit()" + +*/ + +QT_BEGIN_NAMESPACE + +namespace { +SecBuffer createSecBuffer(void *ptr, unsigned long length, unsigned long bufferType) +{ + return SecBuffer{ length, bufferType, ptr }; +} + +SecBuffer createSecBuffer(QByteArray &buffer, unsigned long bufferType) +{ + return createSecBuffer(buffer.data(), static_cast<unsigned long>(buffer.length()), bufferType); +} + +QString schannelErrorToString(qint32 status) +{ + switch (status) { + case SEC_E_INSUFFICIENT_MEMORY: + return QSslSocket::tr("Insufficient memory"); + case SEC_E_INTERNAL_ERROR: + return QSslSocket::tr("Internal error"); + case SEC_E_INVALID_HANDLE: + return QSslSocket::tr("An internal handle was invalid"); + case SEC_E_INVALID_TOKEN: + return QSslSocket::tr("An internal token was invalid"); + case SEC_E_LOGON_DENIED: + // According to the link below we get this error when Schannel receives TLS1_ALERT_ACCESS_DENIED + // https://docs.microsoft.com/en-us/windows/desktop/secauthn/schannel-error-codes-for-tls-and-ssl-alerts + return QSslSocket::tr("Access denied"); + case SEC_E_NO_AUTHENTICATING_AUTHORITY: + return QSslSocket::tr("No authority could be contacted for authorization"); + case SEC_E_NO_CREDENTIALS: + return QSslSocket::tr("No credentials"); + case SEC_E_TARGET_UNKNOWN: + return QSslSocket::tr("The target is unknown or unreachable"); + case SEC_E_UNSUPPORTED_FUNCTION: + return QSslSocket::tr("An unsupported function was requested"); + case SEC_E_WRONG_PRINCIPAL: + // SNI error + return QSslSocket::tr("The hostname provided does not match the one received from the peer"); + case SEC_E_APPLICATION_PROTOCOL_MISMATCH: + return QSslSocket::tr("No common protocol exists between the client and the server"); + case SEC_E_ILLEGAL_MESSAGE: + return QSslSocket::tr("Unexpected or badly-formatted message received"); + case SEC_E_ENCRYPT_FAILURE: + return QSslSocket::tr("The data could not be encrypted"); + case SEC_E_ALGORITHM_MISMATCH: + return QSslSocket::tr("No cipher suites in common"); + case SEC_E_UNKNOWN_CREDENTIALS: + // This can mean "invalid argument" in some cases... + return QSslSocket::tr("The credentials were not recognized / Invalid argument"); + case SEC_E_MESSAGE_ALTERED: + // According to the Internet it also triggers for messages that are out of order. + // https://microsoft.public.platformsdk.security.narkive.com/4JAvlMvD/help-please-schannel-security-contexts-and-decryptmessage + return QSslSocket::tr("The message was tampered with, damaged or out of sequence."); + case SEC_E_OUT_OF_SEQUENCE: + return QSslSocket::tr("A message was received out of sequence."); + case SEC_E_CONTEXT_EXPIRED: + return QSslSocket::tr("The TLS/SSL connection has been closed"); + default: + return QSslSocket::tr("Unknown error occurred: %1").arg(status); + } +} + +DWORD toSchannelProtocol(QSsl::SslProtocol protocol) +{ + DWORD protocols = SP_PROT_NONE; + switch (protocol) { + case QSsl::UnknownProtocol: + return DWORD(-1); + case QSsl::DtlsV1_0: + case QSsl::DtlsV1_2: + case QSsl::DtlsV1_0OrLater: + case QSsl::DtlsV1_2OrLater: + return DWORD(-1); // Not supported at the moment (@future) + case QSsl::AnyProtocol: + protocols = SP_PROT_TLS1_0 | SP_PROT_TLS1_1 | SP_PROT_TLS1_2; + // @future Add TLS 1.3 when supported by Windows! + break; + case QSsl::SslV2: + case QSsl::SslV3: + return DWORD(-1); // Not supported + case QSsl::TlsV1SslV3: + protocols = SP_PROT_TLS1_0; + break; + case QSsl::TlsV1_0: + protocols = SP_PROT_TLS1_0; + break; + case QSsl::TlsV1_1: + protocols = SP_PROT_TLS1_1; + break; + case QSsl::TlsV1_2: + protocols = SP_PROT_TLS1_2; + break; + case QSsl::TlsV1_3: + if ((false)) // @future[0/1] Replace with version check once it's supported in Windows + protocols = SP_PROT_TLS1_3; + else + protocols = DWORD(-1); + break; + case QSsl::SecureProtocols: // TLS v1.0 and later is currently considered secure + case QSsl::TlsV1_0OrLater: + // For the "OrLater" protocols we fall through from one to the next, adding all of them + // in ascending order + protocols = SP_PROT_TLS1_0; + Q_FALLTHROUGH(); + case QSsl::TlsV1_1OrLater: + protocols |= SP_PROT_TLS1_1; + Q_FALLTHROUGH(); + case QSsl::TlsV1_2OrLater: + protocols |= SP_PROT_TLS1_2; + Q_FALLTHROUGH(); + case QSsl::TlsV1_3OrLater: + if ((false)) // @future[1/1] Also replace this with a version check + protocols |= SP_PROT_TLS1_3; + else if (protocol == QSsl::TlsV1_3OrLater) + protocols = DWORD(-1); // if TlsV1_3OrLater was specifically chosen we should fail + break; + } + return protocols; +} + +/*! + \internal + Used when converting the established session's \a protocol back to + Qt's own SslProtocol type. + + Only one protocol should be passed in at a time. +*/ +QSsl::SslProtocol toQtSslProtocol(DWORD protocol) +{ +#define MAP_PROTOCOL(sp_protocol, q_protocol) \ + if (protocol & sp_protocol) { \ + Q_ASSERT(!(protocol & ~sp_protocol)); \ + return q_protocol; \ + } + + MAP_PROTOCOL(SP_PROT_TLS1_0, QSsl::TlsV1_0) + MAP_PROTOCOL(SP_PROT_TLS1_1, QSsl::TlsV1_1) + MAP_PROTOCOL(SP_PROT_TLS1_2, QSsl::TlsV1_2) + MAP_PROTOCOL(SP_PROT_TLS1_3, QSsl::TlsV1_3) +#undef MAP_PROTOCOL + Q_UNREACHABLE(); + return QSsl::UnknownProtocol; +} + +/*! + \internal + Used by verifyCertContext to check if a client cert is used by a server or vice versa. +*/ +bool netscapeWrongCertType(const QList<QSslCertificateExtension> &extensions, bool isClient) +{ + const auto netscapeIt = std::find_if( + extensions.cbegin(), extensions.cend(), + [](const QSslCertificateExtension &extension) { + const auto netscapeCertType = QStringLiteral("2.16.840.1.113730.1.1"); + return extension.oid() == netscapeCertType; + }); + if (netscapeIt != extensions.cend()) { + const QByteArray netscapeCertTypeByte = netscapeIt->value().toByteArray(); + int netscapeCertType = 0; + QDataStream dataStream(netscapeCertTypeByte); + dataStream >> netscapeCertType; + if (dataStream.status() != QDataStream::Status::Ok) + return true; + const int expectedPeerCertType = isClient ? NETSCAPE_SSL_SERVER_AUTH_CERT_TYPE + : NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE; + if ((netscapeCertType & expectedPeerCertType) == 0) + return true; + } + return false; +} + +/*! + \internal + Used by verifyCertContext to check the basicConstraints certificate + extension to see if the certificate is a certificate authority. + Returns false if the certificate does not have the basicConstraints + extension or if it is not a certificate authority. +*/ +bool isCertificateAuthority(const QList<QSslCertificateExtension> &extensions) +{ + auto it = std::find_if(extensions.cbegin(), extensions.cend(), + [](const QSslCertificateExtension &extension) { + return extension.name() == QLatin1String("basicConstraints"); + }); + if (it != extensions.cend()) { + QVariantMap basicConstraints = it->value().toMap(); + return basicConstraints.value(QLatin1String("ca"), false).toBool(); + } + return false; +} + +/*! + \internal + Returns true if the attributes we requested from the context/handshake have + been given. +*/ +bool matchesContextRequirements(DWORD attributes, DWORD requirements, + QSslSocket::PeerVerifyMode verifyMode, + bool isClient) +{ +#ifdef QSSLSOCKET_DEBUG +#define DEBUG_WARN(message) qCWarning(lcSsl, message) +#else +#define DEBUG_WARN(message) +#endif + +#define CHECK_ATTRIBUTE(attributeName) \ + do { \ + const DWORD req##attributeName = isClient ? ISC_REQ_##attributeName : ASC_REQ_##attributeName; \ + const DWORD ret##attributeName = isClient ? ISC_RET_##attributeName : ASC_RET_##attributeName; \ + if (!(requirements & req##attributeName) != !(attributes & ret##attributeName)) { \ + DEBUG_WARN("Missing attribute \"" #attributeName "\""); \ + return false; \ + } \ + } while (false) + + CHECK_ATTRIBUTE(CONFIDENTIALITY); + CHECK_ATTRIBUTE(REPLAY_DETECT); + CHECK_ATTRIBUTE(SEQUENCE_DETECT); + CHECK_ATTRIBUTE(STREAM); + if (verifyMode == QSslSocket::PeerVerifyMode::VerifyPeer) + CHECK_ATTRIBUTE(MUTUAL_AUTH); + + // This one is manual because there is no server / ASC_ version + if (isClient) { + const auto reqManualCredValidation = ISC_REQ_MANUAL_CRED_VALIDATION; + const auto retManualCredValidation = ISC_RET_MANUAL_CRED_VALIDATION; + if (!(requirements & reqManualCredValidation) != !(attributes & retManualCredValidation)) { + DEBUG_WARN("Missing attribute \"MANUAL_CRED_VALIDATION\""); + return false; + } + } + + return true; +#undef CHECK_ATTRIBUTE +#undef DEBUG_WARN +} + +template<typename Required, typename Actual> +Required const_reinterpret_cast(Actual *p) +{ + return Required(p); +} + +#ifdef SUPPORTS_ALPN +bool supportsAlpn() +{ + return QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows8_1; +} + +QByteArray createAlpnString(const QByteArrayList &nextAllowedProtocols) +{ + QByteArray alpnString; + if (!nextAllowedProtocols.isEmpty() && supportsAlpn()) { + const QByteArray names = [&nextAllowedProtocols]() { + QByteArray protocolString; + for (QByteArray proto : nextAllowedProtocols) { + if (proto.size() > 255) { + qCWarning(lcSsl) << "TLS ALPN extension" << proto + << "is too long and will be truncated to 255 characters."; + proto = proto.left(255); + } + protocolString += char(proto.length()) + proto; + } + return protocolString; + }(); + + const quint16 namesSize = names.size(); + const quint32 alpnId = SecApplicationProtocolNegotiationExt_ALPN; + const quint32 totalSize = sizeof(alpnId) + sizeof(namesSize) + namesSize; + alpnString = QByteArray::fromRawData(reinterpret_cast<const char *>(&totalSize), sizeof(totalSize)) + + QByteArray::fromRawData(reinterpret_cast<const char *>(&alpnId), sizeof(alpnId)) + + QByteArray::fromRawData(reinterpret_cast<const char *>(&namesSize), sizeof(namesSize)) + + names; + } + return alpnString; +} +#endif // SUPPORTS_ALPN +} // anonymous namespace + +bool QSslSocketPrivate::s_loadRootCertsOnDemand = true; +bool QSslSocketPrivate::s_loadedCiphersAndCerts = false; +Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_schannel_mutex, (QMutex::Recursive)) + +void QSslSocketPrivate::ensureInitialized() +{ + const QMutexLocker locker(qt_schannel_mutex); + if (s_loadedCiphersAndCerts) + return; + s_loadedCiphersAndCerts = true; + + setDefaultCaCertificates(systemCaCertificates()); + s_loadRootCertsOnDemand = true; // setDefaultCaCertificates sets it to false, re-enable it. + + resetDefaultCiphers(); +} + +void QSslSocketPrivate::resetDefaultCiphers() +{ + setDefaultSupportedCiphers(QSslSocketBackendPrivate::defaultCiphers()); + setDefaultCiphers(QSslSocketBackendPrivate::defaultCiphers()); +} + +void QSslSocketPrivate::resetDefaultEllipticCurves() +{ + Q_UNIMPLEMENTED(); +} + +bool QSslSocketPrivate::supportsSsl() +{ + return true; +} + +QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() +{ + // Copied from qsslsocket_openssl.cpp's systemCaCertificates function. + QList<QSslCertificate> systemCerts; + auto hSystemStore = QHCertStorePointer(CertOpenSystemStore(0, L"ROOT")); + if (hSystemStore) { + PCCERT_CONTEXT pc = nullptr; + while ((pc = CertFindCertificateInStore(hSystemStore.get(), X509_ASN_ENCODING, 0, + CERT_FIND_ANY, nullptr, pc))) { + systemCerts.append(QSslCertificatePrivate::QSslCertificate_from_CERT_CONTEXT(pc)); + } + } + return systemCerts; +} + +long QSslSocketPrivate::sslLibraryVersionNumber() +{ + const auto os = QOperatingSystemVersion::current(); + return (os.majorVersion() << 24) | ((os.minorVersion() & 0xFF) << 16) | (os.microVersion() & 0xFFFF); +} + +QString QSslSocketPrivate::sslLibraryVersionString() +{ + const auto os = QOperatingSystemVersion::current(); + return QString::fromLatin1("Secure Channel, %1 %2.%3.%4") + .arg(os.name(), + QString::number(os.majorVersion()), + QString::number(os.minorVersion()), + QString::number(os.microVersion())); +} + +long QSslSocketPrivate::sslLibraryBuildVersionNumber() +{ + // There is no separate build version + return sslLibraryVersionNumber(); +} + +QString QSslSocketPrivate::sslLibraryBuildVersionString() +{ + const auto os = QOperatingSystemVersion::current(); + return QString::fromLatin1("%1.%2.%3") + .arg(QString::number(os.majorVersion()), + QString::number(os.minorVersion()), + QString::number(os.microVersion())); +} + +QSslSocketBackendPrivate::QSslSocketBackendPrivate() +{ + SecInvalidateHandle(&credentialHandle); + SecInvalidateHandle(&contextHandle); + ensureInitialized(); +} + +QSslSocketBackendPrivate::~QSslSocketBackendPrivate() +{ + closeCertificateStores(); + deallocateContext(); + freeCredentialsHandle(); + CertFreeCertificateContext(localCertContext); +} + +bool QSslSocketBackendPrivate::sendToken(void *token, unsigned long tokenLength, bool emitError) +{ + if (tokenLength == 0) + return true; + const qint64 written = plainSocket->write(static_cast<const char *>(token), tokenLength); + if (written != qint64(tokenLength)) { + // Failed to write/buffer everything or an error occurred + if (emitError) + setErrorAndEmit(plainSocket->error(), plainSocket->errorString()); + return false; + } + return true; +} + +QString QSslSocketBackendPrivate::targetName() const +{ + // Used for SNI extension + return verificationPeerName.isEmpty() ? q_func()->peerName() : verificationPeerName; +} + +ULONG QSslSocketBackendPrivate::getContextRequirements() +{ + const bool isClient = mode == QSslSocket::SslClientMode; + ULONG req = 0; + + req |= ISC_REQ_ALLOCATE_MEMORY; // Allocate memory for buffers automatically + req |= ISC_REQ_CONFIDENTIALITY; // Encrypt messages + req |= ISC_REQ_REPLAY_DETECT; // Detect replayed messages + req |= ISC_REQ_SEQUENCE_DETECT; // Detect out of sequence messages + req |= ISC_REQ_STREAM; // Support a stream-oriented connection + + if (isClient) { + req |= ISC_REQ_MANUAL_CRED_VALIDATION; // Manually validate certificate + } else { + switch (configuration.peerVerifyMode) { + case QSslSocket::PeerVerifyMode::VerifyNone: + // There doesn't seem to be a way to ask for an optional client cert :-( + case QSslSocket::PeerVerifyMode::AutoVerifyPeer: + case QSslSocket::PeerVerifyMode::QueryPeer: + break; + case QSslSocket::PeerVerifyMode::VerifyPeer: + req |= ISC_REQ_MUTUAL_AUTH; + break; + } + } + + return req; +} + +bool QSslSocketBackendPrivate::acquireCredentialsHandle() +{ + Q_ASSERT(schannelState == SchannelState::InitializeHandshake); + + const bool isClient = mode == QSslSocket::SslClientMode; + const DWORD protocols = toSchannelProtocol(configuration.protocol); + if (protocols == DWORD(-1)) { + setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError, + QSslSocket::tr("Invalid protocol chosen")); + return false; + } + + const CERT_CHAIN_CONTEXT *chainContext = nullptr; + auto freeCertChain = qScopeGuard([&chainContext]() { + if (chainContext) + CertFreeCertificateChain(chainContext); + }); + + DWORD certsCount = 0; + // Set up our certificate stores before trying to use one... + initializeCertificateStores(); + + // Check if user has specified a certificate chain but it could not be loaded. + // This happens if there was something wrong with the certificate chain or there was no private + // key. + if (!configuration.localCertificateChain.isEmpty() && !localCertificateStore) + return true; // 'true' because "tst_QSslSocket::setEmptyKey" expects us to not disconnect + + if (localCertificateStore != nullptr) { + CERT_CHAIN_FIND_BY_ISSUER_PARA findParam; + ZeroMemory(&findParam, sizeof(findParam)); + findParam.cbSize = sizeof(findParam); + findParam.pszUsageIdentifier = isClient ? szOID_PKIX_KP_CLIENT_AUTH : szOID_PKIX_KP_SERVER_AUTH; + + // There should only be one chain in our store, so.. we grab that one. + chainContext = CertFindChainInStore(localCertificateStore.get(), + X509_ASN_ENCODING, + 0, + CERT_CHAIN_FIND_BY_ISSUER, + &findParam, + nullptr); + if (!chainContext) { + const QString message = isClient + ? QSslSocket::tr("The certificate provided can not be used for a client.") + : QSslSocket::tr("The certificate provided can not be used for a server."); + setErrorAndEmit(QAbstractSocket::SocketError::SslInvalidUserDataError, message); + return false; + } + Q_ASSERT(chainContext->cChain == 1); + Q_ASSERT(chainContext->rgpChain[0]); + Q_ASSERT(chainContext->rgpChain[0]->cbSize >= 1); + Q_ASSERT(chainContext->rgpChain[0]->rgpElement[0]); + Q_ASSERT(!localCertContext); + localCertContext = CertDuplicateCertificateContext(chainContext->rgpChain[0] + ->rgpElement[0] + ->pCertContext); + certsCount = 1; + Q_ASSERT(localCertContext); + } + + SCHANNEL_CRED cred{ + SCHANNEL_CRED_VERSION, // dwVersion + certsCount, // cCreds + &localCertContext, // paCred (certificate(s) containing a private key for authentication) + nullptr, // hRootStore + + 0, // cMappers (reserved) + nullptr, // aphMappers (reserved) + + 0, // cSupportedAlgs + nullptr, // palgSupportedAlgs (nullptr = system default) @future: QSslCipher-related + + protocols, // grbitEnabledProtocols + 0, // dwMinimumCipherStrength (0 = system default) + 0, // dwMaximumCipherStrength (0 = system default) + 0, // dwSessionLifespan (0 = schannel default, 10 hours) + SCH_CRED_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT + | SCH_CRED_NO_DEFAULT_CREDS, // dwFlags + 0 // dwCredFormat (must be 0) + }; + + TimeStamp expiration{}; + auto status = AcquireCredentialsHandle(nullptr, // pszPrincipal (unused) + const_cast<wchar_t *>(UNISP_NAME), // pszPackage + isClient ? SECPKG_CRED_OUTBOUND : SECPKG_CRED_INBOUND, // fCredentialUse + nullptr, // pvLogonID (unused) + &cred, // pAuthData + nullptr, // pGetKeyFn (unused) + nullptr, // pvGetKeyArgument (unused) + &credentialHandle, // phCredential + &expiration // ptsExpir + ); + + if (status != SEC_E_OK) { + setErrorAndEmit(QAbstractSocket::SslInternalError, schannelErrorToString(status)); + return false; + } + return true; +} + +void QSslSocketBackendPrivate::deallocateContext() +{ + if (SecIsValidHandle(&contextHandle)) { + DeleteSecurityContext(&contextHandle); + SecInvalidateHandle(&contextHandle); + } +} + +void QSslSocketBackendPrivate::freeCredentialsHandle() +{ + if (SecIsValidHandle(&credentialHandle)) { + FreeCredentialsHandle(&credentialHandle); + SecInvalidateHandle(&credentialHandle); + } +} + +void QSslSocketBackendPrivate::closeCertificateStores() +{ + localCertificateStore.reset(); + peerCertificateStore.reset(); + caCertificateStore.reset(); +} + +bool QSslSocketBackendPrivate::createContext() +{ + Q_ASSERT(SecIsValidHandle(&credentialHandle)); + Q_ASSERT(schannelState == SchannelState::InitializeHandshake); + Q_ASSERT(mode == QSslSocket::SslClientMode); + ULONG contextReq = getContextRequirements(); + + SecBuffer outBuffers[3]; + outBuffers[0] = createSecBuffer(nullptr, 0, SECBUFFER_TOKEN); + outBuffers[1] = createSecBuffer(nullptr, 0, SECBUFFER_ALERT); + outBuffers[2] = createSecBuffer(nullptr, 0, SECBUFFER_EMPTY); + auto freeBuffers = qScopeGuard([&outBuffers]() { + for (auto i = 0ull; i < ARRAYSIZE(outBuffers); i++) { + if (outBuffers[i].pvBuffer) + FreeContextBuffer(outBuffers[i].pvBuffer); + } + }); + SecBufferDesc outputBufferDesc{ + SECBUFFER_VERSION, + ARRAYSIZE(outBuffers), + outBuffers + }; + + TimeStamp expiry; + + SecBufferDesc alpnBufferDesc; + bool useAlpn = false; +#ifdef SUPPORTS_ALPN + configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNone; + QByteArray alpnString = createAlpnString(configuration.nextAllowedProtocols); + useAlpn = !alpnString.isEmpty(); + SecBuffer alpnBuffers[1]; + alpnBuffers[0] = createSecBuffer(alpnString, SECBUFFER_APPLICATION_PROTOCOLS); + alpnBufferDesc = { + SECBUFFER_VERSION, + ARRAYSIZE(alpnBuffers), + alpnBuffers + }; +#endif + + auto status = InitializeSecurityContext(&credentialHandle, // phCredential + nullptr, // phContext + const_reinterpret_cast<SEC_WCHAR *>(targetName().utf16()), // pszTargetName + contextReq, // fContextReq + 0, // Reserved1 + 0, // TargetDataRep (unused) + useAlpn ? &alpnBufferDesc : nullptr, // pInput + 0, // Reserved2 + &contextHandle, // phNewContext + &outputBufferDesc, // pOutput + &contextAttributes, // pfContextAttr + &expiry // ptsExpiry + ); + + // This is the first call to InitializeSecurityContext, so theoretically "CONTINUE_NEEDED" + // should be the only non-error return-code here. + if (status != SEC_I_CONTINUE_NEEDED) { + setErrorAndEmit(QAbstractSocket::SslInternalError, + QSslSocket::tr("Error creating SSL context (%1)").arg(schannelErrorToString(status))); + return false; + } + + if (!sendToken(outBuffers[0].pvBuffer, outBuffers[0].cbBuffer)) + return false; + schannelState = SchannelState::PerformHandshake; + return true; +} + +bool QSslSocketBackendPrivate::acceptContext() +{ + Q_ASSERT(SecIsValidHandle(&credentialHandle)); + Q_ASSERT(schannelState == SchannelState::InitializeHandshake); + Q_ASSERT(mode == QSslSocket::SslServerMode); + ULONG contextReq = getContextRequirements(); + + intermediateBuffer += plainSocket->read(16384); + if (intermediateBuffer.isEmpty()) + return true; // definitely need more data.. + + SecBuffer inBuffers[2]; + inBuffers[0] = createSecBuffer(intermediateBuffer, SECBUFFER_TOKEN); + +#ifdef SUPPORTS_ALPN + configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNone; + // The string must be alive when we call AcceptSecurityContext + QByteArray alpnString = createAlpnString(configuration.nextAllowedProtocols); + if (!alpnString.isEmpty()) { + inBuffers[1] = createSecBuffer(alpnString, SECBUFFER_APPLICATION_PROTOCOLS); + } else +#endif + { + inBuffers[1] = createSecBuffer(nullptr, 0, SECBUFFER_EMPTY); + } + + SecBufferDesc inputBufferDesc{ + SECBUFFER_VERSION, + ARRAYSIZE(inBuffers), + inBuffers + }; + + SecBuffer outBuffers[3]; + outBuffers[0] = createSecBuffer(nullptr, 0, SECBUFFER_TOKEN); + outBuffers[1] = createSecBuffer(nullptr, 0, SECBUFFER_ALERT); + outBuffers[2] = createSecBuffer(nullptr, 0, SECBUFFER_EMPTY); + auto freeBuffers = qScopeGuard([&outBuffers]() { + for (auto i = 0ull; i < ARRAYSIZE(outBuffers); i++) { + if (outBuffers[i].pvBuffer) + FreeContextBuffer(outBuffers[i].pvBuffer); + } + }); + SecBufferDesc outputBufferDesc{ + SECBUFFER_VERSION, + ARRAYSIZE(outBuffers), + outBuffers + }; + + TimeStamp expiry; + auto status = AcceptSecurityContext( + &credentialHandle, // phCredential + nullptr, // phContext + &inputBufferDesc, // pInput + contextReq, // fContextReq + 0, // TargetDataRep (unused) + &contextHandle, // phNewContext + &outputBufferDesc, // pOutput + &contextAttributes, // pfContextAttr + &expiry // ptsTimeStamp + ); + + if (inBuffers[1].BufferType == SECBUFFER_EXTRA) { + // https://docs.microsoft.com/en-us/windows/desktop/secauthn/extra-buffers-returned-by-schannel + // inBuffers[1].cbBuffer indicates the amount of bytes _NOT_ processed, the rest need to + // be stored. + intermediateBuffer = intermediateBuffer.right(int(inBuffers[1].cbBuffer)); + } else if (status != SEC_E_INCOMPLETE_MESSAGE) { + intermediateBuffer.clear(); + } + + if (status != SEC_I_CONTINUE_NEEDED) { + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, + QSslSocket::tr("Error creating SSL context (%1)").arg(schannelErrorToString(status))); + return false; + } + if (!sendToken(outBuffers[0].pvBuffer, outBuffers[0].cbBuffer)) + return false; + schannelState = SchannelState::PerformHandshake; + return true; +} + +bool QSslSocketBackendPrivate::performHandshake() +{ + if (plainSocket->state() == QAbstractSocket::UnconnectedState) { + setErrorAndEmit(QAbstractSocket::RemoteHostClosedError, + QSslSocket::tr("The TLS/SSL connection has been closed")); + return false; + } + Q_ASSERT(SecIsValidHandle(&credentialHandle)); + Q_ASSERT(SecIsValidHandle(&contextHandle)); + Q_ASSERT(schannelState == SchannelState::PerformHandshake); + +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Bytes available from socket:" << plainSocket->bytesAvailable(); + qCDebug(lcSsl) << "intermediateBuffer size:" << intermediateBuffer.size(); +#endif + + intermediateBuffer += plainSocket->read(16384); + if (intermediateBuffer.isEmpty()) + return true; // no data, will fail + + SecBuffer inputBuffers[2]; + inputBuffers[0] = createSecBuffer(intermediateBuffer, SECBUFFER_TOKEN); + inputBuffers[1] = createSecBuffer(nullptr, 0, SECBUFFER_EMPTY); + SecBufferDesc inputBufferDesc{ + SECBUFFER_VERSION, + ARRAYSIZE(inputBuffers), + inputBuffers + }; + + SecBuffer outBuffers[3]; + outBuffers[0] = createSecBuffer(nullptr, 0, SECBUFFER_TOKEN); + outBuffers[1] = createSecBuffer(nullptr, 0, SECBUFFER_ALERT); + outBuffers[2] = createSecBuffer(nullptr, 0, SECBUFFER_EMPTY); + auto freeBuffers = qScopeGuard([&outBuffers]() { + for (auto i = 0ull; i < ARRAYSIZE(outBuffers); i++) { + if (outBuffers[i].pvBuffer) + FreeContextBuffer(outBuffers[i].pvBuffer); + } + }); + SecBufferDesc outputBufferDesc{ + SECBUFFER_VERSION, + ARRAYSIZE(outBuffers), + outBuffers + }; + + ULONG contextReq = getContextRequirements(); + TimeStamp expiry; + auto status = InitializeSecurityContext(&credentialHandle, // phCredential + &contextHandle, // phContext + const_reinterpret_cast<SEC_WCHAR *>(targetName().utf16()), // pszTargetName + contextReq, // fContextReq + 0, // Reserved1 + 0, // TargetDataRep (unused) + &inputBufferDesc, // pInput + 0, // Reserved2 + nullptr, // phNewContext (we already have one) + &outputBufferDesc, // pOutput + &contextAttributes, // pfContextAttr + &expiry // ptsExpiry + ); + + if (inputBuffers[1].BufferType == SECBUFFER_EXTRA) { + // https://docs.microsoft.com/en-us/windows/desktop/secauthn/extra-buffers-returned-by-schannel + // inputBuffers[1].cbBuffer indicates the amount of bytes _NOT_ processed, the rest need to + // be stored. + intermediateBuffer = intermediateBuffer.right(int(inputBuffers[1].cbBuffer)); + } else { + // Clear the buffer if we weren't asked for more data + if (status != SEC_E_INCOMPLETE_MESSAGE) + intermediateBuffer.clear(); + } + switch (status) { + case SEC_E_OK: + // Need to transmit a final token in the handshake if 'cbBuffer' is non-zero. + if (!sendToken(outBuffers[0].pvBuffer, outBuffers[0].cbBuffer)) + return false; + schannelState = SchannelState::VerifyHandshake; + return true; + case SEC_I_CONTINUE_NEEDED: + if (!sendToken(outBuffers[0].pvBuffer, outBuffers[0].cbBuffer)) + return false; + // Must call InitializeSecurityContext again later (done through continueHandshake) + return true; + case SEC_I_INCOMPLETE_CREDENTIALS: + // Schannel takes care of picking certificate to send (other than the one we can specify), + // so if we get here then that means we don't have a certificate the server accepts. + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, + QSslSocket::tr("Server did not accept any certificate we could present.")); + return false; + case SEC_I_CONTEXT_EXPIRED: + // "The message sender has finished using the connection and has initiated a shutdown." + if (outBuffers[0].BufferType == SECBUFFER_TOKEN) { + if (!sendToken(outBuffers[0].pvBuffer, outBuffers[0].cbBuffer)) + return false; + } + if (!shutdown) { // we did not initiate this + setErrorAndEmit(QAbstractSocket::RemoteHostClosedError, + QSslSocket::tr("The TLS/SSL connection has been closed")); + } + return true; + case SEC_E_INCOMPLETE_MESSAGE: + // Simply incomplete, wait for more data + return true; + case SEC_E_ALGORITHM_MISMATCH: + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, + QSslSocket::tr("Algorithm mismatch")); + shutdown = true; // skip sending the "Shutdown" alert + return false; + } + + // Note: We can get here if the connection is using TLS 1.2 and the server certificate uses + // MD5, which is not allowed in Schannel. This causes an "invalid token" error during handshake. + // (If you came here investigating an error: md5 is insecure, update your certificate) + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, + QSslSocket::tr("Handshake failed: %1").arg(schannelErrorToString(status))); + return false; +} + +bool QSslSocketBackendPrivate::verifyHandshake() +{ + Q_Q(QSslSocket); + + const bool isClient = mode == QSslSocket::SslClientMode; +#define CHECK_STATUS(status) \ + if (status != SEC_E_OK) { \ + setErrorAndEmit(QAbstractSocket::SslInternalError, \ + QSslSocket::tr("Failed to query the TLS context: %1") \ + .arg(schannelErrorToString(status))); \ + return false; \ + } + + // Everything is set up, now make sure there's nothing wrong and query some attributes... + if (!matchesContextRequirements(contextAttributes, getContextRequirements(), + configuration.peerVerifyMode, isClient)) { + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, + QSslSocket::tr("Did not get the required attributes for the connection.")); + return false; + } + + // Get stream sizes (to know the max size of a message and the size of the header and trailer) + auto status = QueryContextAttributes(&contextHandle, + SECPKG_ATTR_STREAM_SIZES, + &streamSizes); + CHECK_STATUS(status); + + // Get session cipher info + status = QueryContextAttributes(&contextHandle, + SECPKG_ATTR_CONNECTION_INFO, + &connectionInfo); + CHECK_STATUS(status); + +#ifdef SUPPORTS_ALPN + if (!configuration.nextAllowedProtocols.isEmpty() && supportsAlpn()) { + SecPkgContext_ApplicationProtocol alpn; + status = QueryContextAttributes(&contextHandle, + SECPKG_ATTR_APPLICATION_PROTOCOL, + &alpn); + CHECK_STATUS(status); + if (alpn.ProtoNegoStatus == SecApplicationProtocolNegotiationStatus_Success) { + QByteArray negotiatedProto = QByteArray((const char *)alpn.ProtocolId, + alpn.ProtocolIdSize); + if (!configuration.nextAllowedProtocols.contains(negotiatedProto)) { + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, + QSslSocket::tr("Unwanted protocol was negotiated")); + return false; + } + configuration.nextNegotiatedProtocol = negotiatedProto; + configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; + } else { + configuration.nextNegotiatedProtocol = ""; + configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationUnsupported; + } + } +#endif // supports ALPN + +#undef CHECK_STATUS + + // Verify certificate + CERT_CONTEXT *certificateContext = nullptr; + auto freeCertificate = qScopeGuard([&certificateContext]() { + if (certificateContext) + CertFreeCertificateContext(certificateContext); + }); + status = QueryContextAttributes(&contextHandle, + SECPKG_ATTR_REMOTE_CERT_CONTEXT, + &certificateContext); + + // QueryPeer can (currently) not work in Schannel since Schannel itself doesn't have a way to + // ask for a certificate and then still be OK if it's not received. + // To work around this we don't request a certificate at all for QueryPeer. + // For servers AutoVerifyPeer is supposed to be treated the same as QueryPeer. + // This means that servers using Schannel will only request client certificate for "VerifyPeer". + if ((!isClient && configuration.peerVerifyMode == QSslSocket::PeerVerifyMode::VerifyPeer) + || (isClient && configuration.peerVerifyMode != QSslSocket::PeerVerifyMode::VerifyNone + && configuration.peerVerifyMode != QSslSocket::PeerVerifyMode::QueryPeer)) { + if (status != SEC_E_OK) { +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Couldn't retrieve peer certificate, status:" + << schannelErrorToString(status); +#endif + const QSslError error{ QSslError::NoPeerCertificate }; + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + } + + // verifyCertContext returns false if the user disconnected while it was checking errors. + if (certificateContext && sslErrors.isEmpty() && !verifyCertContext(certificateContext)) + return false; + + if (!checkSslErrors() || state != QAbstractSocket::ConnectedState) { +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << __func__ << "was unsuccessful. Paused:" << paused; +#endif + // If we're paused then checkSslErrors returned false, but it's not an error + return paused && state == QAbstractSocket::ConnectedState; + } + + schannelState = SchannelState::Done; + peerCertVerified = true; + return true; +} + +bool QSslSocketBackendPrivate::renegotiate() +{ + SecBuffer outBuffers[3]; + outBuffers[0] = createSecBuffer(nullptr, 0, SECBUFFER_TOKEN); + outBuffers[1] = createSecBuffer(nullptr, 0, SECBUFFER_ALERT); + outBuffers[2] = createSecBuffer(nullptr, 0, SECBUFFER_EMPTY); + auto freeBuffers = qScopeGuard([&outBuffers]() { + for (auto i = 0ull; i < ARRAYSIZE(outBuffers); i++) { + if (outBuffers[i].pvBuffer) + FreeContextBuffer(outBuffers[i].pvBuffer); + } + }); + SecBufferDesc outputBufferDesc{ + SECBUFFER_VERSION, + ARRAYSIZE(outBuffers), + outBuffers + }; + + ULONG contextReq = getContextRequirements(); + TimeStamp expiry; + SECURITY_STATUS status; + if (mode == QSslSocket::SslClientMode) { + status = InitializeSecurityContext(&credentialHandle, // phCredential + &contextHandle, // phContext + const_reinterpret_cast<SEC_WCHAR *>(targetName().utf16()), // pszTargetName + contextReq, // fContextReq + 0, // Reserved1 + 0, // TargetDataRep (unused) + nullptr, // pInput (nullptr for renegotiate) + 0, // Reserved2 + nullptr, // phNewContext (we already have one) + &outputBufferDesc, // pOutput + &contextAttributes, // pfContextAttr + &expiry // ptsExpiry + ); + } else { + status = AcceptSecurityContext( + &credentialHandle, // phCredential + &contextHandle, // phContext + nullptr, // pInput + contextReq, // fContextReq + 0, // TargetDataRep (unused) + nullptr, // phNewContext + &outputBufferDesc, // pOutput + &contextAttributes, // pfContextAttr, + &expiry // ptsTimeStamp + ); + } + if (status == SEC_I_CONTINUE_NEEDED) { + schannelState = SchannelState::PerformHandshake; + return sendToken(outBuffers[0].pvBuffer, outBuffers[0].cbBuffer); + } + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, + QSslSocket::tr("Renegotiation was unsuccessful: %1").arg(schannelErrorToString(status))); + return false; +} + +/*! + \internal + reset the state in preparation for reuse of socket +*/ +void QSslSocketBackendPrivate::reset() +{ + closeCertificateStores(); // certificate stores could've changed + deallocateContext(); + freeCredentialsHandle(); // in case we already had one (@future: session resumption requires re-use) + + connectionInfo = {}; + streamSizes = {}; + + CertFreeCertificateContext(localCertContext); + localCertContext = nullptr; + + contextAttributes = 0; + intermediateBuffer.clear(); + schannelState = SchannelState::InitializeHandshake; + + connectionEncrypted = false; + shutdown = false; + peerCertVerified = false; + renegotiating = false; +} + +void QSslSocketBackendPrivate::startClientEncryption() +{ + if (connectionEncrypted) + return; // let's not mess up the connection... + reset(); + continueHandshake(); +} + +void QSslSocketBackendPrivate::startServerEncryption() +{ + if (connectionEncrypted) + return; // let's not mess up the connection... + reset(); + continueHandshake(); +} + +void QSslSocketBackendPrivate::transmit() +{ + Q_Q(QSslSocket); + + // Can happen if called through QSslSocket::abort->QSslSocket::close->QSslSocket::flush->here + if (plainSocket->state() == QAbstractSocket::SocketState::UnconnectedState) + return; + + if (schannelState != SchannelState::Done) { + continueHandshake(); + return; + } + + if (connectionEncrypted) { // encrypt data in writeBuffer and write it to plainSocket + qint64 totalBytesWritten = 0; + qint64 writeBufferSize; + while ((writeBufferSize = writeBuffer.size()) > 0) { + QByteArray plaintext; + { + // Try to read 'cbMaximumMessage' bytes from buffer before encrypting. + int size = int(std::min(writeBufferSize, qint64(streamSizes.cbMaximumMessage))); + plaintext.resize(size); + // Use peek() here instead of read() so we don't lose data if encryption fails. + qint64 copied = writeBuffer.peek(plaintext.data(), size); + Q_ASSERT(copied == size); + } + QByteArray header(int(streamSizes.cbHeader), '\0'); + QByteArray trailer(int(streamSizes.cbTrailer), '\0'); + + SecBuffer inputBuffers[4]{ + // @future[0/1]: optimize by using one container for all fields... + createSecBuffer(header, SECBUFFER_STREAM_HEADER), + createSecBuffer(plaintext, SECBUFFER_DATA), + createSecBuffer(trailer, SECBUFFER_STREAM_TRAILER), + createSecBuffer(nullptr, 0, SECBUFFER_EMPTY) + }; + SecBufferDesc message{ + SECBUFFER_VERSION, + ARRAYSIZE(inputBuffers), + inputBuffers + }; + auto status = EncryptMessage(&contextHandle, 0, &message, 0); + if (status != SEC_E_OK) { + setErrorAndEmit(QAbstractSocket::SslInternalError, + QSslSocket::tr("Schannel failed to encrypt data: %1") + .arg(schannelErrorToString(status))); + return; + } + // Data was encrypted successfully, so we free() what we peek()ed earlier + writeBuffer.free(plaintext.length()); + + // trailer has been observed to change size, so resize them all (when needed) to be safe + header = header.left(int(inputBuffers[0].cbBuffer)); + plaintext = plaintext.left(int(inputBuffers[1].cbBuffer)); + trailer = trailer.left(int(inputBuffers[2].cbBuffer)); + const qint64 bytesWritten = plainSocket->write(header // @future[1/1]: ...because they need to be merged + + plaintext + + trailer); +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Wrote" << bytesWritten << "of total" + << header.length() + plaintext.length() + trailer.length() << "bytes"; +#endif + if (bytesWritten >= 0) { + totalBytesWritten += bytesWritten; + } else { + setErrorAndEmit(plainSocket->error(), plainSocket->errorString()); + return; + } + } + + if (totalBytesWritten > 0) { + // Don't emit bytesWritten() recursively. + if (!emittedBytesWritten) { + emittedBytesWritten = true; + emit q->bytesWritten(totalBytesWritten); + emittedBytesWritten = false; + } + emit q->channelBytesWritten(0, totalBytesWritten); + } + } + + if (connectionEncrypted) { // Decrypt data from remote + int totalRead = 0; + bool hadIncompleteData = false; + while (!readBufferMaxSize || buffer.size() < readBufferMaxSize) { + QByteArray ciphertext; + if (intermediateBuffer.length()) { +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Restoring data from intermediateBuffer:" + << intermediateBuffer.length() << "bytes"; +#endif + ciphertext.swap(intermediateBuffer); + } + int initialLength = ciphertext.length(); + ciphertext += plainSocket->read(16384); +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Read" << ciphertext.length() - initialLength + << "encrypted bytes from the socket"; +#endif + if (ciphertext.length() == 0 || (hadIncompleteData && initialLength == ciphertext.length())) { +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << (hadIncompleteData ? "No new data received, leaving loop!" + : "Nothing to decrypt, leaving loop!"); +#endif + if (ciphertext.length()) // We have data, it came from intermediateBuffer, swap back + intermediateBuffer.swap(ciphertext); + break; + } + hadIncompleteData = false; +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Total amount of bytes to decrypt:" << ciphertext.length(); +#endif + + SecBuffer dataBuffer[4]{ + createSecBuffer(ciphertext, SECBUFFER_DATA), + createSecBuffer(nullptr, 0, SECBUFFER_EMPTY), + createSecBuffer(nullptr, 0, SECBUFFER_EMPTY), + createSecBuffer(nullptr, 0, SECBUFFER_EMPTY) + }; + SecBufferDesc message{ + SECBUFFER_VERSION, + ARRAYSIZE(dataBuffer), + dataBuffer + }; + auto status = DecryptMessage(&contextHandle, &message, 0, nullptr); + if (status == SEC_E_OK || status == SEC_I_RENEGOTIATE || status == SEC_I_CONTEXT_EXPIRED) { + // There can still be 0 output even if it succeeds, this is fine + if (dataBuffer[1].cbBuffer > 0) { + // It is always decrypted in-place. + // But [0] is the STREAM_HEADER, [1] is the DATA and [2] is the STREAM_TRAILER. + // The pointers in all of those still point into the 'ciphertext' byte array. + buffer.append(static_cast<char *>(dataBuffer[1].pvBuffer), + dataBuffer[1].cbBuffer); + totalRead += dataBuffer[1].cbBuffer; +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Decrypted" << dataBuffer[1].cbBuffer + << "bytes. New read buffer size:" << buffer.size(); +#endif + } + if (dataBuffer[3].BufferType == SECBUFFER_EXTRA) { + // https://docs.microsoft.com/en-us/windows/desktop/secauthn/extra-buffers-returned-by-schannel + // dataBuffer[3].cbBuffer indicates the amount of bytes _NOT_ processed, + // the rest need to be stored. +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "We've got excess data, moving it to the intermediate buffer:" + << dataBuffer[3].cbBuffer << "bytes"; +#endif + intermediateBuffer = ciphertext.right(int(dataBuffer[3].cbBuffer)); + } + } else if (status == SEC_E_INCOMPLETE_MESSAGE) { + // Need more data before we can decrypt.. to the buffer it goes! +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl, "We didn't have enough data to decrypt anything, will try again!"); +#endif + Q_ASSERT(intermediateBuffer.isEmpty()); + intermediateBuffer.swap(ciphertext); + // We try again, but if we don't get any more data then we leave + hadIncompleteData = true; + } else if (status == SEC_E_INVALID_HANDLE) { + // I don't think this should happen, if it does we're done... + qCWarning(lcSsl, "The internal SSPI handle is invalid!"); + Q_UNREACHABLE(); + } else if (status == SEC_E_INVALID_TOKEN) { + qCWarning(lcSsl, "Got SEC_E_INVALID_TOKEN!"); + Q_UNREACHABLE(); // Happened once due to a bug, but shouldn't generally happen(?) + } else if (status == SEC_E_MESSAGE_ALTERED) { + // The message has been altered, disconnect now. + shutdown = true; // skips sending the shutdown alert + disconnectFromHost(); + setErrorAndEmit(QAbstractSocket::SslInternalError, + schannelErrorToString(status)); + break; + } else if (status == SEC_E_OUT_OF_SEQUENCE) { + // @todo: I don't know if this one is actually "fatal".. + // This path might never be hit as it seems this is for connection-oriented connections, + // while SEC_E_MESSAGE_ALTERED is for stream-oriented ones (what we use). + shutdown = true; // skips sending the shutdown alert + disconnectFromHost(); + setErrorAndEmit(QAbstractSocket::SslInternalError, + schannelErrorToString(status)); + break; + } else if (status == SEC_I_CONTEXT_EXPIRED) { + // 'remote' has initiated a shutdown + disconnectFromHost(); + setErrorAndEmit(QAbstractSocket::RemoteHostClosedError, + schannelErrorToString(status)); + break; + } else if (status == SEC_I_RENEGOTIATE) { + // 'remote' wants to renegotiate +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl, "The peer wants to renegotiate."); +#endif + schannelState = SchannelState::Renegotiate; + renegotiating = true; + // We need to call 'continueHandshake' or else there's no guarantee it ever gets called + continueHandshake(); + break; + } + } + + if (totalRead) { + if (readyReadEmittedPointer) + *readyReadEmittedPointer = true; + emit q->readyRead(); + emit q->channelReadyRead(0); + } + } +} + +void QSslSocketBackendPrivate::sendShutdown() +{ + const bool isClient = mode == QSslSocket::SslClientMode; + DWORD shutdownToken = SCHANNEL_SHUTDOWN; + SecBuffer buffer = createSecBuffer(&shutdownToken, sizeof(SCHANNEL_SHUTDOWN), SECBUFFER_TOKEN); + SecBufferDesc token{ + SECBUFFER_VERSION, + 1, + &buffer + }; + auto status = ApplyControlToken(&contextHandle, &token); + + if (status != SEC_E_OK) { +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Failed to apply shutdown control token:" << schannelErrorToString(status); +#endif + return; + } + + SecBuffer outBuffers[3]; + outBuffers[0] = createSecBuffer(nullptr, 0, SECBUFFER_TOKEN); + outBuffers[1] = createSecBuffer(nullptr, 0, SECBUFFER_ALERT); + outBuffers[2] = createSecBuffer(nullptr, 0, SECBUFFER_EMPTY); + auto freeBuffers = qScopeGuard([&outBuffers]() { + for (auto i = 0ull; i < ARRAYSIZE(outBuffers); i++) { + if (outBuffers[i].pvBuffer) + FreeContextBuffer(outBuffers[i].pvBuffer); + } + }); + SecBufferDesc outputBufferDesc{ + SECBUFFER_VERSION, + ARRAYSIZE(outBuffers), + outBuffers + }; + + ULONG contextReq = getContextRequirements(); + TimeStamp expiry; + if (isClient) { + status = InitializeSecurityContext(&credentialHandle, // phCredential + &contextHandle, // phContext + const_reinterpret_cast<SEC_WCHAR *>(targetName().utf16()), // pszTargetName + contextReq, // fContextReq + 0, // Reserved1 + 0, // TargetDataRep (unused) + nullptr, // pInput + 0, // Reserved2 + nullptr, // phNewContext (we already have one) + &outputBufferDesc, // pOutput + &contextAttributes, // pfContextAttr + &expiry // ptsExpiry + ); + } else { + status = AcceptSecurityContext( + &credentialHandle, // phCredential + &contextHandle, // phContext + nullptr, // pInput + contextReq, // fContextReq + 0, // TargetDataRep (unused) + nullptr, // phNewContext + &outputBufferDesc, // pOutput + &contextAttributes, // pfContextAttr, + &expiry // ptsTimeStamp + ); + } + if (status == SEC_E_OK || status == SEC_I_CONTEXT_EXPIRED) { + if (!sendToken(outBuffers[0].pvBuffer, outBuffers[0].cbBuffer, false)) { + // We failed to send the shutdown message, but it's not that important since we're + // shutting down anyway. + return; + } + } else { +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "Failed to initialize shutdown:" << schannelErrorToString(status); +#endif + } +} + +void QSslSocketBackendPrivate::disconnectFromHost() +{ + if (SecIsValidHandle(&contextHandle)) { + if (!shutdown) { + shutdown = true; + if (plainSocket->state() != QAbstractSocket::UnconnectedState) { + if (connectionEncrypted) { + // Read as much as possible because this is likely our last chance + qint64 tempMax = readBufferMaxSize; + readBufferMaxSize = 0; + transmit(); + readBufferMaxSize = tempMax; + sendShutdown(); + } + } + } + } + if (plainSocket->state() != QAbstractSocket::UnconnectedState) + plainSocket->disconnectFromHost(); +} + +void QSslSocketBackendPrivate::disconnected() +{ + shutdown = true; + connectionEncrypted = false; + deallocateContext(); + freeCredentialsHandle(); +} + +QSslCipher QSslSocketBackendPrivate::sessionCipher() const +{ + if (!connectionEncrypted) + return QSslCipher(); + return QSslCipher(QStringLiteral("Schannel"), sessionProtocol()); +} + +QSsl::SslProtocol QSslSocketBackendPrivate::sessionProtocol() const +{ + if (!connectionEncrypted) + return QSsl::SslProtocol::UnknownProtocol; + return toQtSslProtocol(connectionInfo.dwProtocol); +} + +void QSslSocketBackendPrivate::continueHandshake() +{ + Q_Q(QSslSocket); + const bool isServer = mode == QSslSocket::SslServerMode; + switch (schannelState) { + case SchannelState::InitializeHandshake: + if (!SecIsValidHandle(&credentialHandle) && !acquireCredentialsHandle()) { + disconnectFromHost(); + return; + } + if (!SecIsValidHandle(&credentialHandle)) // Needed to support tst_QSslSocket::setEmptyKey + return; + if (!SecIsValidHandle(&contextHandle) && !(isServer ? acceptContext() : createContext())) { + disconnectFromHost(); + return; + } + if (schannelState != SchannelState::PerformHandshake) + break; + Q_FALLTHROUGH(); + case SchannelState::PerformHandshake: + if (!performHandshake()) { + disconnectFromHost(); + return; + } + if (schannelState != SchannelState::VerifyHandshake) + break; + Q_FALLTHROUGH(); + case SchannelState::VerifyHandshake: + // if we're in shutdown or renegotiating then we might not need to verify + // (since we already did) + if (!peerCertVerified && !verifyHandshake()) { + shutdown = true; // Skip sending shutdown alert + q->abort(); // We don't want to send buffered data + disconnectFromHost(); + return; + } + if (schannelState != SchannelState::Done) + break; + Q_FALLTHROUGH(); + case SchannelState::Done: + // connectionEncrypted is already true if we come here from a renegotiation + if (!connectionEncrypted) { + connectionEncrypted = true; // all is done + emit q->encrypted(); + } + renegotiating = false; + if (pendingClose) { + pendingClose = false; + disconnectFromHost(); + } else { + transmit(); + } + break; + case SchannelState::Renegotiate: + if (!renegotiate()) { + disconnectFromHost(); + return; + } + break; + } +} + +QList<QSslCipher> QSslSocketBackendPrivate::defaultCiphers() +{ + QList<QSslCipher> ciphers; + // @temp (I hope), stolen from qsslsocket_winrt.cpp + const QString protocolStrings[] = { QStringLiteral("TLSv1"), QStringLiteral("TLSv1.1"), + QStringLiteral("TLSv1.2"), QStringLiteral("TLSv1.3") }; + const QSsl::SslProtocol protocols[] = { QSsl::TlsV1_0, QSsl::TlsV1_1, + QSsl::TlsV1_2, QSsl::TlsV1_3 }; + const int size = ARRAYSIZE(protocols); + Q_STATIC_ASSERT(size == ARRAYSIZE(protocolStrings)); + ciphers.reserve(size); + for (int i = 0; i < size; ++i) { + QSslCipher cipher; + cipher.d->isNull = false; + cipher.d->name = QStringLiteral("Schannel"); + cipher.d->protocol = protocols[i]; + cipher.d->protocolString = protocolStrings[i]; + ciphers.append(cipher); + } + + return ciphers; +} + +QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> &certificateChain, + const QString &hostName) +{ + Q_UNUSED(certificateChain); + Q_UNUSED(hostName); + + Q_UNIMPLEMENTED(); + return {}; // @future implement(?) +} + +bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device, QSslKey *key, QSslCertificate *cert, + QList<QSslCertificate> *caCertificates, + const QByteArray &passPhrase) +{ + Q_UNUSED(device); + Q_UNUSED(key); + Q_UNUSED(cert); + Q_UNUSED(caCertificates); + Q_UNUSED(passPhrase); + // @future: can load into its own certificate store (encountered problems extracting key). + Q_UNIMPLEMENTED(); + return false; +} + +/* + Copied from qsslsocket_mac.cpp, which was copied from qsslsocket_openssl.cpp +*/ +bool QSslSocketBackendPrivate::checkSslErrors() +{ + if (sslErrors.isEmpty()) + return true; + Q_Q(QSslSocket); + + emit q->sslErrors(sslErrors); + + const bool doVerifyPeer = configuration.peerVerifyMode == QSslSocket::VerifyPeer + || (configuration.peerVerifyMode == QSslSocket::AutoVerifyPeer + && mode == QSslSocket::SslClientMode); + const bool doEmitSslError = !verifyErrorsHaveBeenIgnored(); + // check whether we need to emit an SSL handshake error + if (doVerifyPeer && doEmitSslError) { + if (q->pauseMode() & QAbstractSocket::PauseOnSslErrors) { + pauseSocketNotifiers(q); + paused = true; + } else { + setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, + sslErrors.constFirst().errorString()); + plainSocket->disconnectFromHost(); + } + return false; + } + + return true; +} + +void QSslSocketBackendPrivate::initializeCertificateStores() +{ + //// helper function which turns a chain into a certificate store + auto createStoreFromCertificateChain = [](const QList<QSslCertificate> certChain, const QSslKey &privateKey) { + const wchar_t *passphrase = L""; + // Need to embed the private key in the certificate + QByteArray pkcs12 = _q_makePkcs12(certChain, + privateKey, + QString::fromWCharArray(passphrase, 0)); + CRYPT_DATA_BLOB pfxBlob; + pfxBlob.cbData = DWORD(pkcs12.length()); + pfxBlob.pbData = reinterpret_cast<unsigned char *>(pkcs12.data()); + return QHCertStorePointer(PFXImportCertStore(&pfxBlob, passphrase, 0)); + }; + + if (!configuration.localCertificateChain.isEmpty()) { + if (configuration.privateKey.isNull()) { + setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError, + QSslSocket::tr("Cannot provide a certificate with no key")); + return; + } + if (localCertificateStore == nullptr) { + localCertificateStore = createStoreFromCertificateChain(configuration.localCertificateChain, + configuration.privateKey); + if (localCertificateStore == nullptr) + qCWarning(lcSsl, "Failed to load certificate chain!"); + } + } + + if (!configuration.caCertificates.isEmpty() && !caCertificateStore) { + caCertificateStore = createStoreFromCertificateChain(configuration.caCertificates, + {}); // No private key for the CA certs + } +} + +bool QSslSocketBackendPrivate::verifyCertContext(CERT_CONTEXT *certContext) +{ + Q_ASSERT(certContext); + Q_Q(QSslSocket); + + const bool isClient = mode == QSslSocket::SslClientMode; + + // Create a collection of stores so we can pass in multiple stores as additional locations to + // search for the certificate chain + auto tempCertCollection = QHCertStorePointer(CertOpenStore(CERT_STORE_PROV_COLLECTION, + X509_ASN_ENCODING, + 0, + CERT_STORE_CREATE_NEW_FLAG, + nullptr)); + if (!tempCertCollection) { +#ifdef QSSLSOCKET_DEBUG + qCWarning(lcSsl, "Failed to create certificate store collection!"); +#endif + return false; + } + + if (rootCertOnDemandLoadingAllowed()) { + // @future(maybe): following the OpenSSL backend these certificates should be added into + // the Ca list, not just included during verification. + // That being said, it's not trivial to add the root certificates (if and only if they + // came from the system root store). And I don't see this mentioned in our documentation. + auto rootStore = QHCertStorePointer(CertOpenSystemStore(0, L"ROOT")); + if (!rootStore) { +#ifdef QSSLSOCKET_DEBUG + qCWarning(lcSsl, "Failed to open the system root CA certificate store!"); +#endif + return false; + } else if (!CertAddStoreToCollection(tempCertCollection.get(), rootStore.get(), 0, 1)) { +#ifdef QSSLSOCKET_DEBUG + qCWarning(lcSsl, "Failed to add the system root CA certificate store to the certificate store collection!"); +#endif + return false; + } + } + if (caCertificateStore) { + if (!CertAddStoreToCollection(tempCertCollection.get(), caCertificateStore.get(), 0, 1)) { +#ifdef QSSLSOCKET_DEBUG + qCWarning(lcSsl, "Failed to add the user's CA certificate store to the certificate store collection!"); +#endif + return false; + } + } + + if (!CertAddStoreToCollection(tempCertCollection.get(), certContext->hCertStore, 0, 0)) { +#ifdef QSSLSOCKET_DEBUG + qCWarning(lcSsl, "Failed to add certificate's origin store to the certificate store collection!"); +#endif + return false; + } + + CERT_CHAIN_PARA parameters; + ZeroMemory(¶meters, sizeof(parameters)); + parameters.cbSize = sizeof(CERT_CHAIN_PARA); + parameters.RequestedUsage.dwType = USAGE_MATCH_TYPE_AND; + parameters.RequestedUsage.Usage.cUsageIdentifier = 1; + LPSTR oid = LPSTR(isClient ? szOID_PKIX_KP_SERVER_AUTH + : szOID_PKIX_KP_CLIENT_AUTH); + parameters.RequestedUsage.Usage.rgpszUsageIdentifier = &oid; + + configuration.peerCertificate.clear(); + configuration.peerCertificateChain.clear(); + const CERT_CHAIN_CONTEXT *chainContext = nullptr; + auto freeCertChain = qScopeGuard([&chainContext]() { + if (chainContext) + CertFreeCertificateChain(chainContext); + }); + BOOL status = CertGetCertificateChain(nullptr, // hChainEngine, default + certContext, // pCertContext + nullptr, // pTime, 'now' + tempCertCollection.get(), // hAdditionalStore, additional cert store + ¶meters, // pChainPara + CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, // dwFlags + nullptr, // reserved + &chainContext // ppChainContext + ); + if (status == FALSE || !chainContext || chainContext->cChain == 0) { + QSslError error(QSslError::UnableToVerifyFirstCertificate); + sslErrors += error; + emit q->peerVerifyError(error); + return q->state() == QAbstractSocket::ConnectedState; + } + + // Helper-function to get a QSslCertificate given a CERT_CHAIN_ELEMENT + static auto getCertificateFromChainElement = [](CERT_CHAIN_ELEMENT *element) { + if (!element) + return QSslCertificate(); + + const CERT_CONTEXT *certContext = element->pCertContext; + return QSslCertificatePrivate::QSslCertificate_from_CERT_CONTEXT(certContext); + }; + + // Pick a chain to use as the certificate chain, if multiple are available: + // According to https://docs.microsoft.com/en-gb/windows/desktop/api/wincrypt/ns-wincrypt-_cert_chain_context + // this seems to be the best way to get a trusted chain. + CERT_SIMPLE_CHAIN *chain = chainContext->rgpChain[chainContext->cChain - 1]; + + if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN) { + auto error = QSslError(QSslError::SslError::UnableToGetIssuerCertificate, + getCertificateFromChainElement(chain->rgpElement[chain->cElement - 1])); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_INVALID_BASIC_CONSTRAINTS) { + // @Note: This is actually one of two errors: + // "either the certificate cannot be used to issue other certificates, or the chain path length has been exceeded." + // But here we are checking the chain's status, so we assume the "issuing" error cannot occur here. + auto error = QSslError(QSslError::PathLengthExceeded); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + static const DWORD leftoverCertChainErrorMask = CERT_TRUST_IS_CYCLIC | CERT_TRUST_INVALID_EXTENSION + | CERT_TRUST_INVALID_POLICY_CONSTRAINTS | CERT_TRUST_INVALID_NAME_CONSTRAINTS + | CERT_TRUST_CTL_IS_NOT_TIME_VALID | CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID + | CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE; + if (chain->TrustStatus.dwErrorStatus & leftoverCertChainErrorMask) { + auto error = QSslError(QSslError::SslError::UnspecifiedError); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + + DWORD verifyDepth = chain->cElement; + if (configuration.peerVerifyDepth > 0 && DWORD(configuration.peerVerifyDepth) < verifyDepth) + verifyDepth = DWORD(configuration.peerVerifyDepth); + + for (DWORD i = 0; i < verifyDepth; i++) { + CERT_CHAIN_ELEMENT *element = chain->rgpElement[i]; + QSslCertificate certificate = getCertificateFromChainElement(element); + const QList<QSslCertificateExtension> extensions = certificate.extensions(); + +#ifdef QSSLSOCKET_DEBUG + qCDebug(lcSsl) << "issuer:" << certificate.issuerDisplayName() + << "\nsubject:" << certificate.subjectDisplayName() + << "\nQSslCertificate info:" << certificate + << "\nextended error info:" << element->pwszExtendedErrorInfo + << "\nerror status:" << element->TrustStatus.dwErrorStatus; +#endif + + configuration.peerCertificateChain.append(certificate); + + if (certificate.isBlacklisted()) { + const auto error = QSslError(QSslError::CertificateBlacklisted, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + + LONG result = CertVerifyTimeValidity(nullptr /*== now */, element->pCertContext->pCertInfo); + if (result != 0) { + auto error = QSslError(result == -1 ? QSslError::CertificateNotYetValid + : QSslError::CertificateExpired, + certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + + //// Errors + if (element->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) { + // handled right above + Q_ASSERT(!sslErrors.isEmpty()); + } + if (element->TrustStatus.dwErrorStatus & CERT_TRUST_IS_REVOKED) { + auto error = QSslError(QSslError::CertificateRevoked, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + if (element->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_SIGNATURE_VALID) { + auto error = QSslError(QSslError::CertificateSignatureFailed, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + + // While netscape shouldn't be relevant now it defined an extension which is + // still in use. Schannel does not check this automatically, so we do it here. + // It is used to differentiate between client and server certificates. + if (netscapeWrongCertType(extensions, isClient)) + element->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + + if (element->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { + auto error = QSslError(QSslError::InvalidPurpose, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + if (element->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT) { + // Override this error if we have the certificate inside our trusted CAs list. + const bool isTrustedRoot = configuration.caCertificates.contains(certificate); + if (!isTrustedRoot) { + auto error = QSslError(QSslError::CertificateUntrusted, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + } + static const DWORD certRevocationCheckUnavailableError = CERT_TRUST_IS_OFFLINE_REVOCATION + | CERT_TRUST_REVOCATION_STATUS_UNKNOWN; + if (element->TrustStatus.dwErrorStatus & certRevocationCheckUnavailableError) { + // @future(maybe): Do something with this + } + + // Dumping ground of errors that don't fit our specific errors + static const DWORD leftoverCertErrorMask = CERT_TRUST_IS_CYCLIC + | CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS + | CERT_TRUST_INVALID_POLICY_CONSTRAINTS + | CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT + | CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT + | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT + | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT + | CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; + if (element->TrustStatus.dwErrorStatus & leftoverCertErrorMask) { + auto error = QSslError(QSslError::UnspecifiedError, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + if (element->TrustStatus.dwErrorStatus & CERT_TRUST_INVALID_BASIC_CONSTRAINTS) { + auto it = std::find_if(extensions.cbegin(), extensions.cend(), + [](const QSslCertificateExtension &extension) { + return extension.name() == QLatin1String("basicConstraints"); + }); + if (it != extensions.cend()) { + // @Note: This is actually one of two errors: + // "either the certificate cannot be used to issue other certificates, + // or the chain path length has been exceeded." + QVariantMap basicConstraints = it->value().toMap(); + QSslError error; + if (i > 0 && !basicConstraints.value(QLatin1String("ca"), false).toBool()) + error = QSslError(QSslError::InvalidPurpose, certificate); + else + error = QSslError(QSslError::PathLengthExceeded, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + } + if (element->TrustStatus.dwErrorStatus & CERT_TRUST_IS_EXPLICIT_DISTRUST) { + auto error = QSslError(QSslError::CertificateBlacklisted, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + + if (element->TrustStatus.dwInfoStatus & CERT_TRUST_IS_SELF_SIGNED) { + // If it's self-signed *and* a CA then we can assume it's a root CA certificate + // and we can ignore the "self-signed" note: + // We check the basicConstraints certificate extension when possible, but this didn't + // exist for version 1, so we can only guess in that case + const bool isRootCertificateAuthority = isCertificateAuthority(extensions) + || certificate.version() == "1"; + + // Root certificate tends to be signed by themselves, so ignore self-signed status. + if (!isRootCertificateAuthority) { + auto error = QSslError(QSslError::SelfSignedCertificate, certificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + } + } + + if (!configuration.peerCertificateChain.isEmpty()) + configuration.peerCertificate = configuration.peerCertificateChain.first(); + + // @Note: Somewhat copied from qsslsocket_mac.cpp + const bool doVerifyPeer = configuration.peerVerifyMode == QSslSocket::VerifyPeer + || (configuration.peerVerifyMode == QSslSocket::AutoVerifyPeer + && mode == QSslSocket::SslClientMode); + // Check the peer certificate itself. First try the subject's common name + // (CN) as a wildcard, then try all alternate subject name DNS entries the + // same way. + if (!configuration.peerCertificate.isNull()) { + // but only if we're a client connecting to a server + // if we're the server, don't check CN + if (mode == QSslSocket::SslClientMode) { + const QString peerName(verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName); + if (!isMatchingHostname(configuration.peerCertificate, peerName)) { + // No matches in common names or alternate names. + const QSslError error(QSslError::HostNameMismatch, configuration.peerCertificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + } + } else if (doVerifyPeer) { + // No peer certificate presented. Report as error if the socket + // expected one. + const QSslError error(QSslError::NoPeerCertificate); + sslErrors += error; + emit q->peerVerifyError(error); + if (q->state() != QAbstractSocket::ConnectedState) + return false; + } + + return true; +} + +bool QSslSocketBackendPrivate::rootCertOnDemandLoadingAllowed() +{ + return allowRootCertOnDemandLoading && s_loadRootCertsOnDemand; +} + +QT_END_NAMESPACE diff --git a/src/network/ssl/qsslsocket_schannel_p.h b/src/network/ssl/qsslsocket_schannel_p.h new file mode 100644 index 0000000000..9879e2fc60 --- /dev/null +++ b/src/network/ssl/qsslsocket_schannel_p.h @@ -0,0 +1,155 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtNetwork module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSSLSOCKET_SCHANNEL_P_H +#define QSSLSOCKET_SCHANNEL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QT_REQUIRE_CONFIG(schannel); + +#include <QtNetwork/private/qtnetworkglobal_p.h> + +#include "qsslsocket_p.h" + +#define SECURITY_WIN32 +#include <security.h> +#include <schnlsp.h> +#undef SECURITY_WIN32 + +#include <memory> + +QT_BEGIN_NAMESPACE + +struct QHCertStoreDeleter { + void operator()(HCERTSTORE store) + { + CertCloseStore(store, 0); + } +}; +typedef std::unique_ptr<void, QHCertStoreDeleter> QHCertStorePointer; + +class QSslSocketBackendPrivate final : public QSslSocketPrivate +{ + Q_DISABLE_COPY_MOVE(QSslSocketBackendPrivate) + Q_DECLARE_PUBLIC(QSslSocket) +public: + QSslSocketBackendPrivate(); + ~QSslSocketBackendPrivate(); + + // Platform specific functions + void startClientEncryption() override; + void startServerEncryption() override; + void transmit() override; + void disconnectFromHost() override; + void disconnected() override; + QSslCipher sessionCipher() const override; + QSsl::SslProtocol sessionProtocol() const override; + void continueHandshake() override; + + static QList<QSslCipher> defaultCiphers(); + static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, + const QString &hostName); + static bool importPkcs12(QIODevice *device, QSslKey *key, QSslCertificate *cert, + QList<QSslCertificate> *caCertificates, const QByteArray &passPhrase); + +private: + enum class SchannelState { + InitializeHandshake, // create and transmit context (client)/accept context (server) + PerformHandshake, // get token back, process it + VerifyHandshake, // Verify that things are OK + Done, // Connection encrypted! + Renegotiate // Renegotiating! + } schannelState = SchannelState::InitializeHandshake; + + void reset(); + bool acquireCredentialsHandle(); + ULONG getContextRequirements(); + bool createContext(); // for clients + bool acceptContext(); // for server + bool performHandshake(); + bool verifyHandshake(); + bool renegotiate(); + + bool sendToken(void *token, unsigned long tokenLength, bool emitError = true); + QString targetName() const; + + bool checkSslErrors(); + void deallocateContext(); + void freeCredentialsHandle(); + void closeCertificateStores(); + void sendShutdown(); + + void initializeCertificateStores(); + bool verifyCertContext(CERT_CONTEXT *certContext); + + bool rootCertOnDemandLoadingAllowed(); + + SecPkgContext_ConnectionInfo connectionInfo = {}; + SecPkgContext_StreamSizes streamSizes = {}; + + CredHandle credentialHandle; // Initialized in ctor + CtxtHandle contextHandle; // Initialized in ctor + + QByteArray intermediateBuffer; // data which is left-over or incomplete + + QHCertStorePointer localCertificateStore = nullptr; + QHCertStorePointer peerCertificateStore = nullptr; + QHCertStorePointer caCertificateStore = nullptr; + + const CERT_CONTEXT *localCertContext = nullptr; + + ULONG contextAttributes = 0; + + bool renegotiating = false; + bool peerCertVerified = false; +}; + +QT_END_NAMESPACE + +#endif // QSSLSOCKET_SCHANNEL_P_H diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp index cc69b9ac96..d54ac2ad73 100644 --- a/src/network/ssl/qsslsocket_winrt.cpp +++ b/src/network/ssl/qsslsocket_winrt.cpp @@ -207,9 +207,9 @@ void QSslSocketPrivate::resetDefaultCiphers() QList<QSslCipher> QSslSocketBackendPrivate::defaultCiphers() { QList<QSslCipher> ciphers; - const QString protocolStrings[] = { QStringLiteral("SSLv3"), QStringLiteral("TLSv1"), + const QString protocolStrings[] = { QStringLiteral("TLSv1"), QStringLiteral("TLSv1.1"), QStringLiteral("TLSv1.2") }; - const QSsl::SslProtocol protocols[] = { QSsl::SslV3, QSsl::TlsV1_0, QSsl::TlsV1_1, QSsl::TlsV1_2 }; + const QSsl::SslProtocol protocols[] = { QSsl::TlsV1_0, QSsl::TlsV1_1, QSsl::TlsV1_2 }; const int size = static_cast<int>(ARRAYSIZE(protocols)); ciphers.reserve(size); for (int i = 0; i < size; ++i) { @@ -234,10 +234,14 @@ void QSslSocketBackendPrivate::startClientEncryption() QSsl::SslProtocol protocol = q->protocol(); switch (q->protocol()) { - case QSsl::AnyProtocol: + case QSsl::SslV2: case QSsl::SslV3: + setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError, + QStringLiteral("unsupported protocol")); + return; + case QSsl::AnyProtocol: case QSsl::TlsV1SslV3: - protectionLevel = SocketProtectionLevel_Ssl; // Only use this value if weak cipher support is required + protectionLevel = SocketProtectionLevel_Tls10; break; case QSsl::TlsV1_0: protectionLevel = SocketProtectionLevel_Tls10; diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 6975264038..8bb70a2aed 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -29,7 +29,9 @@ qtConfig(ssl) { ssl/qsslsocket.h \ ssl/qsslsocket_p.h \ ssl/qsslpresharedkeyauthenticator.h \ - ssl/qsslpresharedkeyauthenticator_p.h + ssl/qsslpresharedkeyauthenticator_p.h \ + ssl/qocspresponse.h \ + ssl/qocspresponse_p.h SOURCES += ssl/qsslconfiguration.cpp \ ssl/qsslcipher.cpp \ ssl/qssldiffiehellmanparameters.cpp \ @@ -37,7 +39,8 @@ qtConfig(ssl) { ssl/qsslkey_p.cpp \ ssl/qsslerror.cpp \ ssl/qsslsocket.cpp \ - ssl/qsslpresharedkeyauthenticator.cpp + ssl/qsslpresharedkeyauthenticator.cpp \ + ssl/qocspresponse.cpp winrt { HEADERS += ssl/qsslsocket_winrt_p.h @@ -49,6 +52,19 @@ qtConfig(ssl) { ssl/qsslellipticcurve_dummy.cpp } + qtConfig(schannel) { + HEADERS += ssl/qsslsocket_schannel_p.h + SOURCES += ssl/qsslsocket_schannel.cpp \ + ssl/qsslcertificate_schannel.cpp \ + ssl/qsslkey_schannel.cpp \ + ssl/qsslkey_qt.cpp \ + ssl/qssldiffiehellmanparameters_dummy.cpp \ + ssl/qsslellipticcurve_dummy.cpp \ + ssl/qsslsocket_qt.cpp + + LIBS_PRIVATE += "-lSecur32" "-lCrypt32" "-lbcrypt" "-lncrypt" + } + qtConfig(securetransport) { HEADERS += ssl/qsslsocket_mac_p.h SOURCES += ssl/qssldiffiehellmanparameters_dummy.cpp \ @@ -56,6 +72,7 @@ qtConfig(ssl) { ssl/qsslkey_mac.cpp \ ssl/qsslsocket_mac_shared.cpp \ ssl/qsslsocket_mac.cpp \ + ssl/qsslsocket_qt.cpp \ ssl/qsslellipticcurve_dummy.cpp } @@ -83,6 +100,8 @@ qtConfig(ssl) { SOURCES += ssl/qdtls_openssl.cpp } + qtConfig(ocsp): HEADERS += ssl/qocsp_p.h + qtConfig(opensslv11) { HEADERS += ssl/qsslsocket_openssl11_symbols_p.h SOURCES += ssl/qsslsocket_openssl11.cpp \ diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf index 6ff6cae2cb..2d38a5d2af 100644 --- a/src/opengl/doc/qtopengl.qdocconf +++ b/src/opengl/doc/qtopengl.qdocconf @@ -23,6 +23,8 @@ depends += qtdoc qtcore qtgui qtwidgets qmake examplesinstallpath = opengl +tagfile = qtopengl.tags + # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in # Qt Assistant and/or Qt Creator. diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index d1ed621790..abf5b8ea48 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -160,7 +160,7 @@ public: void setTranslateZ(GLfloat z); private: - Q_DISABLE_COPY(QGL2PaintEngineEx) + Q_DISABLE_COPY_MOVE(QGL2PaintEngineEx) }; class QGL2PaintEngineExPrivate : public QPaintEngineExPrivate, protected QOpenGLExtensions diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index ba4a1dcaa1..8ef53afaea 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -3880,12 +3880,9 @@ void QGLContext::doneCurrent() */ QGLWidget::QGLWidget(QWidget *parent, const QGLWidget* shareWidget, Qt::WindowFlags f) - : QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC) + : QWidget(*(new QGLWidgetPrivate), parent, f) { Q_D(QGLWidget); - setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_NoSystemBackground); - setAutoFillBackground(true); // for compatibility d->init(new QGLContext(QGLFormat::defaultFormat(), this), shareWidget); } @@ -3893,12 +3890,9 @@ QGLWidget::QGLWidget(QWidget *parent, const QGLWidget* shareWidget, Qt::WindowFl \internal */ QGLWidget::QGLWidget(QGLWidgetPrivate &dd, const QGLFormat &format, QWidget *parent, const QGLWidget *shareWidget, Qt::WindowFlags f) - : QWidget(dd, parent, f | Qt::MSWindowsOwnDC) + : QWidget(dd, parent, f) { Q_D(QGLWidget); - setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_NoSystemBackground); - setAutoFillBackground(true); // for compatibility d->init(new QGLContext(format, this), shareWidget); } @@ -3935,12 +3929,9 @@ QGLWidget::QGLWidget(QGLWidgetPrivate &dd, const QGLFormat &format, QWidget *par QGLWidget::QGLWidget(const QGLFormat &format, QWidget *parent, const QGLWidget* shareWidget, Qt::WindowFlags f) - : QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC) + : QWidget(*(new QGLWidgetPrivate), parent, f) { Q_D(QGLWidget); - setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_NoSystemBackground); - setAutoFillBackground(true); // for compatibility d->init(new QGLContext(format, this), shareWidget); } @@ -3971,12 +3962,9 @@ QGLWidget::QGLWidget(const QGLFormat &format, QWidget *parent, const QGLWidget* */ QGLWidget::QGLWidget(QGLContext *context, QWidget *parent, const QGLWidget *shareWidget, Qt::WindowFlags f) - : QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC) + : QWidget(*(new QGLWidgetPrivate), parent, f) { Q_D(QGLWidget); - setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_NoSystemBackground); - setAutoFillBackground(true); // for compatibility d->init(context, shareWidget); } @@ -4131,14 +4119,14 @@ void QGLWidget::swapBuffers() /*! \fn const QGLContext* QGLWidget::overlayContext() const - Returns the overlay context of this widget, or 0 if this widget - has no overlay. + Returns the overlay context of this widget, or \nullptr if this + widget has no overlay. \sa context() */ const QGLContext* QGLWidget::overlayContext() const { - return 0; + return nullptr; } /*! @@ -5169,6 +5157,15 @@ QPaintEngine *QGLWidget::paintEngine() const void QGLWidgetPrivate::init(QGLContext *context, const QGLWidget *shareWidget) { + Q_Q(QGLWidget); + q->setAttribute(Qt::WA_PaintOnScreen); + q->setAttribute(Qt::WA_NoSystemBackground); + q->setAutoFillBackground(true); // for compatibility + + mustHaveWindowHandle = 1; + q->setAttribute(Qt::WA_NativeWindow); + q->setWindowFlag(Qt::MSWindowsOwnDC); + initContext(context, shareWidget); } diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index a1ba0485e0..f5accbeb3c 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -51,22 +51,6 @@ #include <QtGui/QSurfaceFormat> -#if defined(Q_CLANG_QDOC) -#undef GLint -typedef int GLint; -#undef GLuint -typedef unsigned int GLuint; -#undef GLenum -typedef unsigned int GLenum; -#undef GLclampf -typedef float GLclampf; -#undef GLsizei -typedef int GLsizei; -#undef GLboolean -typedef bool GLboolean; -#endif - - QT_BEGIN_NAMESPACE diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index dfdef44b54..3ce88197d2 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -46,17 +46,6 @@ #include <QtGui/qvector4d.h> #include <QtGui/qmatrix4x4.h> -#if defined(Q_CLANG_QDOC) -#undef GLfloat -typedef double GLfloat; -#undef GLint -typedef int GLint; -#undef GLuint -typedef unsigned int GLuint; -#undef GLenum -typedef unsigned int GLenum; -#endif - QT_BEGIN_NAMESPACE diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h index 9efcecd25f..1a32f24d70 100644 --- a/src/opengl/qgraphicsshadereffect_p.h +++ b/src/opengl/qgraphicsshadereffect_p.h @@ -80,7 +80,7 @@ protected: private: Q_DECLARE_PRIVATE(QGraphicsShaderEffect) - Q_DISABLE_COPY(QGraphicsShaderEffect) + Q_DISABLE_COPY_MOVE(QGraphicsShaderEffect) friend class QGLCustomShaderEffectStage; }; diff --git a/src/platformheaders/doc/qtplatformheaders.qdocconf b/src/platformheaders/doc/qtplatformheaders.qdocconf index 1ff6fe7a21..9a034e7671 100644 --- a/src/platformheaders/doc/qtplatformheaders.qdocconf +++ b/src/platformheaders/doc/qtplatformheaders.qdocconf @@ -35,5 +35,7 @@ sourcedirs += .. exampledirs += snippets imagedirs += images +tagfile = qtplatformheaders.tags + navigation.landingpage = "Qt Platform Headers" navigation.cppclassespage = "Qt Platform Headers C++ Classes" diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h index e51c2fde67..032dcafa6e 100644 --- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h +++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h @@ -81,6 +81,15 @@ public: func(window, border); } + typedef void (*SetHasBorderInFullScreenDefault)(bool border); + static const QByteArray setHasBorderInFullScreenDefaultIdentifier() { return QByteArrayLiteral("WindowsSetHasBorderInFullScreenDefault"); } + static void setHasBorderInFullScreenDefault(bool border) + { + auto func = reinterpret_cast<SetHasBorderInFullScreenDefault>(QGuiApplication::platformFunction(setHasBorderInFullScreenDefaultIdentifier())); + if (func) + func(border); + } + typedef void (*SetWindowActivationBehaviorType)(WindowActivationBehavior); static const QByteArray setWindowActivationBehaviorIdentifier() { return QByteArrayLiteral("WindowsSetWindowActivationBehavior"); } diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc index a52bbe061b..0c52cde753 100644 --- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc +++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions.qdoc @@ -93,7 +93,40 @@ is true then it will enable the WS_BORDER flag in full screen mode to enable other top level windows inside the application to appear on top when required. + \note The setting must be applied before showing the window or switching it + to full screen. For QML, setHasBorderInFullScreenDefault() can be used to + set a default value. + + See also \l [QtDoc] {Fullscreen OpenGL Based Windows} +*/ + +/*! + \typedef QWindowsWindowFunctions::SetHasBorderInFullScreenDefault + \since 5.13 + + This is the typedef for the function returned by QGuiApplication::platformFunction + when passed setHasBorderInFullScreenDefaultIdentifier. +*/ + +/*! + \fn QByteArray QWindowsWindowFunctions::setHasBorderInFullScreenDefaultIdentifier() + \since 5.13 + + This function returns the bytearray that can be used to query + QGuiApplication::platformFunction to retrieve the SetHasBorderInFullScreen function. +*/ + +/*! + \fn void QWindowsWindowFunctions::setHasBorderInFullScreenDefault(bool border) + \since 5.13 + + This is a convenience function that can be used directly instead of resolving + the function pointer. \a border will be relayed to the function retrieved by + QGuiApplication. When \a border is true, the WS_BORDER flag will be set + in full screen mode for all windows by default. + See also \l [QtDoc] {Fullscreen OpenGL Based Windows} + \sa setHasBorderInFullScreen() */ /*! diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_p.h index e3c22b0b37..b1ce14b5c3 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_p.h +++ b/src/platformsupport/devicediscovery/qdevicediscovery_p.h @@ -96,7 +96,7 @@ signals: protected: QDeviceDiscovery(QDeviceTypes types, QObject *parent) : QObject(parent), m_types(types) { } - Q_DISABLE_COPY(QDeviceDiscovery) + Q_DISABLE_COPY_MOVE(QDeviceDiscovery) QDeviceTypes m_types; }; diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp index 9d8bf07af8..c0e528f922 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp @@ -332,14 +332,6 @@ void QEGLPlatformContext::updateFormatFromGL() QByteArray version = QByteArray(reinterpret_cast<const char *>(s)); int major, minor; if (QPlatformOpenGLContext::parseOpenGLVersion(version, major, minor)) { -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED) - // Some Android 4.2.2 devices report OpenGL ES 3.0 without the functions being available. - static int apiLevel = QtAndroidPrivate::androidSdkVersion(); - if (apiLevel <= 17 && major >= 3) { - major = 2; - minor = 0; - } -#endif m_format.setMajorVersion(major); m_format.setMinorVersion(minor); } diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp index 04a5026395..381db1ed12 100644 --- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp +++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp @@ -1556,7 +1556,7 @@ QFontEngineFT::QGlyphSet *QFontEngineFT::loadGlyphSet(const QTransform &matrix) gs = &transformedGlyphSets[0]; gs->clear(); gs->transformationMatrix = m; - gs->outline_drawing = fontDef.pixelSize * fontDef.pixelSize * qAbs(matrix.det()) >= QT_MAX_CACHED_GLYPH_SIZE * QT_MAX_CACHED_GLYPH_SIZE; + gs->outline_drawing = fontDef.pixelSize * fontDef.pixelSize * qAbs(matrix.determinant()) > QT_MAX_CACHED_GLYPH_SIZE * QT_MAX_CACHED_GLYPH_SIZE; } Q_ASSERT(gs != 0); diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp index 40ac46df85..aa2d36423d 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp @@ -1952,13 +1952,13 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q } else { HGDIOBJ oldFont = SelectObject(data->hdc, hfont); + const QFont::HintingPreference hintingPreference = + static_cast<QFont::HintingPreference>(request.hintingPreference); + bool useDw = useDirectWrite(hintingPreference, fam); + IDWriteFontFace *directWriteFontFace = NULL; HRESULT hr = data->directWriteGdiInterop->CreateFontFaceFromHdc(data->hdc, &directWriteFontFace); - if (FAILED(hr)) { - const QString errorString = qt_error_string(int(hr)); - qWarning().noquote().nospace() << "DirectWrite: CreateFontFaceFromHDC() failed (" - << errorString << ") for " << request << ' ' << lf << " dpi=" << dpi; - } else { + if (SUCCEEDED(hr)) { bool isColorFont = false; #if defined(QT_USE_DIRECTWRITE2) IDWriteFontFace2 *directWriteFontFace2 = nullptr; @@ -1968,9 +1968,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q isColorFont = directWriteFontFace2->GetPaletteEntryCount() > 0; } #endif - const QFont::HintingPreference hintingPreference = - static_cast<QFont::HintingPreference>(request.hintingPreference); - const bool useDw = useDirectWrite(hintingPreference, fam, isColorFont); + useDw = useDw || useDirectWrite(hintingPreference, fam, isColorFont); qCDebug(lcQpaFonts) << __FUNCTION__ << request.family << request.pointSize << "pt" << "hintingPreference=" << hintingPreference << "color=" << isColorFont << dpi << "dpi" << "useDirectWrite=" << useDw; @@ -1992,6 +1990,10 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q } else { directWriteFontFace->Release(); } + } else if (useDw) { + const QString errorString = qt_error_string(int(hr)); + qWarning().noquote().nospace() << "DirectWrite: CreateFontFaceFromHDC() failed (" + << errorString << ") for " << request << ' ' << lf << " dpi=" << dpi; } SelectObject(data->hdc, oldFont); diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h index afba86bbe1..b85a2dceee 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h @@ -67,7 +67,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcQpaFonts) class QWindowsFontEngineData { - Q_DISABLE_COPY(QWindowsFontEngineData) + Q_DISABLE_COPY_MOVE(QWindowsFontEngineData) public: QWindowsFontEngineData(); ~QWindowsFontEngineData(); @@ -85,7 +85,7 @@ public: class QWindowsFontDatabase : public QPlatformFontDatabase { - Q_DISABLE_COPY(QWindowsFontDatabase) + Q_DISABLE_COPY_MOVE(QWindowsFontDatabase) public: enum FontOptions { // Relevant bits from QWindowsIntegration::Options diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h index 2b575a9b45..b1b9d828ac 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h @@ -66,7 +66,7 @@ class QWindowsFontEngineData; class QWindowsFontEngine : public QFontEngine { - Q_DISABLE_COPY(QWindowsFontEngine) + Q_DISABLE_COPY_MOVE(QWindowsFontEngine) public: QWindowsFontEngine(const QString &name, LOGFONT lf, const QSharedPointer<QWindowsFontEngineData> &fontEngineData); diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp index 57c41938bc..60a5896e7b 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp @@ -69,7 +69,7 @@ namespace { class GeometrySink: public IDWriteGeometrySink { - Q_DISABLE_COPY(GeometrySink) + Q_DISABLE_COPY_MOVE(GeometrySink) public: GeometrySink(QPainterPath *path) : m_refCount(0), m_path(path) diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h index 9326f5aece..3eaf8cf3d8 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h @@ -72,7 +72,7 @@ class QWindowsFontEngineData; class QWindowsFontEngineDirectWrite : public QFontEngine { - Q_DISABLE_COPY(QWindowsFontEngineDirectWrite) + Q_DISABLE_COPY_MOVE(QWindowsFontEngineDirectWrite) public: explicit QWindowsFontEngineDirectWrite(IDWriteFontFace *directWriteFontFace, qreal pixelSize, diff --git a/src/platformsupport/fontdatabases/windows/qwindowsnativeimage_p.h b/src/platformsupport/fontdatabases/windows/qwindowsnativeimage_p.h index 6c47a527d2..ed68ac2644 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsnativeimage_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsnativeimage_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QWindowsNativeImage { - Q_DISABLE_COPY(QWindowsNativeImage) + Q_DISABLE_COPY_MOVE(QWindowsNativeImage) public: QWindowsNativeImage(int width, int height, QImage::Format format); diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index 6bd73de8f3..40521ef6da 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -223,14 +223,15 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format continue; } - QXlibPointer<XVisualInfo> visual(glXGetVisualFromFBConfig(display, candidate)); - if (visual.isNull()) - continue; + int actualRed; + int actualGreen; + int actualBlue; + int actualAlpha; + glXGetFBConfigAttrib(display, candidate, GLX_RED_SIZE, &actualRed); + glXGetFBConfigAttrib(display, candidate, GLX_GREEN_SIZE, &actualGreen); + glXGetFBConfigAttrib(display, candidate, GLX_BLUE_SIZE, &actualBlue); + glXGetFBConfigAttrib(display, candidate, GLX_ALPHA_SIZE, &actualAlpha); - const int actualRed = qPopulationCount(visual->red_mask); - const int actualGreen = qPopulationCount(visual->green_mask); - const int actualBlue = qPopulationCount(visual->blue_mask); - const int actualAlpha = visual->depth - actualRed - actualGreen - actualBlue; if (requestedRed && actualRed < requestedRed) continue; diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h index 5498a3e4f0..21e6d055a0 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h @@ -132,7 +132,7 @@ inline QDataStream &operator<<(QDataStream &ds, const QEvdevKeyboardMap::Composi class QFdContainer { int m_fd; - Q_DISABLE_COPY(QFdContainer); + Q_DISABLE_COPY_MOVE(QFdContainer); public: explicit QFdContainer(int fd = -1) Q_DECL_NOTHROW : m_fd(fd) {} ~QFdContainer() { reset(); } diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp index e81d272d4f..ca740f967e 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp @@ -52,6 +52,9 @@ #include <qdebug.h> #include <qrect.h> #include <qloggingcategory.h> +#include <qstandardpaths.h> +#include <qdir.h> +#include <qmetaobject.h> #include <qpa/qplatformintegration.h> #include <qpa/qplatformservices.h> #include <qdbusconnectioninterface.h> diff --git a/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp index d3c5454f01..ef2d330959 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp +++ b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp @@ -52,6 +52,9 @@ #ifndef QT_NO_SYSTEMTRAYICON +#include <QtCore/QLoggingCategory> +#include <QtCore/QCoreApplication> + #include "qdbustrayicon_p.h" QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h index 03899723ab..352b4aa5d6 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h @@ -65,6 +65,7 @@ #include <QtCore/QObject> #include <QtCore/QByteArray> #include <QtCore/QList> +#include <QtCore/QLoggingCategory> #include <QtCore/QMap> #include <QtCore/QString> #include <QtCore/QStringList> diff --git a/src/platformsupport/themes/qabstractfileiconengine.cpp b/src/platformsupport/themes/qabstractfileiconengine.cpp index 192ed00510..c5800d9119 100644 --- a/src/platformsupport/themes/qabstractfileiconengine.cpp +++ b/src/platformsupport/themes/qabstractfileiconengine.cpp @@ -76,7 +76,7 @@ QPixmap QAbstractFileIconEngine::pixmap(const QSize &size, QIcon::Mode mode, key += QLatin1Char('_') + QString::number(size.width()); QPixmap result; - if (!QPixmapCache::find(key, result)) { + if (!QPixmapCache::find(key, &result)) { result = filePixmap(size, mode, state); if (!result.isNull()) QPixmapCache::insert(key, result); diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp index 543e66491d..e74b1cf744 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp @@ -465,7 +465,7 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path, cpPriv->state |= QNetworkConfiguration::Active; if (deviceType == DEVICE_TYPE_ETHERNET) { - for (const auto *interfaceDevice : interfaceDevices) { + for (auto interfaceDevice : qAsConst(interfaceDevices)) { if (interfaceDevice->deviceType() == deviceType) { auto *wiredDevice = wiredDevices.value(interfaceDevice->path()); if (wiredDevice && wiredDevice->carrier()) { @@ -716,7 +716,7 @@ QNetworkSession::State QNetworkManagerEngine::sessionStateForId(const QString &i if (!ptr->isValid) return QNetworkSession::Invalid; - for (QNetworkManagerConnectionActive *activeConnection : activeConnectionsList) { + for (QNetworkManagerConnectionActive *activeConnection : qAsConst(activeConnectionsList)) { const QString identifier = activeConnection->connection().path(); if (id == identifier) { diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp index 847479047f..a09ae72cb5 100644 --- a/src/plugins/bearer/qnetworksession_impl.cpp +++ b/src/plugins/bearer/qnetworksession_impl.cpp @@ -82,8 +82,6 @@ Q_SIGNALS: void forcedSessionClose(const QNetworkConfiguration &config); }; -#include "qnetworksession_impl.moc" - Q_GLOBAL_STATIC(QNetworkSessionManagerPrivate, sessionManager); void QNetworkSessionPrivateImpl::syncStateWithInterface() @@ -432,3 +430,5 @@ void QNetworkSessionPrivateImpl::decrementTimeout() } QT_END_NAMESPACE + +#include "qnetworksession_impl.moc" diff --git a/src/plugins/generic/tuiotouch/qtuiohandler.cpp b/src/plugins/generic/tuiotouch/qtuiohandler.cpp index bb18ba5085..cb82672acd 100644 --- a/src/plugins/generic/tuiotouch/qtuiohandler.cpp +++ b/src/plugins/generic/tuiotouch/qtuiohandler.cpp @@ -169,7 +169,7 @@ void QTuioHandler::processPackets() messages.push_back(msg); } - for (const QOscMessage &message : messages) { + for (const QOscMessage &message : qAsConst(messages)) { if (message.addressPattern() == "/tuio/2Dcur") { QList<QVariant> arguments = message.arguments(); if (arguments.count() == 0) { @@ -368,12 +368,12 @@ void QTuioHandler::process2DCurFseq(const QOscMessage &message) QList<QWindowSystemInterface::TouchPoint> tpl; tpl.reserve(m_activeCursors.size() + m_deadCursors.size()); - for (const QTuioCursor &tc : m_activeCursors) { + for (const QTuioCursor &tc : qAsConst(m_activeCursors)) { QWindowSystemInterface::TouchPoint tp = cursorToTouchPoint(tc, win); tpl.append(tp); } - for (const QTuioCursor &tc : m_deadCursors) { + for (const QTuioCursor &tc : qAsConst(m_deadCursors)) { QWindowSystemInterface::TouchPoint tp = cursorToTouchPoint(tc, win); tp.state = Qt::TouchPointReleased; tpl.append(tp); @@ -542,12 +542,12 @@ void QTuioHandler::process2DObjFseq(const QOscMessage &message) QList<QWindowSystemInterface::TouchPoint> tpl; tpl.reserve(m_activeTokens.size() + m_deadTokens.size()); - for (const QTuioToken & t : m_activeTokens) { + for (const QTuioToken & t : qAsConst(m_activeTokens)) { QWindowSystemInterface::TouchPoint tp = tokenToTouchPoint(t, win); tpl.append(tp); } - for (const QTuioToken & t : m_deadTokens) { + for (const QTuioToken & t : qAsConst(m_deadTokens)) { QWindowSystemInterface::TouchPoint tp = tokenToTouchPoint(t, win); tp.state = Qt::TouchPointReleased; tp.velocity = QVector2D(); diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index ca315840e2..7e66439ea7 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -47,7 +47,9 @@ #include <qpa/qplatformcursor.h> #include <qpa/qplatformscreen.h> -#include <qpa/qwindowsysteminterface.h> +#include <qpa/qwindowsysteminterface_p.h> + +#include <QtGui/private/qguiapplication_p.h> #include "qibusproxy.h" #include "qibusproxyportal.h" @@ -217,17 +219,14 @@ void QIBusPlatformInputContext::update(Qt::InputMethodQueries q) && (q.testFlag(Qt::ImSurroundingText) || q.testFlag(Qt::ImCursorPosition) || q.testFlag(Qt::ImAnchorPosition))) { - QInputMethodQueryEvent srrndTextQuery(Qt::ImSurroundingText); - QInputMethodQueryEvent cursorPosQuery(Qt::ImCursorPosition); - QInputMethodQueryEvent anchorPosQuery(Qt::ImAnchorPosition); - QCoreApplication::sendEvent(input, &srrndTextQuery); - QCoreApplication::sendEvent(input, &cursorPosQuery); - QCoreApplication::sendEvent(input, &anchorPosQuery); + QInputMethodQueryEvent query(Qt::ImSurroundingText | Qt::ImCursorPosition | Qt::ImAnchorPosition); + + QCoreApplication::sendEvent(input, &query); - QString surroundingText = srrndTextQuery.value(Qt::ImSurroundingText).toString(); - uint cursorPosition = cursorPosQuery.value(Qt::ImCursorPosition).toUInt(); - uint anchorPosition = anchorPosQuery.value(Qt::ImAnchorPosition).toUInt(); + QString surroundingText = query.value(Qt::ImSurroundingText).toString(); + uint cursorPosition = query.value(Qt::ImCursorPosition).toUInt(); + uint anchorPosition = query.value(Qt::ImAnchorPosition).toUInt(); QIBusText text; text.text = surroundingText; @@ -422,9 +421,9 @@ bool QIBusPlatformInputContext::filterEvent(const QEvent *event) QDBusPendingReply<bool> reply = d->context->ProcessKeyEvent(sym, code - 8, ibusState); if (m_eventFilterUseSynchronousMode || reply.isFinished()) { - bool retval = reply.value(); - qCDebug(qtQpaInputMethods) << "filterEvent return" << code << sym << state << retval; - return retval; + bool filtered = reply.value(); + qCDebug(qtQpaInputMethods) << "filterEvent return" << code << sym << state << filtered; + return filtered; } Qt::KeyboardModifiers modifiers = keyEvent->modifiers(); @@ -494,23 +493,22 @@ void QIBusPlatformInputContext::filterEventFinished(QDBusPendingCallWatcher *cal const bool isAutoRepeat = args.at(7).toBool(); // copied from QXcbKeyboard::handleKeyEvent() - bool retval = reply.value(); - qCDebug(qtQpaInputMethods) << "filterEventFinished return" << code << sym << state << retval; - if (!retval) { + bool filtered = reply.value(); + qCDebug(qtQpaInputMethods) << "filterEventFinished return" << code << sym << state << filtered; + if (!filtered) { #ifndef QT_NO_CONTEXTMENU if (type == QEvent::KeyPress && qtcode == Qt::Key_Menu && window != NULL) { const QPoint globalPos = window->screen()->handle()->cursor()->pos(); const QPoint pos = window->mapFromGlobal(globalPos); -#ifndef QT_NO_CONTEXTMENU - QWindowSystemInterface::handleContextMenuEvent(window, false, pos, - globalPos, modifiers); -#endif + QWindowSystemInterfacePrivate::ContextMenuEvent contextMenuEvent(window, false, pos, + globalPos, modifiers); + QGuiApplicationPrivate::processWindowSystemEvent(&contextMenuEvent); } -#endif // QT_NO_CONTEXTMENU - QWindowSystemInterface::handleExtendedKeyEvent(window, time, type, qtcode, modifiers, - code, sym, state, string, isAutoRepeat); - +#endif + QWindowSystemInterfacePrivate::KeyEvent keyEvent(window, time, type, qtcode, modifiers, + code, sym, state, string, isAutoRepeat); + QGuiApplicationPrivate::processWindowSystemEvent(&keyEvent); } call->deleteLater(); } diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index 309e41bfd6..d4b7f38bf6 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -329,10 +329,7 @@ if (!clazz) { \ GET_AND_CHECK_STATIC_METHOD(m_setFocusedMethodID, nodeInfoClass, "setFocused", "(Z)V"); GET_AND_CHECK_STATIC_METHOD(m_setScrollableMethodID, nodeInfoClass, "setScrollable", "(Z)V"); GET_AND_CHECK_STATIC_METHOD(m_setVisibleToUserMethodID, nodeInfoClass, "setVisibleToUser", "(Z)V"); - - if (QtAndroidPrivate::androidSdkVersion() >= 18) { - GET_AND_CHECK_STATIC_METHOD(m_setTextSelectionMethodID, nodeInfoClass, "setTextSelection", "(II)V"); - } + GET_AND_CHECK_STATIC_METHOD(m_setTextSelectionMethodID, nodeInfoClass, "setTextSelection", "(II)V"); return true; } diff --git a/src/plugins/platforms/android/extract-dummy.cpp b/src/plugins/platforms/android/extract-dummy.cpp index d07fbe1ba7..fdce8ec64c 100644 --- a/src/plugins/platforms/android/extract-dummy.cpp +++ b/src/plugins/platforms/android/extract-dummy.cpp @@ -40,16 +40,6 @@ #include <jni.h> #include <extract.h> -extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractNativeChunkInfo(JNIEnv *, jobject, Res_png_9patch*) -{ - return 0; -} - -extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractChunkInfo(JNIEnv *, jobject, jbyteArray) -{ - return 0; -} - extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractNativeChunkInfo20(JNIEnv *, jobject, long) { return 0; diff --git a/src/plugins/platforms/android/extract.cpp b/src/plugins/platforms/android/extract.cpp index 2f2ffa7126..acffa353f1 100644 --- a/src/plugins/platforms/android/extract.cpp +++ b/src/plugins/platforms/android/extract.cpp @@ -48,46 +48,6 @@ #define LOG_TAG "extractSyleInfo" #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__) -extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractNativeChunkInfo(JNIEnv * env, jobject, Res_png_9patch* chunk) -{ - Res_png_9patch::deserialize(chunk); - //printChunkInformation(chunk); - jintArray result; - size_t size = 3+chunk->numXDivs+chunk->numYDivs+chunk->numColors; - result = env->NewIntArray(size); - if (!result) - return 0; - - jint *data = (jint*)malloc(sizeof(jint)*size); - size_t pos = 0; - data[pos++]=chunk->numXDivs; - data[pos++]=chunk->numYDivs; - data[pos++]=chunk->numColors; - for (int x = 0; x <chunk->numXDivs; x ++) - data[pos++]=chunk->xDivs[x]; - for (int y = 0; y <chunk->numYDivs; y ++) - data[pos++]=chunk->yDivs[y]; - for (int c = 0; c <chunk->numColors; c ++) - data[pos++]=chunk->colors[c]; - env->SetIntArrayRegion(result, 0, size, data); - free(data); - return result; -} - -extern "C" JNIEXPORT jintArray JNICALL Java_org_qtproject_qt5_android_ExtractStyle_extractChunkInfo(JNIEnv * env, jobject obj, jbyteArray chunkObj) -{ - size_t chunkSize = env->GetArrayLength(chunkObj); - void* storage = alloca(chunkSize); - env->GetByteArrayRegion(chunkObj, 0, chunkSize, - reinterpret_cast<jbyte*>(storage)); - - if (!env->ExceptionCheck()) - return Java_org_qtproject_qt5_android_ExtractStyle_extractNativeChunkInfo(env, obj, static_cast<Res_png_9patch*>(storage)); - else - env->ExceptionClear(); - return 0; -} - // The following part was shamelessly stolen from ResourceTypes.cpp from Android's sources /* * Copyright (C) 2005 The Android Open Source Project diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm index f26263261c..f0ef70e3a3 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm @@ -51,6 +51,19 @@ QT_USE_NAMESPACE #ifndef QT_NO_ACCESSIBILITY +/** + * Converts between absolute character offsets and line numbers of a + * QAccessibleTextInterface. Works in exactly one of two modes: + * + * - Pass *line == -1 in order to get a line containing character at the given + * *offset + * - Pass *offset == -1 in order to get the offset of first character of the + * given *line + * + * You can optionally also pass non-NULL `start` and `end`, which will in both + * modes be filled with the offset of the first and last characters of the + * relevant line. + */ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *offset, NSUInteger *start = 0, NSUInteger *end = 0) { Q_ASSERT(*line == -1 || *offset == -1); @@ -224,7 +237,7 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of return [attributes autorelease]; } -- (id)parentElement { +- (id)accessibilityParent { QAccessibleInterface *iface = QAccessible::accessibleInterface(axid); if (!iface || !iface->isValid()) return nil; @@ -237,7 +250,7 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of if (QAccessibleInterface *parent = iface->parent()) { if (parent->role() != QAccessible::Application) { QAccessible::Id parentId = QAccessible::uniqueId(parent); - return [QMacAccessibilityElement elementWithId: parentId]; + return NSAccessibilityUnignoredAncestor([QMacAccessibilityElement elementWithId: parentId]); } } @@ -245,12 +258,18 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of QPlatformWindow *platformWindow = window->handle(); if (platformWindow) { QCocoaWindow *win = static_cast<QCocoaWindow*>(platformWindow); - return qnsview_cast(win->view()); + return NSAccessibilityUnignoredAncestor(qnsview_cast(win->view())); } } return nil; } +- (NSRect)accessibilityFrame { + QAccessibleInterface *iface = QAccessible::accessibleInterface(axid); + if (!iface || !iface->isValid()) + return NSZeroRect; + return QCocoaScreen::mapToNative(iface->rect()); +} - (id) minValueAttribute:(QAccessibleInterface*)iface { if (QAccessibleValueInterface *val = iface->valueInterface()) @@ -285,13 +304,13 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of id focusedElement = [NSApp accessibilityAttributeValue:NSAccessibilityFocusedUIElementAttribute]; return @([focusedElement isEqual:self]); } else if ([attribute isEqualToString:NSAccessibilityParentAttribute]) { - return NSAccessibilityUnignoredAncestor([self parentElement]); + return self.accessibilityParent; } else if ([attribute isEqualToString:NSAccessibilityWindowAttribute]) { // We're in the same window as our parent. - return [[self parentElement] accessibilityAttributeValue:NSAccessibilityWindowAttribute]; + return [[self accessibilityParent] accessibilityAttributeValue:NSAccessibilityWindowAttribute]; } else if ([attribute isEqualToString:NSAccessibilityTopLevelUIElementAttribute]) { // We're in the same top level element as our parent. - return [[self parentElement] accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute]; + return [[self accessibilityParent] accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute]; } else if ([attribute isEqualToString:NSAccessibilityPositionAttribute]) { // The position in points of the element's lower-left corner in screen-relative coordinates QPointF qtPosition = QRectF(iface->rect()).bottomLeft(); @@ -347,12 +366,8 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of return [NSValue valueWithRange: NSMakeRange(0, iface->text(QAccessible::Name).length())]; } else if ([attribute isEqualToString:NSAccessibilityInsertionPointLineNumberAttribute]) { if (QAccessibleTextInterface *text = iface->textInterface()) { - int line = 0; // true for all single line edits - if (iface->state().multiLine) { - int position = text->cursorPosition(); - convertLineOffset(text, &line, &position); - } - return @(line); + int position = text->cursorPosition(); + return [self accessibilityAttributeValue:NSAccessibilityLineForIndexParameterizedAttribute forParameter:@(position)]; } return nil; } else if ([attribute isEqualToString:NSAccessibilityMinValueAttribute]) { @@ -408,8 +423,11 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of int index = [parameter intValue]; if (index < 0 || index > iface->textInterface()->characterCount()) return nil; - int line = -1; - convertLineOffset(iface->textInterface(), &line, &index); + int line = 0; // true for all single line edits + if (iface->state().multiLine) { + line = -1; + convertLineOffset(iface->textInterface(), &line, &index); + } return @(line); } if ([attribute isEqualToString: NSAccessibilityRangeForLineParameterizedAttribute]) { diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index a1bed3db45..beb17ec44e 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -218,6 +218,7 @@ QCocoaWindow::~QCocoaWindow() } [m_view release]; + [m_nsWindow close]; [m_nsWindow release]; } diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp index 24f82e7843..24051c352e 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp @@ -423,7 +423,7 @@ void QEglFSKmsGbmScreen::updateFlipStatus() if (m_flipPending) return; - for (const CloneDestination &d : m_cloneDests) { + for (const CloneDestination &d : qAsConst(m_cloneDests)) { if (d.cloneFlipPending) return; } diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index db79780407..a996e765c4 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -72,6 +72,9 @@ # endif #endif +#include <qpa/qplatforminputcontextfactory_p.h> +#include <qpa/qplatforminputcontext.h> + #include "private/qgenericunixfontdatabase_p.h" #include "private/qgenericunixeventdispatcher_p.h" @@ -152,6 +155,7 @@ QQnxIntegration::QQnxIntegration(const QStringList ¶mList) , m_inputContext(0) , m_buttonsNotifier(new QQnxButtonEventNotifier()) #endif + , m_qpaInputContext(0) , m_services(0) , m_fontDatabase(new QGenericUnixFontDatabase()) , m_eventDispatcher(createUnixEventDispatcher()) @@ -194,13 +198,17 @@ QQnxIntegration::QQnxIntegration(const QStringList ¶mList) m_screenEventHandler->setScreenEventThread(m_screenEventThread); m_screenEventThread->start(); + m_qpaInputContext = QPlatformInputContextFactory::create(); + #if QT_CONFIG(qqnx_pps) - // Create/start the keyboard class. - m_virtualKeyboard = new QQnxVirtualKeyboardPps(); + if (!m_qpaInputContext) { + // Create/start the keyboard class. + m_virtualKeyboard = new QQnxVirtualKeyboardPps(); - // delay invocation of start() to the time the event loop is up and running - // needed to have the QThread internals of the main thread properly initialized - QMetaObject::invokeMethod(m_virtualKeyboard, "start", Qt::QueuedConnection); + // delay invocation of start() to the time the event loop is up and running + // needed to have the QThread internals of the main thread properly initialized + QMetaObject::invokeMethod(m_virtualKeyboard, "start", Qt::QueuedConnection); + } #endif #if QT_CONFIG(qqnx_pps) @@ -281,6 +289,7 @@ QQnxIntegration::~QQnxIntegration() // Destroy input context delete m_inputContext; #endif + delete m_qpaInputContext; // Destroy the keyboard class. delete m_virtualKeyboard; @@ -397,13 +406,13 @@ QPlatformOpenGLContext *QQnxIntegration::createPlatformOpenGLContext(QOpenGLCont } #endif -#if QT_CONFIG(qqnx_pps) QPlatformInputContext *QQnxIntegration::inputContext() const { qIntegrationDebug(); + if (m_qpaInputContext) + return m_qpaInputContext; return m_inputContext; } -#endif void QQnxIntegration::moveToScreen(QWindow *window, int screen) { diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h index 4a6f15fc08..366556dc4b 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.h +++ b/src/plugins/platforms/qnx/qqnxintegration.h @@ -153,6 +153,7 @@ private: QQnxInputContext *m_inputContext; QQnxButtonEventNotifier *m_buttonsNotifier; #endif + QPlatformInputContext *m_qpaInputContext; QQnxServices *m_services; QPlatformFontDatabase *m_fontDatabase; mutable QAbstractEventDispatcher *m_eventDispatcher; diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp index e4843cb438..f29e11489b 100644 --- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp +++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp @@ -381,6 +381,8 @@ void QQnxScreenEventHandler::handlePointerEvent(screen_event_t event) if (m_lastGlobalMousePoint != globalPoint || m_lastLocalMousePoint != localPoint || m_lastButtonState != buttons) { + if (m_lastButtonState != 0 && buttons == 0) + (static_cast<QQnxWindow *>(w->handle()))->handleActivationEvent(); QWindowSystemInterface::handleMouseEvent(w, localPoint, globalPoint, buttons); qScreenEventDebug() << "Qt mouse, w=" << w << ", (" << localPoint.x() << "," << localPoint.y() << "), b=" << static_cast<int>(buttons); } @@ -457,6 +459,9 @@ void QQnxScreenEventHandler::handleTouchEvent(screen_event_t event, int qnxType) m_lastMouseWindow = qnxWindow; if (w) { + if (qnxType == SCREEN_EVENT_MTOUCH_RELEASE) + (static_cast<QQnxWindow *>(w->handle()))->handleActivationEvent(); + // get size of screen which contains window QPlatformScreen *platformScreen = QPlatformScreen::platformScreenForWindow(w); QSizeF screenSize = platformScreen->geometry().size(); diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index 2096bc789e..7644e28b44 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -156,7 +156,8 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW m_visible(false), m_exposed(true), m_windowState(Qt::WindowNoState), - m_mmRendererWindow(0) + m_mmRendererWindow(0), + m_firstActivateHandled(false) { qWindowDebug() << "window =" << window << ", size =" << window->size(); @@ -341,6 +342,14 @@ void QQnxWindow::setVisible(bool visible) if (visible) { applyWindowState(); } else { + if (showWithoutActivating() && focusable() && m_firstActivateHandled) { + m_firstActivateHandled = false; + int val = SCREEN_SENSITIVITY_NO_FOCUS; + Q_SCREEN_CHECKERROR( + screen_set_window_property_iv(m_window, SCREEN_PROPERTY_SENSITIVITY, &val), + "Failed to set window sensitivity"); + } + // Flush the context, otherwise it won't disappear immediately screen_flush_context(m_screenContext, 0); } @@ -618,13 +627,56 @@ void QQnxWindow::requestActivateWindow() void QQnxWindow::setFocus(screen_window_t newFocusWindow) { + screen_window_t temporaryFocusWindow = nullptr; + screen_group_t screenGroup = 0; - screen_get_window_property_pv(nativeHandle(), SCREEN_PROPERTY_GROUP, - reinterpret_cast<void**>(&screenGroup)); - if (screenGroup) { - screen_set_group_property_pv(screenGroup, SCREEN_PROPERTY_FOCUS, - reinterpret_cast<void**>(&newFocusWindow)); + Q_SCREEN_CHECKERROR(screen_get_window_property_pv(nativeHandle(), SCREEN_PROPERTY_GROUP, + reinterpret_cast<void **>(&screenGroup)), + "Failed to retrieve window group"); + + if (showWithoutActivating() && focusable() && !m_firstActivateHandled) { + m_firstActivateHandled = true; + int val = SCREEN_SENSITIVITY_TEST; + Q_SCREEN_CHECKERROR( + screen_set_window_property_iv(m_window, SCREEN_PROPERTY_SENSITIVITY, &val), + "Failed to set window sensitivity"); + +#if _SCREEN_VERSION < _SCREEN_MAKE_VERSION(1, 0, 0) + // For older versions of screen, the window may still have group + // focus even though it was marked NO_FOCUS when it was hidden. + // In that situation, focus has to be given to another window + // so that this window can take focus back from it. + screen_window_t oldFocusWindow = nullptr; + Q_SCREEN_CHECKERROR( + screen_get_group_property_pv(screenGroup, SCREEN_PROPERTY_FOCUS, + reinterpret_cast<void **>(&oldFocusWindow)), + "Failed to retrieve group focus"); + if (newFocusWindow == oldFocusWindow) { + char groupName[256]; + memset(groupName, 0, sizeof(groupName)); + Q_SCREEN_CHECKERROR(screen_get_group_property_cv(screenGroup, SCREEN_PROPERTY_NAME, + sizeof(groupName) - 1, groupName), + "Failed to retrieve group name"); + + Q_SCREEN_CHECKERROR(screen_create_window_type(&temporaryFocusWindow, + m_screenContext, SCREEN_CHILD_WINDOW), + "Failed to create temporary focus window"); + Q_SCREEN_CHECKERROR(screen_join_window_group(temporaryFocusWindow, groupName), + "Temporary focus window failed to join window group"); + Q_SCREEN_CHECKERROR( + screen_set_group_property_pv(screenGroup, SCREEN_PROPERTY_FOCUS, + reinterpret_cast<void **>(&temporaryFocusWindow)), + "Temporary focus window failed to take focus"); + screen_flush_context(m_screenContext, 0); + } +#endif } + + Q_SCREEN_CHECKERROR(screen_set_group_property_pv(screenGroup, SCREEN_PROPERTY_FOCUS, + reinterpret_cast<void **>(&newFocusWindow)), + "Failed to set group focus"); + + screen_destroy_window(temporaryFocusWindow); } void QQnxWindow::setWindowState(Qt::WindowStates state) @@ -711,7 +763,11 @@ void QQnxWindow::initWindow() screen_set_window_property_iv(m_window, SCREEN_PROPERTY_SWAP_INTERVAL, &val), "Failed to set swap interval"); - if (window()->flags() & Qt::WindowDoesNotAcceptFocus) { + if (showWithoutActivating() || !focusable()) { + // NO_FOCUS is temporary for showWithoutActivating (and pop-up) windows. + // Using NO_FOCUS ensures that screen doesn't activate the window because + // it was just created. Sensitivity will be changed to TEST when the + // window is clicked or touched. val = SCREEN_SENSITIVITY_NO_FOCUS; Q_SCREEN_CHECKERROR( screen_set_window_property_iv(m_window, SCREEN_PROPERTY_SENSITIVITY, &val), @@ -825,4 +881,22 @@ bool QQnxWindow::shouldMakeFullScreen() const && (QQnxIntegration::instance()->options() & QQnxIntegration::FullScreenApplication)); } + +void QQnxWindow::handleActivationEvent() +{ + if (showWithoutActivating() && focusable() && !m_firstActivateHandled) + requestActivateWindow(); +} + +bool QQnxWindow::showWithoutActivating() const +{ + return (window()->flags() & Qt::Popup) == Qt::Popup + || window()->property("_q_showWithoutActivating").toBool(); +} + +bool QQnxWindow::focusable() const +{ + return (window()->flags() & Qt::WindowDoesNotAcceptFocus) != Qt::WindowDoesNotAcceptFocus; +} + QT_END_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h index 2895a547b1..20c38cb4b7 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.h +++ b/src/plugins/platforms/qnx/qqnxwindow.h @@ -113,6 +113,7 @@ public: bool shouldMakeFullScreen() const; void windowPosted(); + void handleActivationEvent(); protected: virtual int pixelFormat() const = 0; @@ -131,6 +132,8 @@ private: void updateZorder(screen_window_t window, int &zOrder); void applyWindowState(); void setFocus(screen_window_t newFocusWindow); + bool showWithoutActivating() const; + bool focusable() const; screen_window_t m_window; QSize m_bufferSize; @@ -152,6 +155,7 @@ private: QByteArray m_parentGroupName; bool m_isTopLevel; + bool m_firstActivateHandled; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp index ffe00de2b1..32114c6443 100644 --- a/src/plugins/platforms/vnc/qvnc.cpp +++ b/src/plugins/platforms/vnc/qvnc.cpp @@ -600,7 +600,7 @@ void QVncClientCursor::changeCursor(QCursor *widgetCursor, QWindow *window) cursor = *platformImage.image(); hotspot = platformImage.hotspot(); } - for (auto client : clients) + for (auto client : qAsConst(clients)) client->setDirtyCursor(); } @@ -638,16 +638,14 @@ void QVncServer::init() QVncServer::~QVncServer() { - for (auto client : clients) { - delete client; - } + qDeleteAll(clients); } void QVncServer::setDirty() { - for (auto client : clients) { + for (auto client : qAsConst(clients)) client->setDirty(qvnc_screen->dirtyRegion); - } + qvnc_screen->clearDirty(); } diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp index 67d33de2f0..2eca18fb4d 100644 --- a/src/plugins/platforms/vnc/qvncscreen.cpp +++ b/src/plugins/platforms/vnc/qvncscreen.cpp @@ -75,7 +75,7 @@ bool QVncScreen::initialize() mDepth = 32; mPhysicalSize = QSizeF(mGeometry.width()/96.*25.4, mGeometry.height()/96.*25.4); - for (const QString &arg : mArgs) { + for (const QString &arg : qAsConst(mArgs)) { QRegularExpressionMatch match; if (arg.contains(mmSizeRx, &match)) { mPhysicalSize = QSizeF(match.captured("width").toDouble(), match.captured("height").toDouble()); diff --git a/src/plugins/platforms/wasm/qtloader.js b/src/plugins/platforms/wasm/qtloader.js index 37a5308034..84694c7b9f 100644 --- a/src/plugins/platforms/wasm/qtloader.js +++ b/src/plugins/platforms/wasm/qtloader.js @@ -312,13 +312,13 @@ function QtLoader(config) // and is ready to be instantiated. Define the instantiateWasm callback which // emscripten will call to create the instance. Module.instantiateWasm = function(imports, successCallback) { - return WebAssembly.instantiate(wasmModule, imports).then(function(instance) { - successCallback(instance); - return instance; + WebAssembly.instantiate(wasmModule, imports).then(function(instance) { + successCallback(instance, wasmModule); }, function(error) { self.error = error; setStatus("Error"); }); + return {}; }; Module.locateFile = Module.locateFile || function(filename) { @@ -382,6 +382,8 @@ function QtLoader(config) } }); + Module.mainScriptUrlOrBlob = new Blob([emscriptenModuleSource], {type: 'text/javascript'}); + config.restart = function() { // Restart by reloading the page. This will wipe all state which means diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp index 8adcf56b11..878f55e56b 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp @@ -445,7 +445,7 @@ static inline QTextFormat standardFormat(StandardFormat format) const QPalette palette = QGuiApplication::palette(); const QColor background = palette.text().color(); result.setBackground(QBrush(background)); - result.setForeground(palette.background()); + result.setForeground(palette.window()); break; } } diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp index 32eec322e8..7b314878f5 100644 --- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp +++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp @@ -277,6 +277,8 @@ QFunctionPointer QWindowsNativeInterface::platformFunction(const QByteArray &fun return QFunctionPointer(QWindowsWindow::setTouchWindowTouchTypeStatic); if (function == QWindowsWindowFunctions::setHasBorderInFullScreenIdentifier()) return QFunctionPointer(QWindowsWindow::setHasBorderInFullScreenStatic); + if (function == QWindowsWindowFunctions::setHasBorderInFullScreenDefaultIdentifier()) + return QFunctionPointer(QWindowsWindow::setHasBorderInFullScreenDefault); if (function == QWindowsWindowFunctions::setWindowActivationBehaviorIdentifier()) return QFunctionPointer(QWindowsNativeInterface::setWindowActivationBehavior); if (function == QWindowsWindowFunctions::isTabletModeIdentifier()) diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 6dd3e6ed56..a6b9781252 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -284,24 +284,24 @@ static inline QPalette systemPalette() result.setColor(QPalette::Link, Qt::blue); result.setColor(QPalette::LinkVisited, Qt::magenta); result.setColor(QPalette::Inactive, QPalette::Button, result.button().color()); - result.setColor(QPalette::Inactive, QPalette::Window, result.background().color()); + result.setColor(QPalette::Inactive, QPalette::Window, result.window().color()); result.setColor(QPalette::Inactive, QPalette::Light, result.light().color()); result.setColor(QPalette::Inactive, QPalette::Dark, result.dark().color()); if (result.midlight() == result.button()) result.setColor(QPalette::Midlight, result.button().color().lighter(110)); - if (result.background() != result.base()) { + if (result.window() != result.base()) { result.setColor(QPalette::Inactive, QPalette::Highlight, result.color(QPalette::Inactive, QPalette::Window)); result.setColor(QPalette::Inactive, QPalette::HighlightedText, result.color(QPalette::Inactive, QPalette::Text)); } const QColor disabled = - mixColors(result.foreground().color(), result.button().color()); + mixColors(result.windowText().color(), result.button().color()); - result.setColorGroup(QPalette::Disabled, result.foreground(), result.button(), + result.setColorGroup(QPalette::Disabled, result.windowText(), result.button(), result.light(), result.dark(), result.mid(), result.text(), result.brightText(), result.base(), - result.background()); + result.window()); result.setColor(QPalette::Disabled, QPalette::WindowText, disabled); result.setColor(QPalette::Disabled, QPalette::Text, disabled); result.setColor(QPalette::Disabled, QPalette::ButtonText, disabled); @@ -310,7 +310,7 @@ static inline QPalette systemPalette() result.setColor(QPalette::Disabled, QPalette::HighlightedText, getSysColor(COLOR_HIGHLIGHTTEXT)); result.setColor(QPalette::Disabled, QPalette::Base, - result.background().color()); + result.window().color()); return result; } @@ -333,7 +333,7 @@ static inline QPalette toolTipPalette(const QPalette &systemPalette) result.setColor(QPalette::All, QPalette::ToolTipBase, tipBgColor); result.setColor(QPalette::All, QPalette::ToolTipText, tipTextColor); const QColor disabled = - mixColors(result.foreground().color(), result.button().color()); + mixColors(result.windowText().color(), result.button().color()); result.setColor(QPalette::Disabled, QPalette::WindowText, disabled); result.setColor(QPalette::Disabled, QPalette::Text, disabled); result.setColor(QPalette::Disabled, QPalette::ToolTipText, disabled); @@ -858,7 +858,8 @@ QPixmap QWindowsFileIconEngine::filePixmap(const QSize &size, QIcon::Mode, QIcon int iIcon = (useDefaultFolderIcon && defaultFolderIIcon >= 0) ? defaultFolderIIcon : **dirIconEntryCache.object(filePath); if (iIcon) { - QPixmapCache::find(dirIconPixmapCacheKey(iIcon, iconSize, requestedImageListSize), pixmap); + QPixmapCache::find(dirIconPixmapCacheKey(iIcon, iconSize, requestedImageListSize), + &pixmap); if (pixmap.isNull()) // Let's keep both caches in sync dirIconEntryCache.remove(filePath); else @@ -889,7 +890,7 @@ QPixmap QWindowsFileIconEngine::filePixmap(const QSize &size, QIcon::Mode, QIcon //using the unique icon index provided by windows save us from duplicate keys key = dirIconPixmapCacheKey(info.iIcon, iconSize, requestedImageListSize); - QPixmapCache::find(key, pixmap); + QPixmapCache::find(key, &pixmap); if (!pixmap.isNull()) { QMutexLocker locker(&mx); dirIconEntryCache.insert(filePath, FakePointer<int>::create(info.iIcon)); diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index c5d57be2ad..99be4882bb 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1180,6 +1180,7 @@ QWindowCreationContext::QWindowCreationContext(const QWindow *w, const char *QWindowsWindow::embeddedNativeParentHandleProperty = "_q_embedded_native_parent_handle"; const char *QWindowsWindow::hasBorderInFullScreenProperty = "_q_has_border_in_fullscreen"; +bool QWindowsWindow::m_borderInFullScreenDefault = false; QWindowsWindow::QWindowsWindow(QWindow *aWindow, const QWindowsWindowData &data) : QWindowsBaseWindow(aWindow), @@ -1217,7 +1218,7 @@ QWindowsWindow::QWindowsWindow(QWindow *aWindow, const QWindowsWindowData &data) if (aWindow->isTopLevel()) setWindowIcon(aWindow->icon()); - if (aWindow->property(hasBorderInFullScreenProperty).toBool()) + if (m_borderInFullScreenDefault || aWindow->property(hasBorderInFullScreenProperty).toBool()) setFlag(HasBorderInFullScreen); clearFlag(WithinCreate); } @@ -2816,6 +2817,11 @@ void QWindowsWindow::setHasBorderInFullScreenStatic(QWindow *window, bool border window->setProperty(hasBorderInFullScreenProperty, QVariant(border)); } +void QWindowsWindow::setHasBorderInFullScreenDefault(bool border) +{ + m_borderInFullScreenDefault = border; +} + void QWindowsWindow::setHasBorderInFullScreen(bool border) { if (testFlag(HasBorderInFullScreen) == border) diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index b9b398b67b..b07bd15d2a 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -341,6 +341,7 @@ public: static void setTouchWindowTouchTypeStatic(QWindow *window, QWindowsWindowFunctions::TouchWindowTouchTypes touchTypes); void registerTouchWindow(QWindowsWindowFunctions::TouchWindowTouchTypes touchTypes = QWindowsWindowFunctions::NormalTouch); static void setHasBorderInFullScreenStatic(QWindow *window, bool border); + static void setHasBorderInFullScreenDefault(bool border); void setHasBorderInFullScreen(bool border); static QString formatWindowTitle(const QString &title); @@ -386,6 +387,7 @@ private: // note: intentionally not using void * in order to avoid breaking x86 VkSurfaceKHR m_vkSurface = 0; #endif + static bool m_borderInFullScreenDefault; }; #ifndef QT_NO_DEBUG_STREAM diff --git a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp index a3e6cedecd..2688d6e884 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp +++ b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp @@ -458,7 +458,7 @@ static QPixmap qt_patternForAlpha(uchar alpha, int screen) % HexString<uchar>(alpha) % HexString<int>(screen); - if (!QPixmapCache::find(key, pm)) { + if (!QPixmapCache::find(key, &pm)) { // #### why not use a mono image here???? QImage pattern(DITHER_SIZE, DITHER_SIZE, QImage::Format_ARGB32); pattern.fill(0xffffffff); diff --git a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h index 9b01c0a3fc..bc82351283 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h +++ b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h @@ -116,7 +116,7 @@ protected: friend GC qt_x11_get_brush_gc(QPainter *); private: - Q_DISABLE_COPY(QX11PaintEngine) + Q_DISABLE_COPY_MOVE(QX11PaintEngine) }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp index f9240a45cc..741317d766 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp +++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp @@ -641,17 +641,17 @@ void QXcbBackingStoreImage::flushPixmap(const QRegion ®ion, bool fullRegion) xcb_subimage.bit_order = m_xcb_image->bit_order; const bool needsByteSwap = xcb_subimage.byte_order != m_xcb_image->byte_order; + // Ensure that we don't send more than maxPutImageRequestDataBytes per request. + const auto maxPutImageRequestDataBytes = connection()->maxRequestDataBytes(sizeof(xcb_put_image_request_t)); for (const QRect &rect : region) { - // We must make sure that each request is not larger than max_req_size. - // Each request takes req_size + m_xcb_image->stride * height bytes. - static const uint32_t req_size = sizeof(xcb_put_image_request_t); - const uint32_t max_req_size = xcb_get_maximum_request_length(xcb_connection()); - const int rows_per_put = (max_req_size - req_size) / m_xcb_image->stride; + const quint32 stride = round_up_scanline(rect.width() * m_qimage.depth(), xcb_subimage.scanline_pad) >> 3; + const int rows_per_put = maxPutImageRequestDataBytes / stride; // This assert could trigger if a single row has more pixels than fit in - // a single PutImage request. However, max_req_size is guaranteed to be - // at least 16384 bytes. That should be enough for quite large images. + // a single PutImage request. In the absence of the BIG-REQUESTS extension + // the theoretical maximum lengths of maxPutImageRequestDataBytes can be + // roughly 256kB. Q_ASSERT(rows_per_put > 0); // If we upload the whole image in a single chunk, the result might be @@ -666,9 +666,10 @@ void QXcbBackingStoreImage::flushPixmap(const QRegion ®ion, bool fullRegion) while (height > 0) { const int rows = std::min(height, rows_per_put); const QRect subRect(x, y, width, rows); - const quint32 stride = round_up_scanline(width * m_qimage.depth(), xcb_subimage.scanline_pad) >> 3; const QImage subImage = native_sub_image(&m_flushBuffer, stride, m_qimage, subRect, needsByteSwap); + Q_ASSERT(static_cast<size_t>(subImage.sizeInBytes()) <= maxPutImageRequestDataBytes); + xcb_subimage.width = width; xcb_subimage.height = rows; xcb_subimage.data = const_cast<uint8_t *>(subImage.constBits()); diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp index ac8b029916..2cb6720d40 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp @@ -240,8 +240,8 @@ QXcbClipboard::QXcbClipboard(QXcbConnection *c) xcb_xfixes_select_selection_input_checked(xcb_connection(), m_owner, atom(QXcbAtom::CLIPBOARD), mask); } - // change property protocol request is 24 bytes - m_increment = (xcb_get_maximum_request_length(xcb_connection()) * 4) - 24; + // xcb_change_property_request_t and xcb_get_property_request_t are the same size + m_maxPropertyRequestDataBytes = connection()->maxRequestDataBytes(sizeof(xcb_change_property_request_t)); } QXcbClipboard::~QXcbClipboard() @@ -486,7 +486,7 @@ xcb_atom_t QXcbClipboard::sendSelection(QMimeData *d, xcb_atom_t target, xcb_win if (m_clipboard_closing) allow_incr = false; - if (data.size() > m_increment && allow_incr) { + if (data.size() > m_maxPropertyRequestDataBytes && allow_incr) { long bytes = data.size(); xcb_change_property(xcb_connection(), XCB_PROP_MODE_REPLACE, window, property, atom(QXcbAtom::INCR), 32, 1, (const void *)&bytes); @@ -496,7 +496,7 @@ xcb_atom_t QXcbClipboard::sendSelection(QMimeData *d, xcb_atom_t target, xcb_win } // make sure we can perform the XChangeProperty in a single request - if (data.size() > m_increment) + if (data.size() > m_maxPropertyRequestDataBytes) return XCB_NONE; // ### perhaps use several XChangeProperty calls w/ PropModeAppend? int dataSize = data.size() / (dataFormat / 8); // use a single request to transfer data @@ -678,17 +678,8 @@ void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve emitChanged(mode); } - -static inline int maxSelectionIncr(xcb_connection_t *c) -{ - int l = xcb_get_maximum_request_length(c); - return (l > 65536 ? 65536*4 : l*4) - 100; -} - bool QXcbClipboard::clipboardReadProperty(xcb_window_t win, xcb_atom_t property, bool deleteProperty, QByteArray *buffer, int *size, xcb_atom_t *type, int *format) { - int maxsize = maxSelectionIncr(xcb_connection()); - ulong bytes_left; // bytes_after xcb_atom_t dummy_type; int dummy_format; @@ -705,7 +696,8 @@ bool QXcbClipboard::clipboardReadProperty(xcb_window_t win, xcb_atom_t property, } *type = reply->type; *format = reply->format; - bytes_left = reply->bytes_after; + + auto bytes_left = reply->bytes_after; int offset = 0, buffer_offset = 0; @@ -720,7 +712,8 @@ bool QXcbClipboard::clipboardReadProperty(xcb_window_t win, xcb_atom_t property, while (bytes_left) { // more to read... - reply = Q_XCB_REPLY(xcb_get_property, xcb_connection(), false, win, property, XCB_GET_PROPERTY_TYPE_ANY, offset, maxsize/4); + reply = Q_XCB_REPLY(xcb_get_property, xcb_connection(), false, win, property, + XCB_GET_PROPERTY_TYPE_ANY, offset, m_maxPropertyRequestDataBytes / 4); if (!reply || reply->type == XCB_NONE) break; diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h index 26d3b3b395..51ae0dc1ee 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.h +++ b/src/plugins/platforms/xcb/qxcbclipboard.h @@ -113,7 +113,7 @@ public: xcb_window_t getSelectionOwner(xcb_atom_t atom) const; QByteArray getSelection(xcb_atom_t selection, xcb_atom_t target, xcb_atom_t property, xcb_timestamp_t t = 0); - int increment() const { return m_increment; } + int increment() const { return m_maxPropertyRequestDataBytes; } int clipboardTimeout() const { return clipboard_timeout; } void removeTransaction(xcb_window_t window) { m_transactions.remove(window); } @@ -137,7 +137,7 @@ private: static const int clipboard_timeout; - int m_increment = 0; + int m_maxPropertyRequestDataBytes = 0; bool m_clipboard_closing = false; xcb_timestamp_t m_incr_receive_time = 0; diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 29acf0e86d..1ff06dd39e 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -132,6 +132,12 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra if (!m_startupId.isNull()) qunsetenv("DESKTOP_STARTUP_ID"); + m_focusInTimer.setSingleShot(true); + m_focusInTimer.callOnTimeout([]() { + // No FocusIn events for us, proceed with FocusOut normally. + QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason); + }); + sync(); } @@ -732,11 +738,6 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) m_glIntegration->handleXcbEvent(event, response_type); } -void QXcbConnection::addPeekFunc(PeekFunc f) -{ - m_peekFuncs.append(f); -} - void QXcbConnection::setFocusWindow(QWindow *w) { m_focusWindow = w ? static_cast<QXcbWindow *>(w->handle()) : nullptr; @@ -1016,15 +1017,6 @@ void QXcbConnection::processXcbEvents(QEventLoop::ProcessEventsFlags flags) if (compressEvent(event)) continue; - auto isWaitingFor = [=](PeekFunc peekFunc) { - // These callbacks return true if the event is what they were - // waiting for, remove them from the list in that case. - return peekFunc(this, event); - }; - m_peekFuncs.erase(std::remove_if(m_peekFuncs.begin(), m_peekFuncs.end(), - isWaitingFor), - m_peekFuncs.end()); - handleXcbEvent(event); // The lock-based solution used to free the lock inside this loop, @@ -1033,12 +1025,6 @@ void QXcbConnection::processXcbEvents(QEventLoop::ProcessEventsFlags flags) m_eventQueue->flushBufferedEvents(); } - // Indicate with a null event that the event the callbacks are waiting for - // is not in the queue currently. - for (PeekFunc f : qAsConst(m_peekFuncs)) - f(this, nullptr); - m_peekFuncs.clear(); - xcb_flush(xcb_connection()); } diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index 47036ca257..0e3ecd135b 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -43,6 +43,7 @@ #include <xcb/xcb.h> #include <xcb/randr.h> +#include <QtCore/QTimer> #include <QtGui/private/qtguiglobal_p.h> #include "qxcbexport.h" #include <QHash> @@ -183,9 +184,6 @@ public: QXcbWindowEventListener *windowEventListenerFromId(xcb_window_t id); QXcbWindow *platformWindowFromId(xcb_window_t id); - typedef bool (*PeekFunc)(QXcbConnection *, xcb_generic_event_t *); - void addPeekFunc(PeekFunc f); - inline xcb_timestamp_t time() const { return m_time; } inline void setTime(xcb_timestamp_t t) { if (t > m_time) m_time = t; } @@ -247,6 +245,8 @@ public: void flush() { xcb_flush(xcb_connection()); } void processXcbEvents(QEventLoop::ProcessEventsFlags flags); + QTimer &focusInTimer() { return m_focusInTimer; } + protected: bool event(QEvent *e) override; @@ -364,8 +364,6 @@ private: WindowMapper m_mapper; - QVector<PeekFunc> m_peekFuncs; - Qt::MouseButtons m_buttonState = 0; Qt::MouseButton m_button = Qt::NoButton; @@ -386,6 +384,8 @@ private: friend class QXcbEventQueue; QByteArray m_xdgCurrentDesktop; + QTimer m_focusInTimer; + }; #if QT_CONFIG(xcb_xinput) #if QT_CONFIG(tabletevent) diff --git a/src/plugins/platforms/xcb/qxcbconnection_basic.cpp b/src/plugins/platforms/xcb/qxcbconnection_basic.cpp index af72285135..9a028e5a7e 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_basic.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_basic.cpp @@ -134,6 +134,7 @@ QXcbBasicConnection::QXcbBasicConnection(const char *displayName) m_setup = xcb_get_setup(m_xcbConnection); m_xcbAtom.initialize(m_xcbConnection); + m_maximumRequestLength = xcb_get_maximum_request_length(m_xcbConnection); xcb_extension_t *extensions[] = { &xcb_shm_id, &xcb_xfixes_id, &xcb_randr_id, &xcb_shape_id, &xcb_sync_id, @@ -178,6 +179,14 @@ QXcbBasicConnection::~QXcbBasicConnection() } } +size_t QXcbBasicConnection::maxRequestDataBytes(size_t requestSize) const +{ + if (hasBigRequest()) + requestSize += 4; // big-request encoding adds 4 bytes + + return m_maximumRequestLength * 4 - requestSize; +} + xcb_atom_t QXcbBasicConnection::internAtom(const char *name) { if (!name || *name == 0) @@ -199,6 +208,11 @@ QByteArray QXcbBasicConnection::atomName(xcb_atom_t atom) return QByteArray(); } +bool QXcbBasicConnection::hasBigRequest() const +{ + return m_maximumRequestLength > m_setup->maximum_request_length; +} + #if QT_CONFIG(xcb_xinput) // Starting from the xcb version 1.9.3 struct xcb_ge_event_t has changed: // - "pad0" became "extension" diff --git a/src/plugins/platforms/xcb/qxcbconnection_basic.h b/src/plugins/platforms/xcb/qxcbconnection_basic.h index ca91f7fa45..3691763398 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_basic.h +++ b/src/plugins/platforms/xcb/qxcbconnection_basic.h @@ -73,6 +73,8 @@ public: } const xcb_setup_t *setup() const { return m_setup; } + size_t maxRequestDataBytes(size_t requestSize) const; + inline xcb_atom_t atom(QXcbAtom::Atom qatom) const { return m_xcbAtom.atom(qatom); } QXcbAtom::Atom qatom(xcb_atom_t atom) const { return m_xcbAtom.qatom(atom); } xcb_atom_t internAtom(const char *name); @@ -94,6 +96,7 @@ public: bool hasShmFd() const { return m_hasShmFd; } bool hasXSync() const { return m_hasXSync; } bool hasXinerama() const { return m_hasXinerama; } + bool hasBigRequest() const; #if QT_CONFIG(xcb_xinput) bool isAtLeastXI21() const { return m_xi2Enabled && m_xi2Minor >= 1; } @@ -152,6 +155,8 @@ private: uint32_t m_xfixesFirstEvent = 0; uint32_t m_xrandrFirstEvent = 0; uint32_t m_xkbFirstEvent = 0; + + uint32_t m_maximumRequestLength = 0; }; #define Q_XCB_REPLY_CONNECTION_ARG(connection, ...) connection diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp index 9aba996bb9..4bafe83156 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp @@ -208,7 +208,7 @@ void QXcbConnection::updateScreen(QXcbScreen *screen, const xcb_randr_output_cha const int idx = m_screens.indexOf(screen); if (idx > 0) { qAsConst(m_screens).first()->setPrimary(false); - m_screens.swap(0, idx); + m_screens.swapItemsAt(0, idx); } screen->virtualDesktop()->setPrimaryScreen(screen); QXcbIntegration::instance()->setPrimaryScreen(screen); @@ -260,7 +260,7 @@ void QXcbConnection::destroyScreen(QXcbScreen *screen) newPrimary->setPrimary(true); const int idx = m_screens.indexOf(newPrimary); if (idx > 0) - m_screens.swap(0, idx); + m_screens.swapItemsAt(0, idx); QXcbIntegration::instance()->setPrimaryScreen(newPrimary); } diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp index 04ddd3c98c..78ef7760af 100644 --- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp @@ -637,7 +637,7 @@ void QXcbConnection::xi2ProcessTouch(void *xiDevEvent, QXcbWindow *platformWindo qreal nx = -1.0, ny = -1.0; qreal w = 0.0, h = 0.0; bool majorAxisIsY = touchPoint.area.height() > touchPoint.area.width(); - for (const TouchDeviceData::ValuatorClassInfo vci : dev->valuatorInfo) { + for (const TouchDeviceData::ValuatorClassInfo &vci : qAsConst(dev->valuatorInfo)) { double value; if (!xi2GetValuatorValueIfSet(xiDeviceEvent, vci.number, &value)) continue; @@ -823,7 +823,7 @@ bool QXcbConnection::xi2SetMouseGrabEnabled(xcb_window_t w, bool grab) | XCB_INPUT_XI_EVENT_MASK_TOUCH_UPDATE | XCB_INPUT_XI_EVENT_MASK_TOUCH_END; - for (int id : m_xiMasterPointerIds) { + for (int id : qAsConst(m_xiMasterPointerIds)) { xcb_generic_error_t *error = nullptr; auto cookie = xcb_input_xi_grab_device(xcb_connection(), w, XCB_CURRENT_TIME, XCB_CURSOR_NONE, id, XCB_INPUT_GRAB_MODE_22_ASYNC, XCB_INPUT_GRAB_MODE_22_ASYNC, @@ -841,7 +841,7 @@ bool QXcbConnection::xi2SetMouseGrabEnabled(xcb_window_t w, bool grab) free(reply); } } else { // ungrab - for (int id : m_xiMasterPointerIds) { + for (int id : qAsConst(m_xiMasterPointerIds)) { auto cookie = xcb_input_xi_ungrab_device_checked(xcb_connection(), XCB_CURRENT_TIME, id); xcb_generic_error_t *error = xcb_request_check(xcb_connection(), cookie); if (error) { diff --git a/src/plugins/platforms/xcb/qxcbeventqueue.cpp b/src/plugins/platforms/xcb/qxcbeventqueue.cpp index acec0486c2..82a36c0727 100644 --- a/src/plugins/platforms/xcb/qxcbeventqueue.cpp +++ b/src/plugins/platforms/xcb/qxcbeventqueue.cpp @@ -262,7 +262,7 @@ qint32 QXcbEventQueue::generatePeekerId() bool QXcbEventQueue::removePeekerId(qint32 peekerId) { - const auto it = m_peekerToNode.find(peekerId); + const auto it = m_peekerToNode.constFind(peekerId); if (it == m_peekerToNode.constEnd()) { qCWarning(lcQpaXcb, "failed to remove unknown peeker id: %d", peekerId); return false; @@ -281,7 +281,7 @@ bool QXcbEventQueue::peekEventQueue(PeekerCallback peeker, void *peekerData, const bool peekerIdProvided = peekerId != -1; auto peekerToNodeIt = m_peekerToNode.find(peekerId); - if (peekerIdProvided && peekerToNodeIt == m_peekerToNode.constEnd()) { + if (peekerIdProvided && peekerToNodeIt == m_peekerToNode.end()) { qCWarning(lcQpaXcb, "failed to find index for unknown peeker id: %d", peekerId); return false; } @@ -341,7 +341,7 @@ bool QXcbEventQueue::peekEventQueue(PeekerCallback peeker, void *peekerData, // Before updating, make sure that a peeker callback did not remove // the peeker id. peekerToNodeIt = m_peekerToNode.find(peekerId); - if (peekerToNodeIt != m_peekerToNode.constEnd()) + if (peekerToNodeIt != m_peekerToNode.end()) *peekerToNodeIt = node; // id still in the cache, update node } diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp index 524af5a2a7..4d526a6bda 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp @@ -304,7 +304,7 @@ QPlatformNativeInterface::NativeResourceForWindowFunction QXcbNativeInterface::n QPlatformNativeInterface::NativeResourceForBackingStoreFunction QXcbNativeInterface::nativeResourceFunctionForBackingStore(const QByteArray &resource) { const QByteArray lowerCaseResource = resource.toLower(); - NativeResourceForBackingStoreFunction func = handlerNativeResourceFunctionForBackingStore(resource); + NativeResourceForBackingStoreFunction func = handlerNativeResourceFunctionForBackingStore(lowerCaseResource); return func; } diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 57dbdc9bec..0fa0e8cd7b 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -147,7 +147,7 @@ void QXcbVirtualDesktop::setPrimaryScreen(QPlatformScreen *s) { const int idx = m_screens.indexOf(s); Q_ASSERT(idx > -1); - m_screens.swap(0, idx); + m_screens.swapItemsAt(0, idx); } QXcbXSettings *QXcbVirtualDesktop::xSettings() const diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.h b/src/plugins/platforms/xcb/qxcbsessionmanager.h index 0ad9445361..79c587b38d 100644 --- a/src/plugins/platforms/xcb/qxcbsessionmanager.h +++ b/src/plugins/platforms/xcb/qxcbsessionmanager.h @@ -85,8 +85,6 @@ public: private: QEventLoop *m_eventLoop; - - Q_DISABLE_COPY(QXcbSessionManager) }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 3bfcbf2adb..9382488b74 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -843,40 +843,12 @@ void QXcbWindow::doFocusIn() QWindowSystemInterface::handleWindowActivated(w, Qt::ActiveWindowFocusReason); } -static bool focusInPeeker(QXcbConnection *connection, xcb_generic_event_t *event) -{ - if (!event) { - // FocusIn event is not in the queue, proceed with FocusOut normally. - QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason); - return true; - } - uint response_type = event->response_type & ~0x80; - if (response_type == XCB_FOCUS_IN) { - // Ignore focus events that are being sent only because the pointer is over - // our window, even if the input focus is in a different window. - xcb_focus_in_event_t *e = (xcb_focus_in_event_t *) event; - if (e->detail != XCB_NOTIFY_DETAIL_POINTER) - return true; - } - - /* We are also interested in XEMBED_FOCUS_IN events */ - if (response_type == XCB_CLIENT_MESSAGE) { - xcb_client_message_event_t *cme = (xcb_client_message_event_t *)event; - if (cme->type == connection->atom(QXcbAtom::_XEMBED) - && cme->data.data32[1] == XEMBED_FOCUS_IN) - return true; - } - - return false; -} - void QXcbWindow::doFocusOut() { connection()->setFocusWindow(nullptr); relayFocusToModalWindow(); // Do not set the active window to nullptr if there is a FocusIn coming. - // The FocusIn handler will update QXcbConnection::setFocusWindow() accordingly. - connection()->addPeekFunc(focusInPeeker); + connection()->focusInTimer().start(400); } struct QtMotifWmHints { @@ -2264,6 +2236,8 @@ void QXcbWindow::handleFocusInEvent(const xcb_focus_in_event_t *event) // our window, even if the input focus is in a different window. if (event->detail == XCB_NOTIFY_DETAIL_POINTER) return; + + connection()->focusInTimer().stop(); doFocusIn(); } @@ -2491,6 +2465,7 @@ void QXcbWindow::handleXEmbedMessage(const xcb_client_message_event_t *event) xcbScreen()->windowShown(this); break; case XEMBED_FOCUS_IN: + connection()->focusInTimer().stop(); Qt::FocusReason reason; switch (event->data.data32[2]) { case XEMBED_FOCUS_FIRST: diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h index b72e676419..2be88bb4c0 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h +++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h @@ -82,7 +82,7 @@ public: private: QScopedPointer<QXdgDesktopPortalThemePrivate> d_ptr; - Q_DISABLE_COPY(QXdgDesktopPortalTheme) + Q_DISABLE_COPY_MOVE(QXdgDesktopPortalTheme) }; QT_END_NAMESPACE diff --git a/src/plugins/printsupport/cups/qcupsprintengine_p.h b/src/plugins/printsupport/cups/qcupsprintengine_p.h index 2a1a83b9d7..c021b0c643 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine_p.h +++ b/src/plugins/printsupport/cups/qcupsprintengine_p.h @@ -77,7 +77,7 @@ public: // end reimplementations QPdfPrintEngine private: - Q_DISABLE_COPY(QCupsPrintEngine) + Q_DISABLE_COPY_MOVE(QCupsPrintEngine) }; class QCupsPrintEnginePrivate : public QPdfPrintEnginePrivate @@ -91,7 +91,7 @@ public: void closePrintDevice() override; private: - Q_DISABLE_COPY(QCupsPrintEnginePrivate) + Q_DISABLE_COPY_MOVE(QCupsPrintEnginePrivate) void changePrinter(const QString &newPrinter); void setPageSize(const QPageSize &pageSize); diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.h b/src/plugins/printsupport/windows/qwindowsprintersupport.h index 4267701145..400701628e 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.h +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QWindowsPrinterSupport : public QPlatformPrinterSupport { - Q_DISABLE_COPY(QWindowsPrinterSupport) + Q_DISABLE_COPY_MOVE(QWindowsPrinterSupport) public: QWindowsPrinterSupport(); ~QWindowsPrinterSupport() override; diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index f2ae3fbc47..febbe58506 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -197,6 +197,7 @@ protected: QSqlRecord record() const override; void virtual_hook(int id, void *data) override; bool nextResult() override; + void detachFromResultSet() override; #if MYSQL_VERSION_ID >= 40108 bool prepare(const QString &stmt) override; @@ -804,6 +805,15 @@ int QMYSQLResult::numRowsAffected() return d->rowsAffected; } +void QMYSQLResult::detachFromResultSet() +{ + Q_D(QMYSQLResult); + + if (d->preparedQuery) { + mysql_stmt_free_result(d->stmt); + } +} + QVariant QMYSQLResult::lastInsertId() const { Q_D(const QMYSQLResult); @@ -1541,7 +1551,7 @@ QSqlIndex QMYSQLDriver::primaryIndex(const QString& tablename) const QSqlQuery i(createResult()); QString stmt(QLatin1String("show index from %1;")); QSqlRecord fil = record(tablename); - i.exec(stmt.arg(tablename)); + i.exec(stmt.arg(escapeIdentifier(tablename, QSqlDriver::TableName))); while (i.isActive() && i.next()) { if (i.value(2).toString() == QLatin1String("PRIMARY")) { idx.append(fil.field(i.value(4).toString())); diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index 1fbbcd0ef1..7f98efccba 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -345,7 +345,7 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type, { int nativeCode = -1; QString message = qODBCWarn(p, &nativeCode); - return QSqlError(QLatin1String("QODBC3: ") + err, qODBCWarn(p), type, + return QSqlError(QLatin1String("QODBC3: ") + err, message, type, nativeCode != -1 ? QString::number(nativeCode) : QString()); } diff --git a/src/plugins/sqldrivers/psql/main.cpp b/src/plugins/sqldrivers/psql/main.cpp index c5d546f6ff..a0862a238a 100644 --- a/src/plugins/sqldrivers/psql/main.cpp +++ b/src/plugins/sqldrivers/psql/main.cpp @@ -61,11 +61,9 @@ QPSQLDriverPlugin::QPSQLDriverPlugin() QSqlDriver* QPSQLDriverPlugin::create(const QString &name) { - if (name == QLatin1String("QPSQL") || name == QLatin1String("QPSQL7")) { - QPSQLDriver* driver = new QPSQLDriver(); - return driver; - } - return 0; + if (name == QLatin1String("QPSQL") || name == QLatin1String("QPSQL7")) + return new QPSQLDriver; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index 7ad9db1ea8..49b793ce38 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -42,7 +42,7 @@ #include <qcoreapplication.h> #include <qvariant.h> #include <qdatetime.h> -#include <qregexp.h> +#include <qregularexpression.h> #include <qsqlerror.h> #include <qsqlfield.h> #include <qsqlindex.h> @@ -54,6 +54,8 @@ #include <QtSql/private/qsqlresult_p.h> #include <QtSql/private/qsqldriver_p.h> +#include <queue> + #include <libpq-fe.h> #include <pg_config.h> @@ -147,10 +149,10 @@ class QPSQLDriverPrivate final : public QSqlDriverPrivate Q_DECLARE_PUBLIC(QPSQLDriver) public: QPSQLDriverPrivate() : QSqlDriverPrivate(), - connection(0), + connection(nullptr), isUtf8(false), pro(QPSQLDriver::Version6), - sn(0), + sn(nullptr), pendingNotifyCheck(false), hasBackslashEscape(false), stmtCount(0), @@ -187,11 +189,13 @@ public: void QPSQLDriverPrivate::appendTables(QStringList &tl, QSqlQuery &t, QChar type) { - QString query = QString::fromLatin1("select pg_class.relname, pg_namespace.nspname from pg_class " - "left join pg_namespace on (pg_class.relnamespace = pg_namespace.oid) " - "where (pg_class.relkind = '%1') and (pg_class.relname !~ '^Inv') " - "and (pg_class.relname !~ '^pg_') " - "and (pg_namespace.nspname != 'information_schema')").arg(type); + const QString query = + QStringLiteral("SELECT pg_class.relname, pg_namespace.nspname FROM pg_class " + "LEFT JOIN pg_namespace ON (pg_class.relnamespace = pg_namespace.oid) " + "WHERE (pg_class.relkind = '") + type + + QStringLiteral("') AND (pg_class.relname !~ '^Inv') " + "AND (pg_class.relname !~ '^pg_') " + "AND (pg_namespace.nspname != 'information_schema')"); t.exec(query); while (t.next()) { QString schema = t.value(1).toString(); @@ -294,10 +298,10 @@ public: Q_DECLARE_SQLDRIVER_PRIVATE(QPSQLDriver) QPSQLResultPrivate(QPSQLResult *q, const QPSQLDriver *drv) : QSqlResultPrivate(q, drv), - result(0), + result(nullptr), + stmtId(InvalidStatementId), currentSize(-1), canFetchMoreRows(false), - stmtId(InvalidStatementId), preparedQueriesEnabled(false) { } @@ -305,12 +309,12 @@ public: void deallocatePreparedStmt(); PGresult *result; - QList<PGresult*> nextResultSets; + std::queue<PGresult*> nextResultSets; + QString preparedStmtId; + StatementId stmtId; int currentSize; bool canFetchMoreRows; - StatementId stmtId; bool preparedQueriesEnabled; - QString preparedStmtId; bool processResults(); }; @@ -423,7 +427,7 @@ static QVariant::Type qDecodePSQLType(int t) void QPSQLResultPrivate::deallocatePreparedStmt() { - const QString stmt = QLatin1String("DEALLOCATE ") + preparedStmtId; + const QString stmt = QStringLiteral("DEALLOCATE ") + preparedStmtId; PGresult *result = drv_d_func()->exec(stmt); if (PQresultStatus(result) != PGRES_COMMAND_OK) @@ -460,8 +464,10 @@ void QPSQLResult::cleanup() if (d->result) PQclear(d->result); d->result = nullptr; - while (!d->nextResultSets.isEmpty()) - PQclear(d->nextResultSets.takeFirst()); + while (!d->nextResultSets.empty()) { + PQclear(d->nextResultSets.front()); + d->nextResultSets.pop(); + } if (d->stmtId != InvalidStatementId) { if (d->drv_d_func()) d->drv_d_func()->finishQuery(d->stmtId); @@ -622,7 +628,11 @@ bool QPSQLResult::nextResult() if (d->result) PQclear(d->result); - d->result = d->nextResultSets.isEmpty() ? nullptr : d->nextResultSets.takeFirst(); + d->result = nullptr; + if (!d->nextResultSets.empty()) { + d->result = d->nextResultSets.front(); + d->nextResultSets.pop(); + } return d->processResults(); } @@ -646,9 +656,9 @@ QVariant QPSQLResult::data(int i) return d->drv_d_func()->isUtf8 ? QString::fromUtf8(val) : QString::fromLatin1(val); case QVariant::LongLong: if (val[0] == '-') - return QString::fromLatin1(val).toLongLong(); + return QByteArray::fromRawData(val, qstrlen(val)).toLongLong(); else - return QString::fromLatin1(val).toULongLong(); + return QByteArray::fromRawData(val, qstrlen(val)).toULongLong(); case QVariant::Int: return atoi(val); case QVariant::Double: { @@ -754,7 +764,7 @@ bool QPSQLResult::reset (const QString& query) if (!isForwardOnly()) { // Fetch all result sets right away while (PGresult *nextResultSet = d->drv_d_func()->getResult(d->stmtId)) - d->nextResultSets.append(nextResultSet); + d->nextResultSets.push(nextResultSet); } return d->processResults(); } @@ -768,7 +778,8 @@ int QPSQLResult::size() int QPSQLResult::numRowsAffected() { Q_D(const QPSQLResult); - return QString::fromLatin1(PQcmdTuples(d->result)).toInt(); + const char *tuples = PQcmdTuples(d->result); + return QByteArray::fromRawData(tuples, qstrlen(tuples)).toInt(); } QVariant QPSQLResult::lastInsertId() const @@ -777,7 +788,7 @@ QVariant QPSQLResult::lastInsertId() const if (d->drv_d_func()->pro >= QPSQLDriver::Version8_1) { QSqlQuery qry(driver()->createResult()); // Most recent sequence value obtained from nextval - if (qry.exec(QLatin1String("SELECT lastval();")) && qry.next()) + if (qry.exec(QStringLiteral("SELECT lastval();")) && qry.next()) return qry.value(0); } else if (isActive()) { Oid id = PQoidValue(d->result); @@ -868,15 +879,13 @@ static QString qCreateParamString(const QVector<QVariant> &boundValues, const QS QString params; QSqlField f; - for (int i = 0; i < boundValues.count(); ++i) { - const QVariant &val = boundValues.at(i); - + for (const QVariant &val : boundValues) { f.setType(val.type()); if (val.isNull()) f.clear(); else f.setValue(val); - if(!params.isNull()) + if (!params.isNull()) params.append(QLatin1String(", ")); params.append(driver->formatValue(f)); } @@ -886,7 +895,7 @@ static QString qCreateParamString(const QVector<QVariant> &boundValues, const QS QString qMakePreparedStmtId() { static QBasicAtomicInt qPreparedStmtCount = Q_BASIC_ATOMIC_INITIALIZER(0); - QString id = QLatin1String("qpsqlpstmt_") + QString::number(qPreparedStmtCount.fetchAndAddRelaxed(1) + 1, 16); + QString id = QStringLiteral("qpsqlpstmt_") + QString::number(qPreparedStmtCount.fetchAndAddRelaxed(1) + 1, 16); return id; } @@ -902,7 +911,7 @@ bool QPSQLResult::prepare(const QString &query) d->deallocatePreparedStmt(); const QString stmtId = qMakePreparedStmtId(); - const QString stmt = QString::fromLatin1("PREPARE %1 AS ").arg(stmtId).append(d->positionalToNamedBinding(query)); + const QString stmt = QStringLiteral("PREPARE %1 AS ").arg(stmtId).append(d->positionalToNamedBinding(query)); PGresult *result = d->drv_d_func()->exec(stmt); @@ -930,9 +939,9 @@ bool QPSQLResult::exec() QString stmt; const QString params = qCreateParamString(boundValues(), driver()); if (params.isEmpty()) - stmt = QString::fromLatin1("EXECUTE %1").arg(d->preparedStmtId); + stmt = QStringLiteral("EXECUTE %1").arg(d->preparedStmtId); else - stmt = QString::fromLatin1("EXECUTE %1 (%2)").arg(d->preparedStmtId, params); + stmt = QStringLiteral("EXECUTE %1 (%2)").arg(d->preparedStmtId, params); d->stmtId = d->drv_d_func()->sendQuery(stmt); if (d->stmtId == InvalidStatementId) { @@ -948,7 +957,7 @@ bool QPSQLResult::exec() if (!isForwardOnly()) { // Fetch all result sets right away while (PGresult *nextResultSet = d->drv_d_func()->getResult(d->stmtId)) - d->nextResultSets.append(nextResultSet); + d->nextResultSets.push(nextResultSet); } return d->processResults(); } @@ -994,7 +1003,7 @@ void QPSQLDriverPrivate::detectBackslashEscape() hasBackslashEscape = true; } else { hasBackslashEscape = false; - PGresult* result = exec(QLatin1String("SELECT '\\\\' x")); + PGresult* result = exec(QStringLiteral("SELECT '\\\\' x")); int status = PQresultStatus(result); if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) if (QString::fromLatin1(PQgetvalue(result, 0, 0)) == QLatin1String("\\")) @@ -1072,20 +1081,21 @@ static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin) static QPSQLDriver::Protocol qFindPSQLVersion(const QString &versionString) { - const QRegExp rx(QStringLiteral("(\\d+)(?:\\.(\\d+))?")); - if (rx.indexIn(versionString) != -1) { + const QRegularExpression rx(QStringLiteral("(\\d+)(?:\\.(\\d+))?")); + const QRegularExpressionMatch match = rx.match(versionString); + if (match.hasMatch()) { // Beginning with PostgreSQL version 10, a major release is indicated by // increasing the first part of the version, e.g. 10 to 11. // Before version 10, a major release was indicated by increasing either // the first or second part of the version number, e.g. 9.5 to 9.6. - int vMaj = rx.cap(1).toInt(); + int vMaj = match.capturedRef(1).toInt(); int vMin; if (vMaj >= 10) { vMin = 0; } else { - if (rx.cap(2).isEmpty()) + if (match.capturedRef(2).isEmpty()) return QPSQLDriver::VersionUnknown; - vMin = rx.cap(2).toInt(); + vMin = match.capturedRef(2).toInt(); } return qMakePSQLVersion(vMaj, vMin); } @@ -1096,7 +1106,7 @@ static QPSQLDriver::Protocol qFindPSQLVersion(const QString &versionString) QPSQLDriver::Protocol QPSQLDriverPrivate::getPSQLVersion() { QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6; - PGresult* result = exec("select version()"); + PGresult* result = exec("SELECT version()"); int status = PQresultStatus(result); if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) { serverVersion = qFindPSQLVersion( @@ -1355,8 +1365,8 @@ QStringList QPSQLDriver::tables(QSql::TableType type) const if (type & QSql::Views) const_cast<QPSQLDriverPrivate*>(d)->appendTables(tl, t, QLatin1Char('v')); if (type & QSql::SystemTables) { - t.exec(QLatin1String("select relname from pg_class where (relkind = 'r') " - "and (relname like 'pg_%') ")); + t.exec(QStringLiteral("SELECT relname FROM pg_class WHERE (relkind = 'r') " + "AND (relname LIKE 'pg_%') ")); while (t.next()) tl.append(t.value(0).toString()); } @@ -1383,31 +1393,23 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const QString tbl = tablename; QString schema; qSplitTableName(tbl, schema); - - if (isIdentifierEscaped(tbl, QSqlDriver::TableName)) - tbl = stripDelimiters(tbl, QSqlDriver::TableName); - else - tbl = std::move(tbl).toLower(); - - if (isIdentifierEscaped(schema, QSqlDriver::TableName)) - schema = stripDelimiters(schema, QSqlDriver::TableName); - else - schema = std::move(schema).toLower(); - - QString stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " - "pg_class.relname " - "FROM pg_attribute, pg_class " - "WHERE %1 pg_class.oid IN " - "(SELECT indexrelid FROM pg_index WHERE indisprimary = true AND indrelid IN " - "(SELECT oid FROM pg_class WHERE relname = '%2')) " - "AND pg_attribute.attrelid = pg_class.oid " - "AND pg_attribute.attisdropped = false " - "ORDER BY pg_attribute.attnum"); + schema = stripDelimiters(schema, QSqlDriver::TableName); + tbl = stripDelimiters(tbl, QSqlDriver::TableName); + + QString stmt = QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " + "pg_class.relname " + "FROM pg_attribute, pg_class " + "WHERE %1 pg_class.oid IN " + "(SELECT indexrelid FROM pg_index WHERE indisprimary = true AND indrelid IN " + "(SELECT oid FROM pg_class WHERE relname = '%2')) " + "AND pg_attribute.attrelid = pg_class.oid " + "AND pg_attribute.attisdropped = false " + "ORDER BY pg_attribute.attnum"); if (schema.isEmpty()) - stmt = stmt.arg(QLatin1String("pg_table_is_visible(pg_class.oid) AND")); + stmt = stmt.arg(QStringLiteral("pg_table_is_visible(pg_class.oid) AND")); else - stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from " - "pg_namespace where pg_namespace.nspname = '%1') AND").arg(schema)); + stmt = stmt.arg(QStringLiteral("pg_class.relnamespace = (SELECT oid FROM " + "pg_namespace WHERE pg_namespace.nspname = '%1') AND").arg(schema)); i.exec(stmt.arg(tbl)); while (i.isActive() && i.next()) { @@ -1427,34 +1429,26 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const QString tbl = tablename; QString schema; qSplitTableName(tbl, schema); - - if (isIdentifierEscaped(tbl, QSqlDriver::TableName)) - tbl = stripDelimiters(tbl, QSqlDriver::TableName); - else - tbl = std::move(tbl).toLower(); - - if (isIdentifierEscaped(schema, QSqlDriver::TableName)) - schema = stripDelimiters(schema, QSqlDriver::TableName); - else - schema = std::move(schema).toLower(); - - QString stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, " - "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, " - "pg_attrdef.adsrc " - "from pg_class, pg_attribute " - "left join pg_attrdef on (pg_attrdef.adrelid = " - "pg_attribute.attrelid and pg_attrdef.adnum = pg_attribute.attnum) " - "where %1 " - "and pg_class.relname = '%2' " - "and pg_attribute.attnum > 0 " - "and pg_attribute.attrelid = pg_class.oid " - "and pg_attribute.attisdropped = false " - "order by pg_attribute.attnum"); + schema = stripDelimiters(schema, QSqlDriver::TableName); + tbl = stripDelimiters(tbl, QSqlDriver::TableName); + + QString stmt = QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " + "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, " + "pg_attrdef.adsrc " + "FROM pg_class, pg_attribute " + "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = " + "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) " + "WHERE %1 " + "AND pg_class.relname = '%2' " + "AND pg_attribute.attnum > 0 " + "AND pg_attribute.attrelid = pg_class.oid " + "AND pg_attribute.attisdropped = false " + "ORDER BY pg_attribute.attnum"); if (schema.isEmpty()) - stmt = stmt.arg(QLatin1String("pg_table_is_visible(pg_class.oid)")); + stmt = stmt.arg(QStringLiteral("pg_table_is_visible(pg_class.oid)")); else - stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from " - "pg_namespace where pg_namespace.nspname = '%1')").arg(schema)); + stmt = stmt.arg(QStringLiteral("pg_class.relnamespace = (SELECT oid FROM " + "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema)); QSqlQuery query(createResult()); query.exec(stmt.arg(tbl)); @@ -1496,9 +1490,10 @@ inline void assignSpecialPsqlFloatValue(FloatType val, QString *target) QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const { Q_D(const QPSQLDriver); + const auto nullStr = [](){ return QStringLiteral("NULL"); }; QString r; if (field.isNull()) { - r = QLatin1String("NULL"); + r = nullStr(); } else { switch (int(field.type())) { case QVariant::DateTime: @@ -1507,14 +1502,14 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const // we force the value to be considered with a timezone information, and we force it to be UTC // this is safe since postgresql stores only the UTC value and not the timezone offset (only used // while parsing), so we have correct behavior in both case of with timezone and without tz - r = QLatin1String("TIMESTAMP WITH TIME ZONE ") + QLatin1Char('\'') + - QLocale::c().toString(field.value().toDateTime().toUTC(), QLatin1String("yyyy-MM-ddThh:mm:ss.zzz")) + + r = QStringLiteral("TIMESTAMP WITH TIME ZONE ") + QLatin1Char('\'') + + QLocale::c().toString(field.value().toDateTime().toUTC(), QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz")) + QLatin1Char('Z') + QLatin1Char('\''); } else { - r = QLatin1String("NULL"); + r = nullStr(); } #else - r = QLatin1String("NULL"); + r = nullStr(); #endif // datestring break; case QVariant::Time: @@ -1524,19 +1519,19 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const } else #endif { - r = QLatin1String("NULL"); + r = nullStr(); } break; case QVariant::String: r = QSqlDriver::formatValue(field, trimStrings); if (d->hasBackslashEscape) - r.replace(QLatin1String("\\"), QLatin1String("\\\\")); + r.replace(QLatin1Char('\\'), QLatin1String("\\\\")); break; case QVariant::Bool: if (field.value().toBool()) - r = QLatin1String("TRUE"); + r = QStringLiteral("TRUE"); else - r = QLatin1String("FALSE"); + r = QStringLiteral("FALSE"); break; case QVariant::ByteArray: { QByteArray ba(field.value().toByteArray()); @@ -1615,7 +1610,7 @@ bool QPSQLDriver::subscribeToNotification(const QString &name) // Add the name to the list of subscriptions here so that QSQLDriverPrivate::exec knows // to check for notifications immediately after executing the LISTEN d->seid << name; - QString query = QLatin1String("LISTEN ") + escapeIdentifier(name, QSqlDriver::TableName); + QString query = QStringLiteral("LISTEN ") + escapeIdentifier(name, QSqlDriver::TableName); PGresult *result = d->exec(query); if (PQresultStatus(result) != PGRES_COMMAND_OK) { d->seid.removeLast(); @@ -1651,7 +1646,7 @@ bool QPSQLDriver::unsubscribeFromNotification(const QString &name) return false; } - QString query = QLatin1String("UNLISTEN ") + escapeIdentifier(name, QSqlDriver::TableName); + QString query = QStringLiteral("UNLISTEN ") + escapeIdentifier(name, QSqlDriver::TableName); PGresult *result = d->exec(query); if (PQresultStatus(result) != PGRES_COMMAND_OK) { setLastError(qMakeError(tr("Unable to unsubscribe"), QSqlError::StatementError, d, result)); diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h index 7e1849d857..4f372346c6 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql_p.h +++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h @@ -96,8 +96,8 @@ public: UnknownLaterVersion = 100000 }; - explicit QPSQLDriver(QObject *parent=0); - explicit QPSQLDriver(PGconn *conn, QObject *parent=0); + explicit QPSQLDriver(QObject *parent = nullptr); + explicit QPSQLDriver(PGconn *conn, QObject *parent = nullptr); ~QPSQLDriver(); bool hasFeature(DriverFeature f) const override; bool open(const QString & db, diff --git a/src/plugins/styles/android/qandroidstyle_p.h b/src/plugins/styles/android/qandroidstyle_p.h index 3faa08afb9..6cb30a2f79 100644 --- a/src/plugins/styles/android/qandroidstyle_p.h +++ b/src/plugins/styles/android/qandroidstyle_p.h @@ -371,7 +371,7 @@ public: void unpolish(QWidget *widget); private: - Q_DISABLE_COPY(QAndroidStyle) + Q_DISABLE_COPY_MOVE(QAndroidStyle) static ItemType qtControl(QStyle::ComplexControl control); static ItemType qtControl(QStyle::ContentsType contentsType); static ItemType qtControl(QStyle::ControlElement controlElement); diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 13ef98b840..9602340f9d 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -4004,7 +4004,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter titleRect.width()); const auto text = p->fontMetrics().elidedText(dwOpt->title, Qt::ElideRight, titleRect.width()); - proxy()->drawItemText(p, titleRect, Qt::AlignCenter | Qt::TextShowMnemonic, dwOpt->palette, + proxy()->drawItemText(p, titleRect, Qt::AlignCenter, dwOpt->palette, dwOpt->state & State_Enabled, text, QPalette::WindowText); } p->restore(); diff --git a/src/plugins/styles/mac/qmacstyle_mac_p.h b/src/plugins/styles/mac/qmacstyle_mac_p.h index d6874001d3..88f104cccf 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p.h @@ -115,7 +115,7 @@ public: const QWidget *widget = 0) const; private: - Q_DISABLE_COPY(QMacStyle) + Q_DISABLE_COPY_MOVE(QMacStyle) Q_DECLARE_PRIVATE(QMacStyle) }; diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp index 771552a121..8a3ae17b1d 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp @@ -632,7 +632,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt { QPen pen = painter->pen(); int margin = 3; - painter->setPen(option->palette.background().color().darker(114)); + painter->setPen(option->palette.window().color().darker(114)); if (option->state & State_Horizontal) { int x1 = option->rect.center().x(); painter->drawLine(QPoint(x1, option->rect.top() + margin), QPoint(x1, option->rect.bottom() - margin)); @@ -704,7 +704,7 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt if (sectionSize.width() > 0 && sectionSize.height() > 0) { QString key = QString::fromLatin1("qvdelegate-%1-%2-%3-%4-%5").arg(sectionSize.width()) .arg(sectionSize.height()).arg(selected).arg(active).arg(hover); - if (!QPixmapCache::find(key, pixmap)) { + if (!QPixmapCache::find(key, &pixmap)) { pixmap = QPixmap(sectionSize); pixmap.fill(Qt::transparent); @@ -1053,7 +1053,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption } QString name = QString::fromLatin1("qiprogress-%1-%2").arg(pixmapSize.width()).arg(pixmapSize.height()); QPixmap pixmap; - if (!QPixmapCache::find(name, pixmap)) { + if (!QPixmapCache::find(name, &pixmap)) { QImage image(pixmapSize, QImage::Format_ARGB32); image.fill(Qt::transparent); QPainter imagePainter(&image); @@ -1363,7 +1363,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption case CE_ToolBar: if (const QStyleOptionToolBar *toolbar = qstyleoption_cast<const QStyleOptionToolBar *>(option)) { QPalette pal = option->palette; - pal.setColor(QPalette::Dark, option->palette.background().color().darker(130)); + pal.setColor(QPalette::Dark, option->palette.window().color().darker(130)); QStyleOptionToolBar copyOpt = *toolbar; copyOpt.palette = pal; QWindowsStyle::drawControl(element, ©Opt, painter, widget); @@ -1388,8 +1388,8 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption painter->translate(-rect.left() + 1, -rect.top()); } - painter->setBrush(option->palette.background().color().darker(110)); - painter->setPen(option->palette.background().color().darker(130)); + painter->setBrush(option->palette.window().color().darker(110)); + painter->setPen(option->palette.window().color().darker(130)); painter->drawRect(rect.adjusted(0, 1, -1, -3)); int buttonMargin = 4; diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle_p.h b/src/plugins/styles/windowsvista/qwindowsvistastyle_p.h index 0ebb0eb41a..43a2a670f8 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle_p.h +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle_p.h @@ -99,7 +99,7 @@ public: QPalette standardPalette() const override; private: - Q_DISABLE_COPY(QWindowsVistaStyle) + Q_DISABLE_COPY_MOVE(QWindowsVistaStyle) Q_DECLARE_PRIVATE(QWindowsVistaStyle) friend class QStyleFactory; }; diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp index 4b583e13d3..90026e5bf0 100644 --- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp @@ -511,8 +511,8 @@ QRegion QWindowsXPStylePrivate::region(XPThemeData &themeData) if (numBytes == 0) return QRegion(); - char *buf = new char[numBytes]; - if (buf == 0) + char *buf = new (std::nothrow) char[numBytes]; + if (!buf) return QRegion(); RGNDATA *rd = reinterpret_cast<RGNDATA*>(buf); @@ -740,7 +740,8 @@ bool QWindowsXPStylePrivate::drawBackgroundDirectly(HDC dc, XPThemeData &themeDa { QPainter *painter = themeData.painter; - const QPointF redirectionDelta(painter->deviceMatrix().dx(), painter->deviceMatrix().dy()); + const auto deviceTransform = painter->deviceTransform(); + const QPointF redirectionDelta(deviceTransform.dx(), deviceTransform.dy()); const QRect area = scaleRect(QRectF(themeData.rect), additionalDevicePixelRatio).translated(redirectionDelta).toRect(); QRegion sysRgn = painter->paintEngine()->systemClip(); @@ -835,7 +836,7 @@ bool QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa alphaType = data.alphaType; potentialInvalidAlpha = data.hadInvalidAlpha; - haveCachedPixmap = QPixmapCache::find(pixmapCacheKey, cachedPixmap); + haveCachedPixmap = QPixmapCache::find(pixmapCacheKey, &cachedPixmap); #ifdef DEBUG_XP_STYLE char buf[25]; diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle_p.h b/src/plugins/styles/windowsvista/qwindowsxpstyle_p.h index 7e9f4ddda6..0f70105b0e 100644 --- a/src/plugins/styles/windowsvista/qwindowsxpstyle_p.h +++ b/src/plugins/styles/windowsvista/qwindowsxpstyle_p.h @@ -96,7 +96,7 @@ public: const QWidget *widget = nullptr) const override; private: - Q_DISABLE_COPY(QWindowsXPStyle) + Q_DISABLE_COPY_MOVE(QWindowsXPStyle) Q_DECLARE_PRIVATE(QWindowsXPStyle) friend class QStyleFactory; }; diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 5390a8b2f2..9fb9d6c55e 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -738,7 +738,7 @@ static std::vector<std::pair<int, int>> pageRangesFromString(const QString &page { std::vector<std::pair<int, int>> result; const QStringList items = pagesString.split(','); - for (const QString item : items) { + for (const QString &item : items) { if (item.isEmpty()) return {}; diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp index 69d984cb0c..3d76cad688 100644 --- a/src/printsupport/kernel/qplatformprintdevice.cpp +++ b/src/printsupport/kernel/qplatformprintdevice.cpp @@ -40,10 +40,8 @@ #include "qplatformprintdevice.h" #include "qprintdevice_p.h" -#if QT_CONFIG(printdialog) -#include "qprintdialog.h" -#endif +#include <QtCore/qcoreapplication.h> #include <QtGui/qpagelayout.h> QT_BEGIN_NAMESPACE @@ -165,7 +163,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QPageSize &pageSize) con // e.g. Windows defines DMPAPER_11X17 and DMPAPER_TABLOID with names "11x17" and "Tabloid", but both // map to QPageSize::Tabloid / PPD Key "Tabloid" / ANSI B Tabloid if (pageSize.id() != QPageSize::Custom) { - for (const QPageSize &ps : m_pageSizes) { + for (const QPageSize &ps : qAsConst(m_pageSizes)) { if (ps.id() == pageSize.id() && ps.name() == pageSize.name()) return ps; } @@ -173,7 +171,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QPageSize &pageSize) con // Next try match on id only if not custom if (pageSize.id() != QPageSize::Custom) { - for (const QPageSize &ps : m_pageSizes) { + for (const QPageSize &ps : qAsConst(m_pageSizes)) { if (ps.id() == pageSize.id()) return ps; } @@ -188,7 +186,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(QPageSize::PageSizeId pageSize if (!m_havePageSizes) loadPageSizes(); - for (const QPageSize &ps : m_pageSizes) { + for (const QPageSize &ps : qAsConst(m_pageSizes)) { if (ps.id() == pageSizeId) return ps; } @@ -202,7 +200,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QString &pageName) const if (!m_havePageSizes) loadPageSizes(); - for (const QPageSize &ps : m_pageSizes) { + for (const QPageSize &ps : qAsConst(m_pageSizes)) { if (ps.name() == pageName) return ps; } @@ -235,7 +233,7 @@ QPageSize QPlatformPrintDevice::supportedPageSizeMatch(const QPageSize &pageSize return pageSize; // Try to find a supported page size based on point size - for (const QPageSize &ps : m_pageSizes) { + for (const QPageSize &ps : qAsConst(m_pageSizes)) { if (ps.sizePoints() == pageSize.sizePoints()) return ps; } @@ -291,11 +289,7 @@ QPrint::InputSlot QPlatformPrintDevice::defaultInputSlot() const { QPrint::InputSlot input; input.key = QByteArrayLiteral("Auto"); -#if QT_CONFIG(printdialog) - input.name = QPrintDialog::tr("Automatic"); -#else - input.name = QString::fromLatin1("Automatic"); -#endif + input.name = QCoreApplication::translate("Print Device Input Slot", "Automatic"); input.id = QPrint::Auto; return input; } @@ -315,11 +309,7 @@ QPrint::OutputBin QPlatformPrintDevice::defaultOutputBin() const { QPrint::OutputBin output; output.key = QByteArrayLiteral("Auto"); -#if QT_CONFIG(printdialog) - output.name = QPrintDialog::tr("Automatic"); -#else - output.name = QString::fromLatin1("Automatic"); -#endif + output.name = QCoreApplication::translate("Print Device Output Bin", "Automatic"); output.id = QPrint::AutoOutputBin; return output; } diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 829a13863b..ddcd8c4702 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -1848,7 +1848,7 @@ QList<int> QPrinter::supportedResolutions() const = d->printEngine->property(QPrintEngine::PPK_SupportedResolutions).toList(); QList<int> intlist; intlist.reserve(varlist.size()); - for (auto var : varlist) + for (const auto &var : varlist) intlist << var.toInt(); return intlist; } diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp index 4b092dee64..167b2361ef 100644 --- a/src/printsupport/kernel/qprinterinfo.cpp +++ b/src/printsupport/kernel/qprinterinfo.cpp @@ -400,6 +400,35 @@ QList<QPrinter::DuplexMode> QPrinterInfo::supportedDuplexModes() const } /*! + Returns the default color mode of this printer. + + \since 5.13 +*/ + +QPrinter::ColorMode QPrinterInfo::defaultColorMode() const +{ + Q_D(const QPrinterInfo); + return QPrinter::ColorMode(d->m_printDevice.defaultColorMode()); +} + +/*! + Returns the supported color modes of this printer. + + \since 5.13 +*/ + +QList<QPrinter::ColorMode> QPrinterInfo::supportedColorModes() const +{ + Q_D(const QPrinterInfo); + QList<QPrinter::ColorMode> list; + const auto supportedColorModes = d->m_printDevice.supportedColorModes(); + list.reserve(supportedColorModes.size()); + for (QPrint::ColorMode mode : supportedColorModes) + list << QPrinter::ColorMode(mode); + return list; +} + +/*! Returns a list of all the available Printer Names on this system. It is recommended to use this instead of availablePrinters() as diff --git a/src/printsupport/kernel/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h index 8bac395ab3..7195cb76b5 100644 --- a/src/printsupport/kernel/qprinterinfo.h +++ b/src/printsupport/kernel/qprinterinfo.h @@ -93,6 +93,9 @@ public: QPrinter::DuplexMode defaultDuplexMode() const; QList<QPrinter::DuplexMode> supportedDuplexModes() const; + QPrinter::ColorMode defaultColorMode() const; + QList<QPrinter::ColorMode> supportedColorModes() const; + static QStringList availablePrinterNames(); static QList<QPrinterInfo> availablePrinters(); diff --git a/src/printsupport/widgets/qcupsjobwidget_p.h b/src/printsupport/widgets/qcupsjobwidget_p.h index 4b6b047e26..42da9c7580 100644 --- a/src/printsupport/widgets/qcupsjobwidget_p.h +++ b/src/printsupport/widgets/qcupsjobwidget_p.h @@ -113,7 +113,7 @@ private: int m_savedPriority; QCUPSSupport::JobSheets m_savedJobSheets; - Q_DISABLE_COPY(QCupsJobWidget) + Q_DISABLE_COPY_MOVE(QCupsJobWidget) }; QT_END_NAMESPACE diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc index d127bdf8a5..9709deeccb 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -237,3 +237,16 @@ Could not create database object //! [38] QPSQLDriver::getResult: Query results lost - probably discarded on executing another SQL query. //! [38] + +//! [39] +CREATE TABLE "testTable" ("id" INTEGER); +//! [39] + +//! [40] +QString tableString("testTable"); +QSqlQuery q; +// Create table query is not quoted, therefore it is mapped to lower case +q.exec(QString("CREATE TABLE %1 (id INTEGER)").arg(tableString)); +// Call toLower() on the string so that it can be matched +QSqlRecord rec = database.record(tableString.toLower()); +//! [40] diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index fd95e89812..cccce48bb3 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -381,6 +381,23 @@ multibyte enabled PostgreSQL server can be found in the PostgreSQL Administrator Guide, Chapter 5. + \section3 QPSQL Case Sensitivity + + PostgreSQL databases will only respect case sensitivity if the table or field + name is quoted when the table is created. So for example, a SQL query such + as: + + \snippet code/doc_src_sql-driver.qdoc 39 + + will ensure that it can be accessed with the same case that was used. If the + table or field name is not quoted when created, the actual table name + or field name will be lower-case. When QSqlDatabase::record() or + QSqlDatabase::primaryIndex() access a table or field that was unquoted + when created, the name passed to the function must be lower-case to + ensure it is found. For example: + + \snippet code/doc_src_sql-driver.qdoc 40 + \section3 QPSQL BLOB Support Binary Large Objects are supported through the \c BYTEA field type in diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 2c7b4b83db..d63a9e59a8 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1088,6 +1088,11 @@ QStringList QSqlDatabase::tables(QSql::TableType type) const Returns the primary index for table \a tablename. If no primary index exists, an empty QSqlIndex is returned. + \note Some drivers, such as the \l {QPSQL Case Sensitivity}{QPSQL} + driver, may may require you to pass \a tablename in lower case if + the table was not quoted when created. See the + \l{sql-driver.html}{Qt SQL driver} documentation for more information. + \sa tables(), record() */ @@ -1102,6 +1107,11 @@ QSqlIndex QSqlDatabase::primaryIndex(const QString& tablename) const the table (or view) called \a tablename. The order in which the fields appear in the record is undefined. If no such table (or view) exists, an empty record is returned. + + \note Some drivers, such as the \l {QPSQL Case Sensitivity}{QPSQL} + driver, may may require you to pass \a tablename in lower case if + the table was not quoted when created. See the + \l{sql-driver.html}{Qt SQL driver} documentation for more information. */ QSqlRecord QSqlDatabase::record(const QString& tablename) const @@ -1380,6 +1390,40 @@ QSqlDatabase QSqlDatabase::cloneDatabase(const QSqlDatabase &other, const QStrin } /*! + \since 5.13 + \overload + + Clones the database connection \a other and stores it as \a + connectionName. All the settings from the original database, e.g. + databaseName(), hostName(), etc., are copied across. Does nothing + if \a other is an invalid database. Returns the newly created + database connection. + + \note The new connection has not been opened. Before using the new + connection, you must call open(). + + This overload is useful when cloning the database in another thread to the + one that is used by the database represented by \a other. +*/ + +QSqlDatabase QSqlDatabase::cloneDatabase(const QString &other, const QString &connectionName) +{ + const QConnectionDict *dict = dbDict(); + Q_ASSERT(dict); + + dict->lock.lockForRead(); + QSqlDatabase otherDb = dict->value(other); + dict->lock.unlock(); + if (!otherDb.isValid()) + return QSqlDatabase(); + + QSqlDatabase db(otherDb.driverName()); + db.d->copy(otherDb.d); + QSqlDatabasePrivate::addDatabase(db, connectionName); + return db; +} + +/*! \since 4.4 Returns the connection name, which may be empty. \note The diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 3aadab9b2f..f233c72c19 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -118,6 +118,7 @@ public: static QSqlDatabase addDatabase(QSqlDriver* driver, const QString& connectionName = QLatin1String(defaultConnection)); static QSqlDatabase cloneDatabase(const QSqlDatabase &other, const QString& connectionName); + static QSqlDatabase cloneDatabase(const QString &other, const QString& connectionName); static QSqlDatabase database(const QString& connectionName = QLatin1String(defaultConnection), bool open = true); static void removeDatabase(const QString& connectionName); diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp index 8c6ae382f6..7f7b81b05b 100644 --- a/src/sql/kernel/qsqldriver.cpp +++ b/src/sql/kernel/qsqldriver.cpp @@ -488,6 +488,8 @@ QString QSqlDriver::stripDelimiters(const QString &identifier, IdentifierType ty QString QSqlDriver::sqlStatement(StatementType type, const QString &tableName, const QSqlRecord &rec, bool preparedStatement) const { + const auto tableNameString = tableName.isEmpty() ? QString() + : prepareIdentifier(tableName, QSqlDriver::TableName, this); int i; QString s; s.reserve(128); @@ -500,13 +502,12 @@ QString QSqlDriver::sqlStatement(StatementType type, const QString &tableName, if (s.isEmpty()) return s; s.chop(2); - s.prepend(QLatin1String("SELECT ")).append(QLatin1String(" FROM ")).append(tableName); + s = QLatin1String("SELECT ") + s + QLatin1String(" FROM ") + tableNameString; break; case WhereStatement: { - const QString tableNamePrefix = tableName.isEmpty() - ? QString() - : prepareIdentifier(tableName, QSqlDriver::TableName, this) + QLatin1Char('.'); + const QString tableNamePrefix = tableNameString.isEmpty() + ? QString() : tableNameString + QLatin1Char('.'); for (int i = 0; i < rec.count(); ++i) { if (!rec.isGenerated(i)) continue; @@ -523,8 +524,7 @@ QString QSqlDriver::sqlStatement(StatementType type, const QString &tableName, break; } case UpdateStatement: - s.append(QLatin1String("UPDATE ")).append(tableName).append( - QLatin1String(" SET ")); + s = s + QLatin1String("UPDATE ") + tableNameString + QLatin1String(" SET "); for (i = 0; i < rec.count(); ++i) { if (!rec.isGenerated(i)) continue; @@ -541,10 +541,10 @@ QString QSqlDriver::sqlStatement(StatementType type, const QString &tableName, s.clear(); break; case DeleteStatement: - s.append(QLatin1String("DELETE FROM ")).append(tableName); + s = s + QLatin1String("DELETE FROM ") + tableNameString; break; case InsertStatement: { - s.append(QLatin1String("INSERT INTO ")).append(tableName).append(QLatin1String(" (")); + s = s + QLatin1String("INSERT INTO ") + tableNameString + QLatin1String(" ("); QString vals; for (i = 0; i < rec.count(); ++i) { if (!rec.isGenerated(i)) diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index ca5c46778f..2f16a4a54b 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -58,7 +58,7 @@ QT_REQUIRE_CONFIG(sqlmodel); #include <QtCore/qmetaobject.h> QT_BEGIN_NAMESPACE - +// ### Qt6: QStyledItemDelegate class QSqlRelationalDelegate: public QItemDelegate { static int fieldIndex(const QSqlTableModel *const model, diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 1f590c4ab2..34be010474 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -626,8 +626,8 @@ QString QSqlRelationalTableModel::selectStatement() const /*! Returns a QSqlTableModel object for accessing the table for which - \a column is a foreign key, or 0 if there is no relation for the - given \a column. + \a column is a foreign key, or \nullptr if there is no relation for + the given \a column. The returned object is owned by the QSqlRelationalTableModel. @@ -636,12 +636,12 @@ QString QSqlRelationalTableModel::selectStatement() const QSqlTableModel *QSqlRelationalTableModel::relationModel(int column) const { Q_D(const QSqlRelationalTableModel); - if ( column < 0 || column >= d->relations.count()) - return 0; + if (column < 0 || column >= d->relations.count()) + return nullptr; QRelation &relation = const_cast<QSqlRelationalTableModelPrivate *>(d)->relations[column]; if (!relation.isValid()) - return 0; + return nullptr; if (!relation.model) relation.populateModel(); diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index a33f76838f..98d6ddf882 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -607,6 +607,16 @@ bool QSqlTableModel::setData(const QModelIndex &index, const QVariant &value, in return true; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +/*! + \reimp + */ +bool QStringListModel::clearItemData(const QModelIndex &index) +{ + return setData(index, QVariant(), Qt::EditRole); +} +#endif + /*! This function simply calls QSqlQueryModel::setQuery(\a query). You should normally not call it on a QSqlTableModel. Instead, use diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h index 7acc7dc94d..eba27e60ec 100644 --- a/src/sql/models/qsqltablemodel.h +++ b/src/sql/models/qsqltablemodel.h @@ -74,6 +74,9 @@ public: QSqlRecord record(int row) const; QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool clearItemData(const QModelIndex &index) override; +#endif QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; diff --git a/src/testlib/configure.json b/src/testlib/configure.json index c464037205..df6132cdc2 100644 --- a/src/testlib/configure.json +++ b/src/testlib/configure.json @@ -5,6 +5,12 @@ ], "features": { + "testlib_selfcover": { + "label": "Coverage testing of testlib itself", + "purpose": "Gauges how thoroughly testlib's selftest exercises testlib's code", + "autoDetect": false, + "output": [ "publicFeature" ] + }, "itemmodeltester": { "label": "Tester for item models", "purpose": "Provides a utility to test item models.", diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf index 93a5ab393c..5fdf6d9415 100644 --- a/src/testlib/doc/qttestlib.qdocconf +++ b/src/testlib/doc/qttestlib.qdocconf @@ -27,7 +27,7 @@ qhp.QtTestLib.subprojects.classes.sortPages = true tagfile = ../../../doc/qttestlib/qttestlib.tags -depends += qtcore qtdoc qtwidgets qtgui qmake qtquick +depends += qtcore qtdoc qtwidgets qtgui qmake qtqmltest headerdirs += .. diff --git a/src/testlib/doc/src/qttest-index.qdoc b/src/testlib/doc/src/qttest-index.qdoc index 6e4f954034..23be46b431 100644 --- a/src/testlib/doc/src/qttest-index.qdoc +++ b/src/testlib/doc/src/qttest-index.qdoc @@ -75,11 +75,15 @@ \section1 Reference - These are links to the API reference materials. + \list + \li \l{Qt Test C++ Classes} + \endlist + + The \l {Qt Quick Test} module enables unit testing Qt Quick applications. \list - \li \l{Qt Test C++ Classes}{C++ Classes} - \li \l{Qt Quick Test QML Types}{QML Types} + \li \l{Qt Quick Test QML Types} + \li \l{Qt Quick Test C++ API} \endlist */ diff --git a/src/testlib/qabstractitemmodeltester.h b/src/testlib/qabstractitemmodeltester.h index 757074c6ae..57b8f283bc 100644 --- a/src/testlib/qabstractitemmodeltester.h +++ b/src/testlib/qabstractitemmodeltester.h @@ -123,11 +123,11 @@ do { \ MODELTESTER_VERIFY(variant.canConvert<QFont>()); // General Purpose roles that should return a QColor or a QBrush - variant = model->data(model->index(0, 0), Qt::BackgroundColorRole); + variant = model->data(model->index(0, 0), Qt::BackgroundRole); if (variant.isValid()) MODELTESTER_VERIFY(variant.canConvert<QColor>() || variant.canConvert<QBrush>()); - variant = model->data(model->index(0, 0), Qt::TextColorRole); + variant = model->data(model->index(0, 0), Qt::ForegroundRole); if (variant.isValid()) MODELTESTER_VERIFY(variant.canConvert<QColor>() || variant.canConvert<QBrush>()); diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 28b62129b6..ebd94939ce 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -51,6 +51,7 @@ #include <QtCore/qstringlist.h> #include <QtCore/qcborcommon.h> #include <QtCore/qdatetime.h> +#include <QtCore/qabstractitemmodel.h> #include <QtCore/qobject.h> #include <QtCore/qvariant.h> #include <QtCore/qurl.h> @@ -128,6 +129,13 @@ template<> inline char *toString(const QChar &c) return qstrdup(qPrintable(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16)))); } +template<> inline char *toString(const QModelIndex &idx) +{ + char msg[128]; + qsnprintf(msg, sizeof(msg), "QModelIndex(%d,%d,%p,%p)", idx.row(), idx.column(), idx.internalPointer(), idx.model()); + return qstrdup(msg); +} + template<> inline char *toString(const QPoint &p) { char msg[128] = {'\0'}; @@ -366,27 +374,41 @@ QT_END_NAMESPACE # define QTEST_SET_MAIN_SOURCE_PATH QTest::setMainSourcePath(__FILE__); #endif +// Hooks for coverage-testing of QTestLib itself: +#if QT_CONFIG(testlib_selfcover) && defined(__COVERAGESCANNER__) +struct QtCoverageScanner +{ + QtCoverageScanner(const char *name) + { + __coveragescanner_clear(); + __coveragescanner_testname(name); + } + ~QtCoverageScanner() + { + __coveragescanner_save(); + __coveragescanner_testname(""); + } +}; +#define TESTLIB_SELFCOVERAGE_START(name) QtCoverageScanner _qtCoverageScanner(name); +#else +#define TESTLIB_SELFCOVERAGE_START(name) +#endif + #define QTEST_APPLESS_MAIN(TestObject) \ int main(int argc, char *argv[]) \ { \ + TESTLIB_SELFCOVERAGE_START(TestObject) \ TestObject tc; \ QTEST_SET_MAIN_SOURCE_PATH \ return QTest::qExec(&tc, argc, argv); \ } #include <QtTest/qtestsystem.h> -#include <set> - -#ifndef QT_NO_OPENGL -# define QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ - extern Q_TESTLIB_EXPORT std::set<QByteArray> *(*qgpu_features_ptr)(const QString &); \ - extern Q_GUI_EXPORT std::set<QByteArray> *qgpu_features(const QString &); -# define QTEST_ADD_GPU_BLACKLIST_SUPPORT \ - qgpu_features_ptr = qgpu_features; -#else -# define QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS -# define QTEST_ADD_GPU_BLACKLIST_SUPPORT -#endif + +// Two backwards-compatibility defines for an obsolete feature: +#define QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS +#define QTEST_ADD_GPU_BLACKLIST_SUPPORT +// ### Qt 6: fully remove these. #if defined(QT_NETWORK_LIB) # include <QtTest/qtest_network.h> @@ -403,15 +425,12 @@ int main(int argc, char *argv[]) \ #endif #define QTEST_MAIN(TestObject) \ -QT_BEGIN_NAMESPACE \ -QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ -QT_END_NAMESPACE \ int main(int argc, char *argv[]) \ { \ + TESTLIB_SELFCOVERAGE_START(#TestObject) \ QApplication app(argc, argv); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ QTEST_DISABLE_KEYPAD_NAVIGATION \ - QTEST_ADD_GPU_BLACKLIST_SUPPORT \ TestObject tc; \ QTEST_SET_MAIN_SOURCE_PATH \ return QTest::qExec(&tc, argc, argv); \ @@ -422,14 +441,11 @@ int main(int argc, char *argv[]) \ #include <QtTest/qtest_gui.h> #define QTEST_MAIN(TestObject) \ -QT_BEGIN_NAMESPACE \ -QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ -QT_END_NAMESPACE \ int main(int argc, char *argv[]) \ { \ + TESTLIB_SELFCOVERAGE_START(#TestObject) \ QGuiApplication app(argc, argv); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ - QTEST_ADD_GPU_BLACKLIST_SUPPORT \ TestObject tc; \ QTEST_SET_MAIN_SOURCE_PATH \ return QTest::qExec(&tc, argc, argv); \ @@ -440,6 +456,7 @@ int main(int argc, char *argv[]) \ #define QTEST_MAIN(TestObject) \ int main(int argc, char *argv[]) \ { \ + TESTLIB_SELFCOVERAGE_START(#TestObject) \ QCoreApplication app(argc, argv); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ TestObject tc; \ @@ -452,6 +469,7 @@ int main(int argc, char *argv[]) \ #define QTEST_GUILESS_MAIN(TestObject) \ int main(int argc, char *argv[]) \ { \ + TESTLIB_SELFCOVERAGE_START(#TestObject) \ QCoreApplication app(argc, argv); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ TestObject tc; \ diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index f430294142..84a99c10f3 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -220,22 +220,6 @@ static bool checkCondition(const QByteArray &condition) static bool ignoreAll = false; static std::set<QByteArray> *ignoredTests = 0; -static std::set<QByteArray> *gpuFeatures = 0; - -Q_TESTLIB_EXPORT std::set<QByteArray> *(*qgpu_features_ptr)(const QString &) = 0; - -static bool isGPUTestBlacklisted(const char *slot, const char *data = 0) -{ - const QByteArray disableKey = QByteArrayLiteral("disable_") + QByteArray(slot); - if (gpuFeatures->find(disableKey) != gpuFeatures->end()) { - QByteArray msg = QByteArrayLiteral("Skipped due to GPU blacklist: ") + disableKey; - if (data) - msg += ':' + QByteArray(data); - QTest::qSkip(msg.constData(), __FILE__, __LINE__); - return true; - } - return false; -} namespace QTestPrivate { @@ -275,17 +259,6 @@ void parseBlackList() } } -void parseGpuBlackList() -{ - if (!qgpu_features_ptr) - return; - QString filename = QTest::qFindTestData(QStringLiteral("GPU_BLACKLIST")); - if (filename.isEmpty()) - return; - if (!gpuFeatures) - gpuFeatures = qgpu_features_ptr(filename); -} - void checkBlackLists(const char *slot, const char *data) { bool ignore = ignoreAll; @@ -301,21 +274,8 @@ void checkBlackLists(const char *slot, const char *data) } QTestResult::setBlacklistCurrentTest(ignore); - - // Tests blacklisted in GPU_BLACKLIST are to be skipped. Just ignoring the result is - // not sufficient since these are expected to crash or behave in undefined ways. - if (!ignore && gpuFeatures) { - QByteArray s_gpu = slot; - ignore = isGPUTestBlacklisted(s_gpu, data); - if (!ignore && data) { - s_gpu += ':'; - s_gpu += data; - isGPUTestBlacklisted(s_gpu); - } - } -} - } +} // QTestPrivate QT_END_NAMESPACE diff --git a/src/testlib/qtestblacklist_p.h b/src/testlib/qtestblacklist_p.h index 08ce052231..4522c64992 100644 --- a/src/testlib/qtestblacklist_p.h +++ b/src/testlib/qtestblacklist_p.h @@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE namespace QTestPrivate { // Export functions so they can also be used by QQuickTest Q_TESTLIB_EXPORT void parseBlackList(); - Q_TESTLIB_EXPORT void parseGpuBlackList(); Q_TESTLIB_EXPORT void checkBlackLists(const char *slot, const char *data); } diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 22e8ac49bc..840b4071e2 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -52,6 +52,7 @@ #include <QtCore/qfileinfo.h> #include <QtCore/qdir.h> #include <QtCore/qdebug.h> +#include <QtCore/qfloat16.h> #include <QtCore/qlibraryinfo.h> #include <QtCore/private/qtools_p.h> #include <QtCore/qdiriterator.h> @@ -245,7 +246,7 @@ static void stackTrace() static bool installCoverageTool(const char * appname, const char * testname) { -#ifdef __COVERAGESCANNER__ +#if defined(__COVERAGESCANNER__) && !QT_CONFIG(testlib_selfcover) if (!qEnvironmentVariableIsEmpty("QT_TESTCOCOON_ACTIVE")) return false; // Set environment variable QT_TESTCOCOON_ACTIVE to prevent an eventual subtest from @@ -282,74 +283,75 @@ namespace QTestPrivate namespace QTest { - class WatchDog; +class WatchDog; - static QObject *currentTestObject = 0; - static QString mainSourcePath; +static QObject *currentTestObject = 0; +static QString mainSourcePath; #if defined(Q_OS_MACOS) - bool macNeedsActivate = false; - IOPMAssertionID powerID; +bool macNeedsActivate = false; +IOPMAssertionID powerID; #endif - class TestMethods { - Q_DISABLE_COPY(TestMethods) - public: - typedef std::vector<QMetaMethod> MetaMethods; +class TestMethods { +public: + Q_DISABLE_COPY_MOVE(TestMethods) - explicit TestMethods(const QObject *o, const MetaMethods &m = MetaMethods()); + typedef std::vector<QMetaMethod> MetaMethods; - void invokeTests(QObject *testObject) const; + explicit TestMethods(const QObject *o, const MetaMethods &m = MetaMethods()); - static QMetaMethod findMethod(const QObject *obj, const char *signature); + void invokeTests(QObject *testObject) const; - private: - bool invokeTest(int index, const char *data, WatchDog *watchDog) const; - void invokeTestOnData(int index) const; + static QMetaMethod findMethod(const QObject *obj, const char *signature); - QMetaMethod m_initTestCaseMethod; // might not exist, check isValid(). - QMetaMethod m_initTestCaseDataMethod; - QMetaMethod m_cleanupTestCaseMethod; - QMetaMethod m_initMethod; - QMetaMethod m_cleanupMethod; +private: + bool invokeTest(int index, const char *data, WatchDog *watchDog) const; + void invokeTestOnData(int index) const; - MetaMethods m_methods; - }; + QMetaMethod m_initTestCaseMethod; // might not exist, check isValid(). + QMetaMethod m_initTestCaseDataMethod; + QMetaMethod m_cleanupTestCaseMethod; + QMetaMethod m_initMethod; + QMetaMethod m_cleanupMethod; - TestMethods::TestMethods(const QObject *o, const MetaMethods &m) - : m_initTestCaseMethod(TestMethods::findMethod(o, "initTestCase()")) - , m_initTestCaseDataMethod(TestMethods::findMethod(o, "initTestCase_data()")) - , m_cleanupTestCaseMethod(TestMethods::findMethod(o, "cleanupTestCase()")) - , m_initMethod(TestMethods::findMethod(o, "init()")) - , m_cleanupMethod(TestMethods::findMethod(o, "cleanup()")) - , m_methods(m) - { - if (m.empty()) { - const QMetaObject *metaObject = o->metaObject(); - const int count = metaObject->methodCount(); - m_methods.reserve(count); - for (int i = 0; i < count; ++i) { - const QMetaMethod me = metaObject->method(i); - if (isValidSlot(me)) - m_methods.push_back(me); - } + MetaMethods m_methods; +}; + +TestMethods::TestMethods(const QObject *o, const MetaMethods &m) + : m_initTestCaseMethod(TestMethods::findMethod(o, "initTestCase()")) + , m_initTestCaseDataMethod(TestMethods::findMethod(o, "initTestCase_data()")) + , m_cleanupTestCaseMethod(TestMethods::findMethod(o, "cleanupTestCase()")) + , m_initMethod(TestMethods::findMethod(o, "init()")) + , m_cleanupMethod(TestMethods::findMethod(o, "cleanup()")) + , m_methods(m) +{ + if (m.empty()) { + const QMetaObject *metaObject = o->metaObject(); + const int count = metaObject->methodCount(); + m_methods.reserve(count); + for (int i = 0; i < count; ++i) { + const QMetaMethod me = metaObject->method(i); + if (isValidSlot(me)) + m_methods.push_back(me); } } +} - QMetaMethod TestMethods::findMethod(const QObject *obj, const char *signature) - { - const QMetaObject *metaObject = obj->metaObject(); - const int funcIndex = metaObject->indexOfMethod(signature); - return funcIndex >= 0 ? metaObject->method(funcIndex) : QMetaMethod(); - } +QMetaMethod TestMethods::findMethod(const QObject *obj, const char *signature) +{ + const QMetaObject *metaObject = obj->metaObject(); + const int funcIndex = metaObject->indexOfMethod(signature); + return funcIndex >= 0 ? metaObject->method(funcIndex) : QMetaMethod(); +} - static int keyDelay = -1; - static int mouseDelay = -1; - static int eventDelay = -1; +static int keyDelay = -1; +static int mouseDelay = -1; +static int eventDelay = -1; #if QT_CONFIG(thread) - static int timeout = -1; +static int timeout = -1; #endif - static bool noCrashHandler = false; +static bool noCrashHandler = false; /*! \internal Invoke a method of the object without generating warning if the method does not exist @@ -496,7 +498,7 @@ static void qPrintDataTags(FILE *stream) } } -static int qToInt(char *str) +static int qToInt(const char *str) { char *pEnd; int l = (int)strtol(str, &pEnd, 10); @@ -507,7 +509,7 @@ static int qToInt(char *str) return l; } -Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) +Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool qml) { QTestLog::LogMode logFormat = QTestLog::Plain; const char *logFilename = 0; @@ -811,9 +813,9 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) // we load the QML files. So just store the data for now. int colon = -1; int offset; - for (offset = 0; *(argv[i]+offset); ++offset) { - if (*(argv[i]+offset) == ':') { - if (*(argv[i]+offset+1) == ':') { + for (offset = 0; argv[i][offset]; ++offset) { + if (argv[i][offset] == ':') { + if (argv[i][offset + 1] == ':') { // "::" is used as a test name separator. // e.g. "ClickTests::test_click:row1". ++offset; @@ -845,6 +847,11 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) QTestLog::addLogger(logFormat, logFilename); } +// Temporary, backwards compatibility, until qtdeclarative's use of it is converted +Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) { + qtest_qParseArgs(argc, const_cast<const char *const *>(argv), qml); +} + QBenchmarkResult qMedian(const QVector<QBenchmarkResult> &container) { const int count = container.count(); @@ -1195,7 +1202,9 @@ char *formatString(const char *prefix, const char *suffix, size_t numArguments, Returns a pointer to a string that is the string \a ba represented as a space-separated sequence of hex characters. If the input is considered too long, it is truncated. A trucation is indicated in - the returned string as an ellipsis at the end. + the returned string as an ellipsis at the end. The caller has + ownership of the returned pointer and must ensure it is later passed + to operator delete[]. \a length is the length of the string \a ba. */ @@ -1597,7 +1606,7 @@ FatalSignalHandler::~FatalSignalHandler() // Helper class for resolving symbol names by dynamically loading "dbghelp.dll". class DebugSymbolResolver { - Q_DISABLE_COPY(DebugSymbolResolver) + Q_DISABLE_COPY_MOVE(DebugSymbolResolver) public: struct Symbol { Symbol() : name(nullptr), address(0) {} @@ -1813,8 +1822,6 @@ void QTest::qInit(QObject *testObject, int argc, char **argv) #endif QTestPrivate::parseBlackList(); - QTestPrivate::parseGpuBlackList(); - QTestResult::reset(); QTEST_ASSERT(testObject); @@ -2478,6 +2485,16 @@ bool QTest::compare_helper(bool success, const char *failureMsg, return QTestResult::compare(success, failureMsg, val1, val2, actual, expected, file, line); } +/*! \fn bool QTest::qCompare(const qfloat16 &t1, const qfloat16 &t2, const char *actual, const char *expected, const char *file, int line) + \internal + */ +bool QTest::qCompare(qfloat16 const &t1, qfloat16 const &t2, const char *actual, const char *expected, + const char *file, int line) +{ + return compare_helper(qFuzzyCompare(t1, t2), "Compared qfloat16s are not the same (fuzzy compare)", + toString(t1), toString(t2), actual, expected, file, line); +} + /*! \fn bool QTest::qCompare(const float &t1, const float &t2, const char *actual, const char *expected, const char *file, int line) \internal */ @@ -2600,6 +2617,13 @@ template <> Q_TESTLIB_EXPORT char *QTest::toString<TYPE>(const TYPE &t) \ TO_STRING_FLOAT(float, %g) TO_STRING_FLOAT(double, %.12lg) +template <> Q_TESTLIB_EXPORT char *QTest::toString<qfloat16>(const qfloat16 &t) +{ + char *msg = new char[16]; + qsnprintf(msg, 16, "%.3g", static_cast<float>(t)); + return msg; +} + template <> Q_TESTLIB_EXPORT char *QTest::toString<char>(const char &t) { unsigned char c = static_cast<unsigned char>(t); diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 5fed9d6bcc..5d566b835e 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE +class qfloat16; class QRegularExpression; #define QVERIFY(statement) \ @@ -67,17 +68,17 @@ do {\ #define QFAIL(message) \ do {\ - QTest::qFail(message, __FILE__, __LINE__);\ + QTest::qFail(static_cast<const char *>(message), __FILE__, __LINE__);\ return;\ } while (false) #define QVERIFY2(statement, description) \ do {\ if (statement) {\ - if (!QTest::qVerify(true, #statement, (description), __FILE__, __LINE__))\ + if (!QTest::qVerify(true, #statement, static_cast<const char *>(description), __FILE__, __LINE__))\ return;\ } else {\ - if (!QTest::qVerify(false, #statement, (description), __FILE__, __LINE__))\ + if (!QTest::qVerify(false, #statement, static_cast<const char *>(description), __FILE__, __LINE__))\ return;\ }\ } while (false) @@ -184,7 +185,7 @@ do { \ #define QSKIP_INTERNAL(statement) \ do {\ - QTest::qSkip(statement, __FILE__, __LINE__);\ + QTest::qSkip(static_cast<const char *>(statement), __FILE__, __LINE__);\ return;\ } while (false) @@ -200,7 +201,7 @@ do {\ #define QEXPECT_FAIL(dataIndex, comment, mode)\ do {\ - if (!QTest::qExpectFail(dataIndex, comment, QTest::mode, __FILE__, __LINE__))\ + if (!QTest::qExpectFail(dataIndex, static_cast<const char *>(comment), QTest::mode, __FILE__, __LINE__))\ return;\ } while (false) @@ -217,7 +218,7 @@ do {\ } while (false) #define QWARN(msg)\ - QTest::qWarn(msg, __FILE__, __LINE__) + QTest::qWarn(static_cast<const char *>(msg), __FILE__, __LINE__) #ifdef QT_TESTCASE_BUILDDIR # define QFINDTESTDATA(basepath)\ @@ -361,6 +362,9 @@ namespace QTest } #endif + Q_TESTLIB_EXPORT bool qCompare(qfloat16 const &t1, qfloat16 const &t2, + const char *actual, const char *expected, const char *file, int line); + Q_TESTLIB_EXPORT bool qCompare(float const &t1, float const &t2, const char *actual, const char *expected, const char *file, int line); @@ -405,6 +409,7 @@ namespace QTest QTEST_COMPARE_DECL(float) QTEST_COMPARE_DECL(double) + QTEST_COMPARE_DECL(qfloat16) QTEST_COMPARE_DECL(char) QTEST_COMPARE_DECL(signed char) QTEST_COMPARE_DECL(unsigned char) diff --git a/src/testlib/qtestcorelist_p.h b/src/testlib/qtestcorelist_p.h index 5943695876..4d080f6758 100644 --- a/src/testlib/qtestcorelist_p.h +++ b/src/testlib/qtestcorelist_p.h @@ -66,9 +66,6 @@ class QTestCoreList void addToList(T **list); T *nextElement(); T *previousElement(); - int count(T *list); - int count(); - private: T *next; T *prev; @@ -121,20 +118,6 @@ T *QTestCoreList<T>::previousElement() return prev; } -template <class T> -int QTestCoreList<T>::count() -{ - int numOfElements = 0; - T *it = next; - - while (it) { - ++numOfElements; - it = it->nextElement(); - } - - return numOfElements; -} - QT_END_NAMESPACE #endif diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index 3285a6d8a7..d5f22fd3da 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -73,6 +73,10 @@ QT_BEGIN_NAMESPACE static void saveCoverageTool(const char * appname, bool testfailed, bool installedTestCoverage) { #ifdef __COVERAGESCANNER__ +# if QT_CONFIG(testlib_selfcover) + __coveragescanner_teststate(QTestLog::failCount() > 0 ? "FAILED" : + QTestLog::passCount() > 0 ? "PASSED" : "SKIPPED"); +# else if (!installedTestCoverage) return; // install again to make sure the filename is correct. @@ -83,6 +87,7 @@ static void saveCoverageTool(const char * appname, bool testfailed, bool install __coveragescanner_testname(""); __coveragescanner_clear(); unsetenv("QT_TESTCOCOON_ACTIVE"); +# endif // testlib_selfcover #else Q_UNUSED(appname); Q_UNUSED(testfailed); diff --git a/src/testlib/selfcover.pri b/src/testlib/selfcover.pri new file mode 100644 index 0000000000..7de50ba6e6 --- /dev/null +++ b/src/testlib/selfcover.pri @@ -0,0 +1,28 @@ +# Configuration for testlib and its tests, to instrument with +# FrogLogic's Squish CoCo (cf. testcocoon.prf, which handles similar +# for general code; but testlib needs special handling). + +# Only for use when feature testlib_selfcover is enabled: +!qtConfig(testlib_selfcover): return() + +# This enables verification that testlib itself is adequately tested, +# as a grounds for trusting that testing with it is useful. +# Exclude all non-testlib source from coverage instrumentation: +COVERAGE_OPTIONS = --cs-exclude-file-abs-wildcard=$$QT_SOURCE_TREE/* +COVERAGE_OPTIONS += --cs-include-file-abs-wildcard=*/src/testlib/* +COVERAGE_OPTIONS += --cs-mcc # enable Multiple Condition Coverage +COVERAGE_OPTIONS += --cs-mcdc # enable Multiple Condition / Decision Coverage +# (recommended for ISO 26262 ASIL A, B and C -- highly recommended for ASIL D) +# https://doc.froglogic.com/squish-coco/4.1/codecoverage.html#sec%3Amcdc + +QMAKE_CFLAGS += $$COVERAGE_OPTIONS +QMAKE_CXXFLAGS += $$COVERAGE_OPTIONS +QMAKE_LFLAGS += $$COVERAGE_OPTIONS + +# FIXME: relies on QMAKE_* being just the command-names, with no path prefix +QMAKE_CC = cs$$QMAKE_CC +QMAKE_CXX = cs$$QMAKE_CXX +QMAKE_LINK = cs$$QMAKE_LINK +QMAKE_LINK_SHLIB = cs$$QMAKE_LINK_SHLIB +QMAKE_AR = cs$$QMAKE_AR +QMAKE_LIB = cs$$QMAKE_LIB diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 34bb581e02..f52a913a08 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -146,4 +146,5 @@ mac { !qtHaveModule(network): HEADERSCLEAN_EXCLUDE += qtest_network.h +include(selfcover.pri) load(qt_module) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 712a8091fb..344ceba74f 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1391,8 +1391,8 @@ bool updateAndroidManifest(Options &options) options.packageName = reader.attributes().value(QLatin1String("package")).toString(); } else if (reader.name() == QLatin1String("uses-sdk")) { if (reader.attributes().hasAttribute(QLatin1String("android:minSdkVersion"))) - if (reader.attributes().value(QLatin1String("android:minSdkVersion")).toInt() < 16) { - fprintf(stderr, "Invalid minSdkVersion version, minSdkVersion must be >= 16\n"); + if (reader.attributes().value(QLatin1String("android:minSdkVersion")).toInt() < 21) { + fprintf(stderr, "Invalid minSdkVersion version, minSdkVersion must be >= 21\n"); return false; } } else if ((reader.name() == QLatin1String("application") || diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index fd76646f4c..02c1fbd394 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -619,7 +619,7 @@ void Generator::generateCode() fprintf(out, "// a) You are using a NOTIFY signal that does not exist. Fix it.\n"); fprintf(out, "// b) You are using a NOTIFY signal that does exist (in a parent class) but has a non-empty parameter list. This is a moc limitation.\n"); fprintf(out, "Q_DECL_UNUSED static void checkNotifySignalValidity_%s(%s *t) {\n", qualifiedClassNameIdentifier.constData(), cdef->qualified.constData()); - for (const QByteArray &nonClassSignal : cdef->nonClassSignalList) + for (const QByteArray &nonClassSignal : qAsConst(cdef->nonClassSignalList)) fprintf(out, " t->%s();\n", nonClassSignal.constData()); fprintf(out, "}\n"); } @@ -1549,16 +1549,16 @@ void Generator::generateSignal(FunctionDef *def,int index) fprintf(out, "nullptr"); } else { if (def->returnTypeIsVolatile) - fprintf(out, "const_cast<void*>(reinterpret_cast<const volatile void*>(&_t0))"); + fprintf(out, "const_cast<void*>(reinterpret_cast<const volatile void*>(std::addressof(_t0)))"); else - fprintf(out, "const_cast<void*>(reinterpret_cast<const void*>(&_t0))"); + fprintf(out, "const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t0)))"); } int i; for (i = 1; i < offset; ++i) if (i <= def->arguments.count() && def->arguments.at(i - 1).type.isVolatile) - fprintf(out, ", const_cast<void*>(reinterpret_cast<const volatile void*>(&_t%d))", i); + fprintf(out, ", const_cast<void*>(reinterpret_cast<const volatile void*>(std::addressof(_t%d)))", i); else - fprintf(out, ", const_cast<void*>(reinterpret_cast<const void*>(&_t%d))", i); + fprintf(out, ", const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t%d)))", i); fprintf(out, " };\n"); fprintf(out, " QMetaObject::activate(%s, &staticMetaObject, %d, _a);\n", thisPtr.constData(), index); if (def->normalizedType != "void") diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 7272df4265..5d777ece2e 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -992,7 +992,7 @@ void Moc::generate(FILE *out) fprintf(out, "** WARNING! All changes made in this file will be lost!\n" "*****************************************************************************/\n\n"); - + fprintf(out, "#include <memory>\n"); // For std::addressof if (!noInclude) { if (includePath.size() && !includePath.endsWith('/')) includePath += '/'; diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index d98c73e1a0..d6482f4e44 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -83,57 +83,53 @@ Q_DECLARE_TYPEINFO(ArgumentDef, Q_MOVABLE_TYPE); struct FunctionDef { - FunctionDef(): returnTypeIsVolatile(false), access(Private), isConst(false), isVirtual(false), isStatic(false), - inlineCode(false), wasCloned(false), isCompat(false), isInvokable(false), - isScriptable(false), isSlot(false), isSignal(false), isPrivateSignal(false), - isConstructor(false), isDestructor(false), isAbstract(false), revision(0) {} Type type; + QVector<ArgumentDef> arguments; QByteArray normalizedType; QByteArray tag; QByteArray name; - bool returnTypeIsVolatile; - - QVector<ArgumentDef> arguments; + QByteArray inPrivateClass; enum Access { Private, Protected, Public }; - Access access; - bool isConst; - bool isVirtual; - bool isStatic; - bool inlineCode; - bool wasCloned; - - QByteArray inPrivateClass; - bool isCompat; - bool isInvokable; - bool isScriptable; - bool isSlot; - bool isSignal; - bool isPrivateSignal; - bool isConstructor; - bool isDestructor; - bool isAbstract; - - int revision; + Access access = Private; + int revision = 0; + + bool isConst = false; + bool isVirtual = false; + bool isStatic = false; + bool inlineCode = false; + bool wasCloned = false; + + bool returnTypeIsVolatile = false; + + bool isCompat = false; + bool isInvokable = false; + bool isScriptable = false; + bool isSlot = false; + bool isSignal = false; + bool isPrivateSignal = false; + bool isConstructor = false; + bool isDestructor = false; + bool isAbstract = false; }; Q_DECLARE_TYPEINFO(FunctionDef, Q_MOVABLE_TYPE); struct PropertyDef { - PropertyDef():notifyId(-1), constant(false), final(false), gspec(ValueSpec), revision(0){} - QByteArray name, type, member, read, write, reset, designable, scriptable, editable, stored, user, notify, inPrivateClass; - int notifyId; // -1 means no notifyId, >= 0 means signal defined in this class, < -1 means signal not defined in this class - bool constant; - bool final; - enum Specification { ValueSpec, ReferenceSpec, PointerSpec }; - Specification gspec; bool stdCppSet() const { QByteArray s("set"); s += toupper(name[0]); s += name.mid(1); return (s == write); } - int revision; + + QByteArray name, type, member, read, write, reset, designable, scriptable, editable, stored, user, notify, inPrivateClass; + int notifyId = -1; // -1 means no notifyId, >= 0 means signal defined in this class, < -1 means signal not defined in this class + enum Specification { ValueSpec, ReferenceSpec, PointerSpec }; + Specification gspec = ValueSpec; + int revision = 0; + bool constant = false; + bool final = false; }; Q_DECLARE_TYPEINFO(PropertyDef, Q_MOVABLE_TYPE); @@ -169,9 +165,6 @@ struct ClassDef : BaseDef { }; QVector<QVector<Interface> >interfaceList; - bool hasQObject = false; - bool hasQGadget = false; - struct PluginData { QByteArray iid; QMap<QString, QJsonArray> metaArgs; @@ -181,11 +174,14 @@ struct ClassDef : BaseDef { QVector<FunctionDef> constructorList; QVector<FunctionDef> signalList, slotList, methodList, publicList; QVector<QByteArray> nonClassSignalList; - int notifyableProperties = 0; QVector<PropertyDef> propertyList; + int notifyableProperties = 0; int revisionedMethods = 0; int revisionedProperties = 0; + bool hasQObject = false; + bool hasQGadget = false; + }; Q_DECLARE_TYPEINFO(ClassDef, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(ClassDef::Interface, Q_MOVABLE_TYPE); diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 3894be1309..5460d28924 100755 --- a/src/tools/moc/util/generate.sh +++ b/src/tools/moc/util/generate.sh @@ -27,6 +27,8 @@ ## ############################################################################# +set -ex + qmake make cat licenseheader.txt > ../keywords.cpp diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index ab7726a01f..ea410cd257 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -326,7 +326,6 @@ static void writeArgList(QTextStream &ts, const QStringList &argNames, // yes, starting from 1 for (int i = 1; i < outputArgs.count(); ++i) { const QDBusIntrospection::Argument &arg = outputArgs.at(i); - QString name = arg.name; if (!first) ts << ", "; @@ -531,8 +530,6 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf // properties: for (const QDBusIntrospection::Property &property : interface->properties) { QByteArray type = qtTypeName(property.type, property.annotations); - QString templateType = templateArg(type); - QString constRefType = constRefArg(type); QString getter = propertyGetter(property); QString setter = propertySetter(property); diff --git a/src/tools/qfloat16-tables/gen_qfloat16_tables.cpp b/src/tools/qfloat16-tables/gen_qfloat16_tables.cpp index f5051e25fc..a9bf7e86e4 100644 --- a/src/tools/qfloat16-tables/gen_qfloat16_tables.cpp +++ b/src/tools/qfloat16-tables/gen_qfloat16_tables.cpp @@ -68,7 +68,7 @@ qint32 main(qint32 argc, char **argv) return -1; } - QFile fid(argv[1]); + QFile fid(QFile::decodeName(argv[1])); if (!fid.open(QIODevice::WriteOnly | QIODevice::Text)) { qWarning() << "Abort: Failed to open/create file" << fid.fileName(); return -1; diff --git a/src/tools/qlalr/cppgenerator.cpp b/src/tools/qlalr/cppgenerator.cpp index b14c73a8fe..508db696b1 100644 --- a/src/tools/qlalr/cppgenerator.cpp +++ b/src/tools/qlalr/cppgenerator.cpp @@ -460,7 +460,7 @@ void CppGenerator::generateDecl (QTextStream &out) << "public:" << endl << " enum VariousConstants {" << endl; - for (Name t : qAsConst(grammar.terminals)) + for (const Name &t : qAsConst(grammar.terminals)) { QString name = *t; int value = std::distance (grammar.names.begin (), t); diff --git a/src/tools/qlalr/lalr.h b/src/tools/qlalr/lalr.h index 6a2baaa462..8eadee400d 100644 --- a/src/tools/qlalr/lalr.h +++ b/src/tools/qlalr/lalr.h @@ -61,6 +61,8 @@ public: public: const_iterator () {} + const_iterator (const typename _Base::iterator &it): + _M_iterator (typename _Base::const_iterator(it)) {} const_iterator (const typename _Base::const_iterator &it): _M_iterator (it) {} diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index 12f986b1e2..6e8c13be15 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -127,10 +128,25 @@ int runRcc(int argc, char *argv[]) QCommandLineOption rootOption(QStringLiteral("root"), QStringLiteral("Prefix resource access path with root path."), QStringLiteral("path")); parser.addOption(rootOption); +#if QT_CONFIG(zstd) && !defined(QT_NO_COMPRESS) +# define ALGOS "[zstd], zlib, none" +#elif QT_CONFIG(zstd) +# define ALGOS "[zstd], none" +#elif !defined(QT_NO_COMPRESS) +# define ALGOS "[zlib], none" +#else +# define ALGOS "[none]" +#endif + const QString &algoDescription = + QStringLiteral("Compress input files using algorithm <algo> (" ALGOS ")."); + QCommandLineOption compressionAlgoOption(QStringLiteral("compress-algo"), algoDescription, QStringLiteral("algo")); + parser.addOption(compressionAlgoOption); +#undef ALGOS + QCommandLineOption compressOption(QStringLiteral("compress"), QStringLiteral("Compress input files by <level>."), QStringLiteral("level")); parser.addOption(compressOption); - QCommandLineOption nocompressOption(QStringLiteral("no-compress"), QStringLiteral("Disable all compression.")); + QCommandLineOption nocompressOption(QStringLiteral("no-compress"), QStringLiteral("Disable all compression. Same as --compress-algo=none.")); parser.addOption(nocompressOption); QCommandLineOption thresholdOption(QStringLiteral("threshold"), QStringLiteral("Threshold to consider compressing files."), QStringLiteral("level")); @@ -169,13 +185,13 @@ int runRcc(int argc, char *argv[]) QString errorMsg; - quint8 formatVersion = 2; + quint8 formatVersion = 3; if (parser.isSet(formatVersionOption)) { bool ok = false; formatVersion = parser.value(formatVersionOption).toUInt(&ok); if (!ok) { errorMsg = QLatin1String("Invalid format version specified"); - } else if (formatVersion != 1 && formatVersion != 2) { + } else if (formatVersion < 1 || formatVersion > 3) { errorMsg = QLatin1String("Unsupported format version specified"); } } @@ -189,10 +205,17 @@ int runRcc(int argc, char *argv[]) || library.resourceRoot().at(0) != QLatin1Char('/')) errorMsg = QLatin1String("Root must start with a /"); } - if (parser.isSet(compressOption)) - library.setCompressLevel(parser.value(compressOption).toInt()); + + if (parser.isSet(compressionAlgoOption)) + library.setCompressionAlgorithm(RCCResourceLibrary::parseCompressionAlgorithm(parser.value(compressionAlgoOption), &errorMsg)); + if (formatVersion < 3 && library.compressionAlgorithm() == RCCResourceLibrary::CompressionAlgorithm::Zstd) + errorMsg = QLatin1String("Zstandard compression requires format version 3 or higher"); if (parser.isSet(nocompressOption)) - library.setCompressLevel(-2); + library.setCompressionAlgorithm(RCCResourceLibrary::CompressionAlgorithm::None); + if (parser.isSet(compressOption) && errorMsg.isEmpty()) { + int level = library.parseCompressionLevel(library.compressionAlgorithm(), parser.value(compressOption), &errorMsg); + library.setCompressLevel(level); + } if (parser.isSet(thresholdOption)) library.setCompressThreshold(parser.value(thresholdOption).toInt()); if (parser.isSet(binaryOption)) diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 1a7cab01df..862e574f2d 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -41,6 +42,10 @@ #include <algorithm> +#if QT_CONFIG(zstd) +# include <zstd.h> +#endif + // Note: A copy of this file is used in Qt Designer (qttools/src/designer/src/lib/shared/rcc.cpp) QT_BEGIN_NAMESPACE @@ -48,9 +53,18 @@ QT_BEGIN_NAMESPACE enum { CONSTANT_USENAMESPACE = 1, CONSTANT_COMPRESSLEVEL_DEFAULT = -1, + CONSTANT_ZSTDCOMPRESSLEVEL_CHECK = 1, // Zstd level to check if compressing is a good idea + CONSTANT_ZSTDCOMPRESSLEVEL_STORE = 14, // Zstd level to actually store the data CONSTANT_COMPRESSTHRESHOLD_DEFAULT = 70 }; +#if QT_CONFIG(zstd) +# define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zstd +#elif !defined(QT_NO_COMPRESS) +# define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::Zlib +#else +# define CONSTANT_COMPRESSALGO_DEFAULT RCCResourceLibrary::CompressionAlgorithm::None +#endif #define writeString(s) write(s, sizeof(s)) @@ -88,15 +102,18 @@ class RCCFileInfo public: enum Flags { + // must match qresource.cpp NoFlags = 0x00, Compressed = 0x01, - Directory = 0x02 + Directory = 0x02, + CompressedZstd = 0x04 }; RCCFileInfo(const QString &name = QString(), const QFileInfo &fileInfo = QFileInfo(), QLocale::Language language = QLocale::C, QLocale::Country country = QLocale::AnyCountry, uint flags = NoFlags, + RCCResourceLibrary::CompressionAlgorithm compressAlgo = CONSTANT_COMPRESSALGO_DEFAULT, int compressLevel = CONSTANT_COMPRESSLEVEL_DEFAULT, int compressThreshold = CONSTANT_COMPRESSTHRESHOLD_DEFAULT); ~RCCFileInfo(); @@ -115,6 +132,7 @@ public: QFileInfo m_fileInfo; RCCFileInfo *m_parent; QHash<QString, RCCFileInfo*> m_children; + RCCResourceLibrary::CompressionAlgorithm m_compressAlgo; int m_compressLevel; int m_compressThreshold; @@ -125,7 +143,7 @@ public: RCCFileInfo::RCCFileInfo(const QString &name, const QFileInfo &fileInfo, QLocale::Language language, QLocale::Country country, uint flags, - int compressLevel, int compressThreshold) + RCCResourceLibrary::CompressionAlgorithm compressAlgo, int compressLevel, int compressThreshold) { m_name = name; m_fileInfo = fileInfo; @@ -136,6 +154,7 @@ RCCFileInfo::RCCFileInfo(const QString &name, const QFileInfo &fileInfo, m_nameOffset = 0; m_dataOffset = 0; m_childOffset = 0; + m_compressAlgo = compressAlgo; m_compressLevel = compressLevel; m_compressThreshold = compressThreshold; } @@ -211,6 +230,9 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong(); if (sourceDate != 0) lastmod = sourceDate; + static const quint64 sourceDate2 = 1000 * qgetenv("SOURCE_DATE_EPOCH").toULongLong(); + if (sourceDate2 != 0) + lastmod = sourceDate2; lib.writeNumber8(lastmod); if (text || pass1) lib.writeChar('\n'); @@ -236,19 +258,82 @@ qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset, } QByteArray data = file.readAll(); -#ifndef QT_NO_COMPRESS // Check if compression is useful for this file - if (m_compressLevel != 0 && data.size() != 0) { - QByteArray compressed = - qCompress(reinterpret_cast<uchar *>(data.data()), data.size(), m_compressLevel); - - int compressRatio = int(100.0 * (data.size() - compressed.size()) / data.size()); - if (compressRatio >= m_compressThreshold) { - data = compressed; - m_flags |= Compressed; + if (data.size() != 0) { +#if QT_CONFIG(zstd) + if (m_compressAlgo == RCCResourceLibrary::CompressionAlgorithm::Best) { + m_compressAlgo = RCCResourceLibrary::CompressionAlgorithm::Zstd; + m_compressLevel = 19; // not ZSTD_maxCLevel(), as 20+ are experimental + } + if (m_compressAlgo == RCCResourceLibrary::CompressionAlgorithm::Zstd) { + if (lib.m_zstdCCtx == nullptr) + lib.m_zstdCCtx = ZSTD_createCCtx(); + qsizetype size = data.size(); + size = ZSTD_COMPRESSBOUND(size); + + int compressLevel = m_compressLevel; + if (compressLevel < 0) + compressLevel = CONSTANT_ZSTDCOMPRESSLEVEL_CHECK; + + QByteArray compressed(size, Qt::Uninitialized); + char *dst = const_cast<char *>(compressed.constData()); + size_t n = ZSTD_compressCCtx(lib.m_zstdCCtx, dst, size, + data.constData(), data.size(), + compressLevel); + if (n * 100.0 < data.size() * 1.0 * (100 - m_compressThreshold) ) { + // compressing is worth it + if (m_compressLevel < 0) { + // heuristic compression, so recompress + n = ZSTD_compressCCtx(lib.m_zstdCCtx, dst, size, + data.constData(), data.size(), + CONSTANT_ZSTDCOMPRESSLEVEL_STORE); + } + if (ZSTD_isError(n)) { + QString msg = QString::fromLatin1("%1: error: compression with zstd failed: %2\n") + .arg(m_name, QString::fromUtf8(ZSTD_getErrorName(n))); + lib.m_errorDevice->write(msg.toUtf8()); + } else if (lib.verbose()) { + QString msg = QString::fromLatin1("%1: note: compressed using zstd (%2 -> %3)\n") + .arg(m_name).arg(data.size()).arg(n); + lib.m_errorDevice->write(msg.toUtf8()); + } + + lib.m_overallFlags |= CompressedZstd; + m_flags |= CompressedZstd; + data = std::move(compressed); + data.truncate(n); + } else if (lib.verbose()) { + QString msg = QString::fromLatin1("%1: note: not compressed\n").arg(m_name); + lib.m_errorDevice->write(msg.toUtf8()); + } + } +#endif +#ifndef QT_NO_COMPRESS + if (m_compressAlgo == RCCResourceLibrary::CompressionAlgorithm::Best) { + m_compressAlgo = RCCResourceLibrary::CompressionAlgorithm::Zlib; + m_compressLevel = 9; + } + if (m_compressAlgo == RCCResourceLibrary::CompressionAlgorithm::Zlib) { + QByteArray compressed = + qCompress(reinterpret_cast<uchar *>(data.data()), data.size(), m_compressLevel); + + int compressRatio = int(100.0 * (data.size() - compressed.size()) / data.size()); + if (compressRatio >= m_compressThreshold) { + if (lib.verbose()) { + QString msg = QString::fromLatin1("%1: note: compressed using zlib (%2 -> %3)\n") + .arg(m_name).arg(data.size()).arg(compressed.size()); + lib.m_errorDevice->write(msg.toUtf8()); + } + data = compressed; + lib.m_overallFlags |= Compressed; + m_flags |= Compressed; + } else if (lib.verbose()) { + QString msg = QString::fromLatin1("%1: note: not compressed\n").arg(m_name); + lib.m_errorDevice->write(msg.toUtf8()); + } } - } #endif // QT_NO_COMPRESS + } // some info if (text || pass1) { @@ -343,7 +428,8 @@ RCCResourceLibrary::Strings::Strings() : ATTRIBUTE_PREFIX(QLatin1String("prefix")), ATTRIBUTE_ALIAS(QLatin1String("alias")), ATTRIBUTE_THRESHOLD(QLatin1String("threshold")), - ATTRIBUTE_COMPRESS(QLatin1String("compress")) + ATTRIBUTE_COMPRESS(QLatin1String("compress")), + ATTRIBUTE_COMPRESSALGO(QStringLiteral("compression-algorithm")) { } @@ -351,22 +437,30 @@ RCCResourceLibrary::RCCResourceLibrary(quint8 formatVersion) : m_root(0), m_format(C_Code), m_verbose(false), + m_compressionAlgo(CONSTANT_COMPRESSALGO_DEFAULT), m_compressLevel(CONSTANT_COMPRESSLEVEL_DEFAULT), m_compressThreshold(CONSTANT_COMPRESSTHRESHOLD_DEFAULT), m_treeOffset(0), m_namesOffset(0), m_dataOffset(0), + m_overallFlags(0), m_useNameSpace(CONSTANT_USENAMESPACE), m_errorDevice(0), m_outDevice(0), m_formatVersion(formatVersion) { m_out.reserve(30 * 1000 * 1000); +#if QT_CONFIG(zstd) + m_zstdCCtx = nullptr; +#endif } RCCResourceLibrary::~RCCResourceLibrary() { delete m_root; +#if QT_CONFIG(zstd) + ZSTD_freeCCtx(m_zstdCCtx); +#endif } enum RCCXmlTag { @@ -391,6 +485,7 @@ bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice, QLocale::Language language = QLocale::c().language(); QLocale::Country country = QLocale::c().country(); QString alias; + auto compressAlgo = m_compressionAlgo; int compressLevel = m_compressLevel; int compressThreshold = m_compressThreshold; @@ -444,17 +539,27 @@ bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice, if (attributes.hasAttribute(m_strings.ATTRIBUTE_ALIAS)) alias = attributes.value(m_strings.ATTRIBUTE_ALIAS).toString(); + compressAlgo = m_compressionAlgo; compressLevel = m_compressLevel; - if (attributes.hasAttribute(m_strings.ATTRIBUTE_COMPRESS)) - compressLevel = attributes.value(m_strings.ATTRIBUTE_COMPRESS).toString().toInt(); - compressThreshold = m_compressThreshold; + + QString errorString; + if (attributes.hasAttribute(m_strings.ATTRIBUTE_COMPRESSALGO)) + compressAlgo = parseCompressionAlgorithm(attributes.value(m_strings.ATTRIBUTE_COMPRESSALGO), &errorString); + if (errorString.isEmpty() && attributes.hasAttribute(m_strings.ATTRIBUTE_COMPRESS)) { + QString value = attributes.value(m_strings.ATTRIBUTE_COMPRESS).toString(); + compressLevel = parseCompressionLevel(compressAlgo, value, &errorString); + } + + // Special case for -no-compress + if (m_compressLevel == -2) + compressAlgo = CompressionAlgorithm::None; + if (attributes.hasAttribute(m_strings.ATTRIBUTE_THRESHOLD)) compressThreshold = attributes.value(m_strings.ATTRIBUTE_THRESHOLD).toString().toInt(); - // Special case for -no-compress. Overrides all other settings. - if (m_compressLevel == -2) - compressLevel = 0; + if (!errorString.isEmpty()) + reader.raiseError(errorString); } } else { reader.raiseError(QString(QLatin1String("unexpected tag: %1")).arg(reader.name().toString())); @@ -520,6 +625,7 @@ bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice, language, country, child.isDir() ? RCCFileInfo::Directory : RCCFileInfo::NoFlags, + compressAlgo, compressLevel, compressThreshold) ); @@ -535,6 +641,7 @@ bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice, language, country, RCCFileInfo::NoFlags, + compressAlgo, compressLevel, compressThreshold) ); @@ -729,6 +836,55 @@ RCCResourceLibrary::ResourceDataFileMap RCCResourceLibrary::resourceDataFileMap( return rc; } +RCCResourceLibrary::CompressionAlgorithm RCCResourceLibrary::parseCompressionAlgorithm(QStringView value, QString *errorMsg) +{ + if (value == QLatin1String("best")) + return CompressionAlgorithm::Best; + if (value == QLatin1String("zlib")) { +#ifdef QT_NO_COMPRESS + *errorMsg = QLatin1String("zlib support not compiled in"); +#else + return CompressionAlgorithm::Zlib; +#endif + } else if (value == QLatin1String("zstd")) { +#if QT_CONFIG(zstd) + return CompressionAlgorithm::Zstd; +#else + *errorMsg = QLatin1String("Zstandard support not compiled in"); +#endif + } else if (value != QLatin1String("none")) { + *errorMsg = QString::fromLatin1("Unknown compression algorithm '%1'").arg(value); + } + + return CompressionAlgorithm::None; +} + +int RCCResourceLibrary::parseCompressionLevel(CompressionAlgorithm algo, const QString &level, QString *errorMsg) +{ + bool ok; + int c = level.toInt(&ok); + if (ok) { + switch (algo) { + case CompressionAlgorithm::None: + case CompressionAlgorithm::Best: + return 0; + case CompressionAlgorithm::Zlib: + if (c >= 1 && c <= 9) + return c; + break; + case CompressionAlgorithm::Zstd: +#if QT_CONFIG(zstd) + if (c >= 0 && c <= ZSTD_maxCLevel()) + return c; +#endif + break; + } + } + + *errorMsg = QString::fromLatin1("invalid compression level '%1'").arg(level); + return 0; +} + bool RCCResourceLibrary::output(QIODevice &outDevice, QIODevice &tempDevice, QIODevice &errorDevice) { m_errorDevice = &errorDevice; @@ -795,6 +951,14 @@ bool RCCResourceLibrary::output(QIODevice &outDevice, QIODevice &tempDevice, QIO return true; } +void RCCResourceLibrary::writeDecimal(int value) +{ + Q_ASSERT(m_format != RCCResourceLibrary::Binary); + char buf[std::numeric_limits<int>::digits10 + 2]; + int n = snprintf(buf, sizeof(buf), "%d", value); + write(buf, n + 1); // write() takes a size including terminating NUL +} + void RCCResourceLibrary::writeHex(quint8 tmp) { const char digits[] = "0123456789abcdef"; @@ -889,6 +1053,8 @@ bool RCCResourceLibrary::writeHeader() writeNumber4(0); writeNumber4(0); writeNumber4(0); + if (m_formatVersion >= 3) + writeNumber4(m_overallFlags); } return true; } @@ -1091,10 +1257,35 @@ bool RCCResourceLibrary::writeInitializer() if (m_root) { writeString("bool qRegisterResourceData" "(int, const unsigned char *, " - "const unsigned char *, const unsigned char *);\n\n"); + "const unsigned char *, const unsigned char *);\n"); writeString("bool qUnregisterResourceData" "(int, const unsigned char *, " "const unsigned char *, const unsigned char *);\n\n"); + + if (m_overallFlags & (RCCFileInfo::Compressed | RCCFileInfo::CompressedZstd)) { + // use variable relocations with ELF and Mach-O + writeString("#if defined(__ELF__) || defined(__APPLE__)\n"); + if (m_overallFlags & RCCFileInfo::Compressed) { + writeString("static inline unsigned char qResourceFeatureZlib()\n" + "{\n" + " extern const unsigned char qt_resourceFeatureZlib;\n" + " return qt_resourceFeatureZlib;\n" + "}\n"); + } + if (m_overallFlags & RCCFileInfo::CompressedZstd) { + writeString("static inline unsigned char qResourceFeatureZstd()\n" + "{\n" + " extern const unsigned char qt_resourceFeatureZstd;\n" + " return qt_resourceFeatureZstd;\n" + "}\n"); + } + writeString("#else\n"); + if (m_overallFlags & RCCFileInfo::Compressed) + writeString("unsigned char qResourceFeatureZlib();\n"); + if (m_overallFlags & RCCFileInfo::CompressedZstd) + writeString("unsigned char qResourceFeatureZstd();\n"); + writeString("#endif\n\n"); + } } if (m_useNameSpace) @@ -1113,12 +1304,12 @@ bool RCCResourceLibrary::writeInitializer() writeString("()\n{\n"); if (m_root) { - writeString(" "); + writeString(" int version = "); + writeDecimal(m_formatVersion); + writeString(";\n "); writeAddNamespaceFunction("qRegisterResourceData"); - writeString("\n ("); - writeHex(m_formatVersion); - writeString(" qt_resource_struct, " - "qt_resource_name, qt_resource_data);\n"); + writeString("\n (version, qt_resource_struct, " + "qt_resource_name, qt_resource_data);\n"); } writeString(" return 1;\n"); writeString("}\n\n"); @@ -1136,11 +1327,24 @@ bool RCCResourceLibrary::writeInitializer() writeMangleNamespaceFunction(cleanResources); writeString("()\n{\n"); if (m_root) { - writeString(" "); + writeString(" int version = "); + writeDecimal(m_formatVersion); + writeString(";\n "); + + // ODR-use certain symbols from QtCore if we require optional features + if (m_overallFlags & RCCFileInfo::Compressed) { + writeString("version += "); + writeAddNamespaceFunction("qResourceFeatureZlib()"); + writeString(";\n "); + } + if (m_overallFlags & RCCFileInfo::CompressedZstd) { + writeString("version += "); + writeAddNamespaceFunction("qResourceFeatureZstd()"); + writeString(";\n "); + } + writeAddNamespaceFunction("qUnregisterResourceData"); - writeString("\n ("); - writeHex(m_formatVersion); - writeString(" qt_resource_struct, " + writeString("\n (version, qt_resource_struct, " "qt_resource_name, qt_resource_data);\n"); } writeString(" return 1;\n"); @@ -1176,6 +1380,13 @@ bool RCCResourceLibrary::writeInitializer() p[i++] = (m_namesOffset >> 16) & 0xff; p[i++] = (m_namesOffset >> 8) & 0xff; p[i++] = (m_namesOffset >> 0) & 0xff; + + if (m_formatVersion >= 3) { + p[i++] = (m_overallFlags >> 24) & 0xff; + p[i++] = (m_overallFlags >> 16) & 0xff; + p[i++] = (m_overallFlags >> 8) & 0xff; + p[i++] = (m_overallFlags >> 0) & 0xff; + } } return true; } diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h index 36984cf38a..ad1c5cd166 100644 --- a/src/tools/rcc/rcc.h +++ b/src/tools/rcc/rcc.h @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -35,6 +36,8 @@ #include <qhash.h> #include <qstring.h> +typedef struct ZSTD_CCtx_s ZSTD_CCtx; + QT_BEGIN_NAMESPACE class RCCFileInfo; @@ -77,6 +80,19 @@ public: void setOutputName(const QString &name) { m_outputName = name; } QString outputName() const { return m_outputName; } + enum class CompressionAlgorithm { + Zlib, + Zstd, + + Best = 99, + None = -1 + }; + + static CompressionAlgorithm parseCompressionAlgorithm(QStringView algo, QString *errorMsg); + void setCompressionAlgorithm(CompressionAlgorithm algo) { m_compressionAlgo = algo; } + CompressionAlgorithm compressionAlgorithm() const { return m_compressionAlgo; } + + static int parseCompressionLevel(CompressionAlgorithm algo, const QString &level, QString *errorMsg); void setCompressLevel(int c) { m_compressLevel = c; } int compressLevel() const { return m_compressLevel; } @@ -104,6 +120,7 @@ private: const QString ATTRIBUTE_ALIAS; const QString ATTRIBUTE_THRESHOLD; const QString ATTRIBUTE_COMPRESS; + const QString ATTRIBUTE_COMPRESSALGO; }; friend class RCCFileInfo; void reset(); @@ -117,6 +134,7 @@ private: bool writeInitializer(); void writeMangleNamespaceFunction(const QByteArray &name); void writeAddNamespaceFunction(const QByteArray &name); + void writeDecimal(int value); void writeHex(quint8 number); void writeNumber2(quint16 number); void writeNumber4(quint32 number); @@ -125,6 +143,10 @@ private: void writeByteArray(const QByteArray &); void write(const char *, int len); +#if QT_CONFIG(zstd) + ZSTD_CCtx *m_zstdCCtx; +#endif + const Strings m_strings; RCCFileInfo *m_root; QStringList m_fileNames; @@ -133,11 +155,13 @@ private: QString m_outputName; Format m_format; bool m_verbose; + CompressionAlgorithm m_compressionAlgo; int m_compressLevel; int m_compressThreshold; int m_treeOffset; int m_namesOffset; int m_dataOffset; + quint32 m_overallFlags; bool m_useNameSpace; QStringList m_failedResources; QIODevice *m_errorDevice; diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro index 208ec54a73..ae55b5d8af 100644 --- a/src/tools/rcc/rcc.pro +++ b/src/tools/rcc/rcc.pro @@ -8,3 +8,14 @@ SOURCES += main.cpp QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler" load(qt_tool) + +# RCC is a bootstrapped tool, so qglobal.h #includes qconfig-bootstrapped.h +# and that has a #define saying zstd isn't present (for qresource.cpp, which is +# part of the bootstrap lib). So we inform the presence of the feature in the +# command-line. +qtConfig(zstd):!cross_compile { + DEFINES += QT_FEATURE_zstd=1 + QMAKE_USE_PRIVATE += zstd +} else { + DEFINES += QT_FEATURE_zstd=-1 +} diff --git a/src/tools/tracegen/helpers.cpp b/src/tools/tracegen/helpers.cpp index f0ac7ed47f..a5526065d6 100644 --- a/src/tools/tracegen/helpers.cpp +++ b/src/tools/tracegen/helpers.cpp @@ -46,7 +46,7 @@ QString includeGuard(const QString &filename) for (int i = 0; i < guard.size(); ++i) { if (!guard.at(i).isLetterOrNumber()) - guard[i] = QChar('_'); + guard[i] = QLatin1Char('_'); } return guard; diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index d51fddffea..0ba49627c0 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -119,7 +119,7 @@ void WriteIncludes::acceptUI(DomUI *node) writeHeaders(m_globalIncludes, true); writeHeaders(m_localIncludes, false); - m_output << QLatin1Char('\n'); + m_output << '\n'; } void WriteIncludes::acceptWidget(DomWidget *node) @@ -214,14 +214,14 @@ void WriteIncludes::add(const QString &className, bool determineHeader, const QS m_knownClasses.insert(className); const CustomWidgetsInfo *cwi = m_uic->customWidgetsInfo(); - if (cwi->extends(className, QLatin1String("QTreeView")) - || cwi->extends(className, QLatin1String("QTreeWidget")) - || cwi->extends(className, QLatin1String("QTableView")) - || cwi->extends(className, QLatin1String("QTableWidget"))) { + static const QStringList treeViewsWithHeaders = { + QLatin1String("QTreeView"), QLatin1String("QTreeWidget"), + QLatin1String("QTableView"), QLatin1String("QTableWidget") + }; + if (cwi->extendsOneOf(className, treeViewsWithHeaders)) add(QLatin1String("QHeaderView")); - } - if (!m_laidOut && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox"))) + if (!m_laidOut && cwi->extends(className, QLatin1String("QToolBox"))) add(QLatin1String("QLayout")); // spacing property of QToolBox) if (className == QLatin1String("Line")) { // ### hmm, deprecate me! @@ -314,7 +314,7 @@ void WriteIncludes::writeHeaders(const OrderedSet &headers, bool global) const QString value = m_oldHeaderToNewHeader.value(header, header); const auto trimmed = QStringRef(&value).trimmed(); if (!trimmed.isEmpty()) - m_output << "#include " << openingQuote << trimmed << closingQuote << QLatin1Char('\n'); + m_output << "#include " << openingQuote << trimmed << closingQuote << '\n'; } } diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 7ab6c31cb2..35d77f0827 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -32,7 +32,8 @@ #include "utils.h" #include "uic.h" #include "databaseinfo.h" -#include "globaldefs.h" + +#include <language.h> #include <qtextstream.h> #include <qversionnumber.h> @@ -45,35 +46,26 @@ QT_BEGIN_NAMESPACE namespace { - // Fixup an enumeration name from class Qt. - // They are currently stored as "BottomToolBarArea" instead of "Qt::BottomToolBarArea". - // due to MO issues. This might be fixed in the future. - QLatin1String qtEnumerationPrefix(const QString &name) { - static const QLatin1String prefix("Qt::"); - if (name.indexOf(prefix) != 0) - return prefix; - return QLatin1String(); - } // figure out the toolbar area of a DOM attrib list. // By legacy, it is stored as an integer. As of 4.3.0, it is the enumeration value. QString toolBarAreaStringFromDOMAttributes(const CPP::WriteInitialization::DomPropertyMap &attributes) { const DomProperty *pstyle = attributes.value(QLatin1String("toolBarArea")); + QString result; if (!pstyle) - return QString(); - + return result; switch (pstyle->kind()) { - case DomProperty::Number: { - return QLatin1String("static_cast<Qt::ToolBarArea>(") - + QString::number(pstyle->elementNumber()) + QLatin1String("), "); - } - case DomProperty::Enum: { - const QString area = pstyle->elementEnum(); - return qtEnumerationPrefix(area) + area + QLatin1String(", "); - } + case DomProperty::Number: + result = QLatin1String(language::toolbarArea(pstyle->elementNumber())); + break; + case DomProperty::Enum: + result = pstyle->elementEnum(); + break; default: break; } - return QString(); + if (!result.startsWith(QLatin1String("Qt::"))) + result.prepend(QLatin1String("Qt::")); + return result + QLatin1String(", "); } // Write a statement to create a spacer item. @@ -173,17 +165,16 @@ namespace { } return true; } - - inline void openIfndef(QTextStream &str, const QString &symbol) { if (!symbol.isEmpty()) str << QLatin1String("#ifndef ") << symbol << endl; } - inline void closeIfndef(QTextStream &str, const QString &symbol) { if (!symbol.isEmpty()) str << QLatin1String("#endif // ") << symbol << endl; } - - const char *accessibilityDefineC = "QT_NO_ACCESSIBILITY"; - const char *toolTipDefineC = "QT_NO_TOOLTIP"; - const char *whatsThisDefineC = "QT_NO_WHATSTHIS"; - const char *statusTipDefineC = "QT_NO_STATUSTIP"; - const char *shortcutDefineC = "QT_NO_SHORTCUT"; } +// QtGui +static inline QString accessibilityConfigKey() { return QStringLiteral("accessibility"); } +static inline QString shortcutConfigKey() { return QStringLiteral("shortcut"); } +static inline QString whatsThisConfigKey() { return QStringLiteral("whatsthis"); } +// QtWidgets +static inline QString statusTipConfigKey() { return QStringLiteral("statustip"); } +static inline QString toolTipConfigKey() { return QStringLiteral("tooltip"); } + namespace CPP { FontHandle::FontHandle(const DomFont *domFont) : @@ -521,14 +512,15 @@ void WriteInitialization::acceptUI(DomUI *node) acceptWidget(node->elementWidget()); if (!m_buddies.empty()) - openIfndef(m_output, QLatin1String(shortcutDefineC)); + m_output << language::openQtConfig(shortcutConfigKey()); for (const Buddy &b : qAsConst(m_buddies)) { if (!m_registeredWidgets.contains(b.objName)) { fprintf(stderr, "%s: Warning: Buddy assignment: '%s' is not a valid widget.\n", qPrintable(m_option.messagePrefix()), b.objName.toLatin1().data()); continue; - } else if (!m_registeredWidgets.contains(b.buddy)) { + } + if (!m_registeredWidgets.contains(b.buddy)) { fprintf(stderr, "%s: Warning: Buddy assignment: '%s' is not a valid widget.\n", qPrintable(m_option.messagePrefix()), b.buddy.toLatin1().data()); @@ -538,12 +530,12 @@ void WriteInitialization::acceptUI(DomUI *node) m_output << m_indent << b.objName << "->setBuddy(" << b.buddy << ");\n"; } if (!m_buddies.empty()) - closeIfndef(m_output, QLatin1String(shortcutDefineC)); + m_output << language::closeQtConfig(shortcutConfigKey()); if (node->elementTabStops()) acceptTabStops(node->elementTabStops()); - if (m_delayedActionInitialization.size()) + if (!m_delayedActionInitialization.isEmpty()) m_output << "\n" << m_delayedActionInitialization; m_output << "\n" << m_indent << "retranslateUi(" << varName << ");\n"; @@ -616,18 +608,23 @@ void WriteInitialization::acceptWidget(DomWidget *node) if (m_uic->isContainer(parentClass)) parentWidget.clear(); - if (m_widgetChain.size() != 1) - m_output << m_indent << varName << " = new " << m_uic->customWidgetsInfo()->realClassName(className) << '(' << parentWidget << ");\n"; + const auto *cwi = m_uic->customWidgetsInfo(); + + if (m_widgetChain.size() != 1) { + m_output << m_indent << varName << " = new " << cwi->realClassName(className) + << '(' << parentWidget << ");\n"; + } parentWidget = savedParentWidget; - if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QComboBox"))) { + + if (cwi->extends(className, QLatin1String("QComboBox"))) { initializeComboBox(node); - } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QListWidget"))) { + } else if (cwi->extends(className, QLatin1String("QListWidget"))) { initializeListWidget(node); - } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTreeWidget"))) { + } else if (cwi->extends(className, QLatin1String("QTreeWidget"))) { initializeTreeWidget(node); - } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTableWidget"))) { + } else if (cwi->extends(className, QLatin1String("QTableWidget"))) { initializeTableWidget(node); } @@ -636,7 +633,8 @@ void WriteInitialization::acceptWidget(DomWidget *node) writeProperties(varName, className, node->elementProperty()); - if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QMenu")) && parentWidget.size()) { + if (!parentWidget.isEmpty() + && cwi->extends(className, QLatin1String("QMenu"))) { initializeMenu(node, parentWidget); } @@ -648,7 +646,7 @@ void WriteInitialization::acceptWidget(DomWidget *node) if (const DomWidget* parentWidget = m_widgetChain.top()) { const QString parentClass = parentWidget->attributeClass(); if (parentClass != QLatin1String("QMainWindow") - && !m_uic->isCustomWidgetContainer(parentClass) + && !m_uic->customWidgetsInfo()->isCustomWidgetContainer(parentClass) && !m_uic->isContainer(parentClass)) m_layoutWidget = true; } @@ -664,10 +662,10 @@ void WriteInitialization::acceptWidget(DomWidget *node) const QString pageDefaultString = QLatin1String("Page"); - if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QMainWindow"))) { - if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QMenuBar"))) { + if (cwi->extends(parentClass, QLatin1String("QMainWindow"))) { + if (cwi->extends(className, QLatin1String("QMenuBar"))) { m_output << m_indent << parentWidget << "->setMenuBar(" << varName <<");\n"; - } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBar"))) { + } else if (cwi->extends(className, QLatin1String("QToolBar"))) { m_output << m_indent << parentWidget << "->addToolBar(" << toolBarAreaStringFromDOMAttributes(attributes) << varName << ");\n"; @@ -677,15 +675,11 @@ void WriteInitialization::acceptWidget(DomWidget *node) } } - } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QDockWidget"))) { - QString area; - if (DomProperty *pstyle = attributes.value(QLatin1String("dockWidgetArea"))) { - area += QLatin1String("static_cast<Qt::DockWidgetArea>("); - area += QString::number(pstyle->elementNumber()); - area += QLatin1String("), "); - } - - m_output << m_indent << parentWidget << "->addDockWidget(" << area << varName << ");\n"; + } else if (cwi->extends(className, QLatin1String("QDockWidget"))) { + m_output << m_indent << parentWidget << "->addDockWidget("; + if (DomProperty *pstyle = attributes.value(QLatin1String("dockWidgetArea"))) + m_output << "Qt::" << language::dockWidgetArea(pstyle->elementNumber()) << ", "; + m_output << varName << ");\n"; } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStatusBar"))) { m_output << m_indent << parentWidget << "->setStatusBar(" << varName << ");\n"; } else { @@ -694,71 +688,62 @@ void WriteInitialization::acceptWidget(DomWidget *node) } // Check for addPageMethod of a custom plugin first - const QString addPageMethod = m_uic->customWidgetsInfo()->customWidgetAddPageMethod(parentClass); + QString addPageMethod = cwi->customWidgetAddPageMethod(parentClass); + if (addPageMethod.isEmpty()) + addPageMethod = cwi->simpleContainerAddPageMethod(parentClass); if (!addPageMethod.isEmpty()) { m_output << m_indent << parentWidget << "->" << addPageMethod << '(' << varName << ");\n"; - } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QStackedWidget"))) { - m_output << m_indent << parentWidget << "->addWidget(" << varName << ");\n"; - } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QToolBar"))) { - m_output << m_indent << parentWidget << "->addWidget(" << varName << ");\n"; - } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QDockWidget"))) { - m_output << m_indent << parentWidget << "->setWidget(" << varName << ");\n"; - } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QScrollArea"))) { - m_output << m_indent << parentWidget << "->setWidget(" << varName << ");\n"; - } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QSplitter"))) { - m_output << m_indent << parentWidget << "->addWidget(" << varName << ");\n"; - } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QMdiArea"))) { - m_output << m_indent << parentWidget << "->addSubWindow(" << varName << ");\n"; } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QWizard"))) { addWizardPage(varName, node, parentWidget); } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QToolBox"))) { - QString icon; - if (const DomProperty *picon = attributes.value(QLatin1String("icon"))) { - icon += QLatin1String(", ") ; - icon += iconCall(picon); - } - const DomProperty *plabel = attributes.value(QLatin1String("label")); DomString *plabelString = plabel ? plabel->elementString() : 0; + QString icon; + if (const DomProperty *picon = attributes.value(QLatin1String("icon"))) + icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition - m_output << m_indent << parentWidget << "->addItem(" << varName << icon << ", " << noTrCall(plabelString, pageDefaultString) << ");\n"; + m_output << m_indent << parentWidget << "->addItem(" << varName << icon + << ", " << noTrCall(plabelString, pageDefaultString) << ");\n"; autoTrOutput(plabelString, pageDefaultString) << m_indent << parentWidget << "->setItemText(" << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(plabelString, pageDefaultString) << ");\n"; -#ifndef QT_NO_TOOLTIP if (DomProperty *ptoolTip = attributes.value(QLatin1String("toolTip"))) { - autoTrOutput(ptoolTip->elementString()) << m_indent << parentWidget << "->setItemToolTip(" - << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(ptoolTip->elementString()) << ");\n"; + autoTrOutput(ptoolTip->elementString()) + << language::openQtConfig(toolTipConfigKey()) + << m_indent << parentWidget << "->setItemToolTip(" << parentWidget + << "->indexOf(" << varName << "), " + << autoTrCall(ptoolTip->elementString()) << ");\n" + << language::closeQtConfig(toolTipConfigKey()); } -#endif // QT_NO_TOOLTIP } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QTabWidget"))) { - QString icon; - if (const DomProperty *picon = attributes.value(QLatin1String("icon"))) { - icon += QLatin1String(", "); - icon += iconCall(picon); - } - const DomProperty *ptitle = attributes.value(QLatin1String("title")); DomString *ptitleString = ptitle ? ptitle->elementString() : 0; - - m_output << m_indent << parentWidget << "->addTab(" << varName << icon << ", " << "QString());\n"; + QString icon; + if (const DomProperty *picon = attributes.value(QLatin1String("icon"))) + icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition + m_output << m_indent << parentWidget << "->addTab(" << varName << icon + << ", " << "QString());\n"; autoTrOutput(ptitleString, pageDefaultString) << m_indent << parentWidget << "->setTabText(" << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(ptitleString, pageDefaultString) << ");\n"; -#ifndef QT_NO_TOOLTIP if (const DomProperty *ptoolTip = attributes.value(QLatin1String("toolTip"))) { - autoTrOutput(ptoolTip->elementString()) << m_indent << parentWidget << "->setTabToolTip(" - << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(ptoolTip->elementString()) << ");\n"; + autoTrOutput(ptoolTip->elementString()) + << language::openQtConfig(toolTipConfigKey()) + << m_indent << parentWidget << "->setTabToolTip(" << parentWidget + << "->indexOf(" << varName << "), " + << autoTrCall(ptoolTip->elementString()) << ");\n" + << language::closeQtConfig(toolTipConfigKey()); } -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_WHATSTHIS if (const DomProperty *pwhatsThis = attributes.value(QLatin1String("whatsThis"))) { - autoTrOutput(pwhatsThis->elementString()) << m_indent << parentWidget << "->setTabWhatsThis(" - << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(pwhatsThis->elementString()) << ");\n"; + autoTrOutput(pwhatsThis->elementString()) + << language::openQtConfig(whatsThisConfigKey()) + << m_indent << parentWidget << "->setTabWhatsThis(" << parentWidget + << "->indexOf(" << varName << "), " + << autoTrCall(pwhatsThis->elementString()) << ");\n" + << language::closeQtConfig(whatsThisConfigKey()); } -#endif // QT_NO_WHATSTHIS } // @@ -774,8 +759,14 @@ void WriteInitialization::acceptWidget(DomWidget *node) QLatin1String("stretchLastSection"), }; - if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTreeView")) - || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTreeWidget"))) { + static const QStringList trees = { + QLatin1String("QTreeView"), QLatin1String("QTreeWidget") + }; + static const QStringList tables = { + QLatin1String("QTableView"), QLatin1String("QTableWidget") + }; + + if (cwi->extendsOneOf(className, trees)) { DomPropertyList headerProperties; for (auto realPropertyName : realPropertyNames) { const QString fakePropertyName = QLatin1String("header") @@ -788,9 +779,7 @@ void WriteInitialization::acceptWidget(DomWidget *node) writeProperties(varName + QLatin1String("->header()"), QLatin1String("QHeaderView"), headerProperties, WritePropertyIgnoreObjectName); - } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTableView")) - || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTableWidget"))) { - + } else if (cwi->extendsOneOf(className, tables)) { static const QLatin1String headerPrefixes[] = { QLatin1String("horizontalHeader"), QLatin1String("verticalHeader"), @@ -984,6 +973,24 @@ static inline QString formLayoutRole(int column, int colspan) return column == 0 ? QLatin1String("QFormLayout::LabelRole") : QLatin1String("QFormLayout::FieldRole"); } +static QString layoutAddMethod(DomLayoutItem::Kind kind, const QString &layoutClass) +{ + const QString methodPrefix = layoutClass == QLatin1String("QFormLayout") + ? QLatin1String("set") : QLatin1String("add"); + switch (kind) { + case DomLayoutItem::Widget: + return methodPrefix + QLatin1String("Widget"); + case DomLayoutItem::Layout: + return methodPrefix + QLatin1String("Layout"); + case DomLayoutItem::Spacer: + return methodPrefix + QLatin1String("Item"); + case DomLayoutItem::Unknown: + Q_ASSERT( false ); + break; + } + Q_UNREACHABLE(); +} + void WriteInitialization::acceptLayoutItem(DomLayoutItem *node) { TreeWalker::acceptLayoutItem(node); @@ -996,47 +1003,27 @@ void WriteInitialization::acceptLayoutItem(DomLayoutItem *node) const QString layoutName = m_driver->findOrInsertLayout(layout); const QString itemName = m_driver->findOrInsertLayoutItem(node); - QString addArgs; - QString methodPrefix = QLatin1String("add"); //Consistent API-design galore! + m_output << "\n" << m_indent << layoutName << "->" + << layoutAddMethod(node->kind(), layout->attributeClass()) << '('; + if (layout->attributeClass() == QLatin1String("QGridLayout")) { const int row = node->attributeRow(); const int col = node->attributeColumn(); const int rowSpan = node->hasAttributeRowSpan() ? node->attributeRowSpan() : 1; const int colSpan = node->hasAttributeColSpan() ? node->attributeColSpan() : 1; - - addArgs = QString::fromLatin1("%1, %2, %3, %4, %5").arg(itemName).arg(row).arg(col).arg(rowSpan).arg(colSpan); + m_output << itemName << ", " << row << ", " << col << ", " << rowSpan << ", " << colSpan; if (!node->attributeAlignment().isEmpty()) - addArgs += QLatin1String(", ") + node->attributeAlignment(); + m_output << ", " << node->attributeAlignment(); + } else if (layout->attributeClass() == QLatin1String("QFormLayout")) { + const int row = node->attributeRow(); + const int colSpan = node->hasAttributeColSpan() ? node->attributeColSpan() : 1; + const QString role = formLayoutRole(node->attributeColumn(), colSpan); + m_output << row << ", " << role << ", " << itemName; } else { - if (layout->attributeClass() == QLatin1String("QFormLayout")) { - methodPrefix = QLatin1String("set"); - const int row = node->attributeRow(); - const int colSpan = node->hasAttributeColSpan() ? node->attributeColSpan() : 1; - const QString role = formLayoutRole(node->attributeColumn(), colSpan); - addArgs = QString::fromLatin1("%1, %2, %3").arg(row).arg(role, itemName); - } else { - addArgs = itemName; - if (layout->attributeClass().contains(QLatin1String("Box")) && !node->attributeAlignment().isEmpty()) - addArgs += QLatin1String(", 0, ") + node->attributeAlignment(); - } - } - - // figure out "add" method - m_output << "\n" << m_indent << layoutName << "->"; - switch (node->kind()) { - case DomLayoutItem::Widget: - m_output << methodPrefix << "Widget(" << addArgs; - break; - case DomLayoutItem::Layout: - m_output << methodPrefix << "Layout(" << addArgs; - break; - case DomLayoutItem::Spacer: - m_output << methodPrefix << "Item(" << addArgs; - break; - case DomLayoutItem::Unknown: - Q_ASSERT( 0 ); - break; + m_output << itemName; + if (layout->attributeClass().contains(QLatin1String("Box")) && !node->attributeAlignment().isEmpty()) + m_output << ", 0, " << node->attributeAlignment(); } m_output << ");\n\n"; } @@ -1076,16 +1063,16 @@ void WriteInitialization::acceptAction(DomAction *node) void WriteInitialization::acceptActionRef(DomActionRef *node) { QString actionName = node->attributeName(); + if (actionName.isEmpty() || !m_widgetChain.top() + || m_driver->actionGroupByName(actionName)) { + return; + } + + const QString varName = m_driver->findOrInsertWidget(m_widgetChain.top()); const bool isSeparator = actionName == QLatin1String("separator"); bool isMenu = false; - QString varName = m_driver->findOrInsertWidget(m_widgetChain.top()); - - if (actionName.isEmpty() || !m_widgetChain.top()) { - return; - } else if (m_driver->actionGroupByName(actionName)) { - return; - } else if (const DomWidget *w = m_driver->widgetByName(actionName)) { + if (const DomWidget *w = m_driver->widgetByName(actionName)) { isMenu = m_uic->isMenu(w->attributeClass()); } else if (!(m_driver->actionByName(actionName) || isSeparator)) { fprintf(stderr, "%s: Warning: action `%s' not declared\n", @@ -1125,6 +1112,23 @@ QString WriteInitialization::writeStringListProperty(const DomStringList *list) return propertyValue; } +static QString configKeyForProperty(const QString &propertyName) +{ + if (propertyName == QLatin1String("toolTip")) + return toolTipConfigKey(); + if (propertyName == QLatin1String("whatsThis")) + return whatsThisConfigKey(); + if (propertyName == QLatin1String("statusTip")) + return statusTipConfigKey(); + if (propertyName == QLatin1String("shortcut")) + return shortcutConfigKey(); + if (propertyName == QLatin1String("accessibleName") + || propertyName == QLatin1String("accessibleDescription")) { + return accessibilityConfigKey(); + } + return QString(); +} + void WriteInitialization::writeProperties(const QString &varName, const QString &className, const DomPropertyList &lst, @@ -1172,11 +1176,12 @@ void WriteInitialization::writeProperties(const QString &varName, << p->elementNumber() << ");\n"; continue; } + static const QStringList currentIndexWidgets = { + QLatin1String("QComboBox"), QLatin1String("QStackedWidget"), + QLatin1String("QTabWidget"), QLatin1String("QToolBox") + }; if (propertyName == QLatin1String("currentIndex") // set currentIndex later - && (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QComboBox")) - || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStackedWidget")) - || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTabWidget")) - || m_uic->customWidgetsInfo()->extends(className, QLatin1String("QToolBox")))) { + && (m_uic->customWidgetsInfo()->extendsOneOf(className, currentIndexWidgets))) { m_delayedOut << m_indent << varName << "->setCurrentIndex(" << p->elementNumber() << ");\n"; continue; @@ -1461,29 +1466,19 @@ void WriteInitialization::writeProperties(const QString &varName, break; } - if (propertyValue.size()) { - const char* defineC = 0; - if (propertyName == QLatin1String("toolTip")) - defineC = toolTipDefineC; - else if (propertyName == QLatin1String("whatsThis")) - defineC = whatsThisDefineC; - else if (propertyName == QLatin1String("statusTip")) - defineC = statusTipDefineC; - else if (propertyName == QLatin1String("shortcut")) - defineC = shortcutDefineC; - else if (propertyName == QLatin1String("accessibleName") || propertyName == QLatin1String("accessibleDescription")) - defineC = accessibilityDefineC; + if (!propertyValue.isEmpty()) { + const QString configKey = configKeyForProperty(propertyName); QTextStream &o = delayProperty ? m_delayedOut : autoTrOutput(p); - if (defineC) - openIfndef(o, QLatin1String(defineC)); + if (!configKey.isEmpty()) + o << language::openQtConfig(configKey); o << m_indent << varNewName << setFunction << propertyValue; if (!stdset) o << ')'; o << ");\n"; - if (defineC) - closeIfndef(o, QLatin1String(defineC)); + if (!configKey.isEmpty()) + o << language::closeQtConfig(configKey); if (varName == m_mainFormVarName && &o == &m_refreshOut) { // this is the only place (currently) where we output mainForm name to the retranslateUi(). @@ -1493,11 +1488,9 @@ void WriteInitialization::writeProperties(const QString &varName, } } if (leftMargin != -1 || topMargin != -1 || rightMargin != -1 || bottomMargin != -1) { - m_output << m_indent << varName << QLatin1String("->setContentsMargins(") - << leftMargin << QLatin1String(", ") - << topMargin << QLatin1String(", ") - << rightMargin << QLatin1String(", ") - << bottomMargin << QLatin1String(");\n"); + m_output << m_indent << varName << "->setContentsMargins(" + << leftMargin << ", " << topMargin << ", " + << rightMargin << ", " << bottomMargin << ");\n"; } } @@ -1519,8 +1512,8 @@ QString WriteInitialization::writeSizePolicy(const DomSizePolicy *sp) m_output << m_indent << "QSizePolicy " << spName; do { if (sp->hasElementHSizeType() && sp->hasElementVSizeType()) { - m_output << "(static_cast<QSizePolicy::Policy>(" << sp->elementHSizeType() - << "), static_cast<QSizePolicy::Policy>(" << sp->elementVSizeType() << "));\n"; + m_output << "(QSizePolicy::" << language::sizePolicy(sp->elementHSizeType()) + << ", QSizePolicy::" << language::sizePolicy(sp->elementVSizeType()) << ");\n"; break; } if (sp->hasAttributeHSizeType() && sp->hasAttributeVSizeType()) { @@ -1784,7 +1777,7 @@ void WriteInitialization::writeColorGroup(DomColorGroup *colorGroup, const QStri const DomColor *color = colors.at(i); m_output << m_indent << paletteName << ".setColor(" << group - << ", " << "static_cast<QPalette::ColorRole>(" << QString::number(i) << ')' + << ", QPalette::" << language::paletteColorRole(i) << ", " << domColor2QString(color) << ");\n"; } @@ -2059,10 +2052,15 @@ void WriteInitialization::enableSorting(DomWidget *w, const QString &varName, co void WriteInitialization::addInitializer(Item *item, const QString &name, int column, const QString &value, const QString &directive, bool translatable) const { - if (!value.isEmpty()) - item->addSetter(QLatin1String("->set") + name.at(0).toUpper() + name.midRef(1) + - QLatin1Char('(') + (column < 0 ? QString() : QString::number(column) + - QLatin1String(", ")) + value + QLatin1String(");"), directive, translatable); + if (!value.isEmpty()) { + QString setter; + QTextStream str(&setter); + str << "->set" << name.at(0).toUpper() << name.midRef(1) << '('; + if (column >= 0) + str << column << ", "; + str << value << ");"; + item->addSetter(setter, directive, translatable); + } } /*! @@ -2144,9 +2142,12 @@ void WriteInitialization::addCommonInitializers(Item *item, addQtFlagsInitializer(item, properties, QLatin1String("textAlignment"), column); addQtEnumInitializer(item, properties, QLatin1String("checkState"), column); addStringInitializer(item, properties, QLatin1String("text"), column); - addStringInitializer(item, properties, QLatin1String("toolTip"), column, QLatin1String(toolTipDefineC)); - addStringInitializer(item, properties, QLatin1String("whatsThis"), column, QLatin1String(whatsThisDefineC)); - addStringInitializer(item, properties, QLatin1String("statusTip"), column, QLatin1String(statusTipDefineC)); + addStringInitializer(item, properties, QLatin1String("toolTip"), column, + toolTipConfigKey()); + addStringInitializer(item, properties, QLatin1String("whatsThis"), column, + whatsThisConfigKey()); + addStringInitializer(item, properties, QLatin1String("statusTip"), column, + statusTipConfigKey()); } void WriteInitialization::initializeListWidget(DomWidget *w) @@ -2286,7 +2287,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) QString itemName = item.writeSetupUi(QString(), Item::ConstructItemAndVariable); item.writeRetranslateUi(varName + QLatin1String("->horizontalHeaderItem(") + QString::number(i) + QLatin1Char(')')); - m_output << m_indent << varName << "->setHorizontalHeaderItem(" << QString::number(i) << ", " << itemName << ");\n"; + m_output << m_indent << varName << "->setHorizontalHeaderItem(" << i << ", " << itemName << ");\n"; } } @@ -2308,7 +2309,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) QString itemName = item.writeSetupUi(QString(), Item::ConstructItemAndVariable); item.writeRetranslateUi(varName + QLatin1String("->verticalHeaderItem(") + QString::number(i) + QLatin1Char(')')); - m_output << m_indent << varName << "->setVerticalHeaderItem(" << QString::number(i) << ", " << itemName << ");\n"; + m_output << m_indent << varName << "->setVerticalHeaderItem(" << i << ", " << itemName << ");\n"; } } @@ -2329,7 +2330,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) QString itemName = item.writeSetupUi(QString(), Item::ConstructItemAndVariable); item.writeRetranslateUi(varName + QLatin1String("->item(") + QString::number(r) + QLatin1String(", ") + QString::number(c) + QLatin1Char(')')); - m_output << m_indent << varName << "->setItem(" << QString::number(r) << ", " << QString::number(c) << ", " << itemName << ");\n"; + m_output << m_indent << varName << "->setItem(" << r << ", " << c << ", " << itemName << ");\n"; } } enableSorting(w, varName, tempName); @@ -2348,7 +2349,7 @@ QString WriteInitialization::trCall(const QString &str, const QString &commentHi if (idBasedTranslations || m_option.idBased) { result += QLatin1String("qtTrId("); } else { - result += QLatin1String("QApplication::translate(\"") + result += QLatin1String("QCoreApplication::translate(\"") + m_generatedClass + QLatin1String("\", "); } @@ -2427,19 +2428,13 @@ QTextStream &WriteInitialization::autoTrOutput(const DomString *str, const QStri return m_output; } -bool WriteInitialization::isValidObject(const QString &name) const -{ - return m_registeredWidgets.contains(name) - || m_registeredActions.contains(name); -} - QString WriteInitialization::findDeclaration(const QString &name) { const QString normalized = Driver::normalizedName(name); - if (DomWidget *widget = m_driver->widgetByName(normalized)) + if (const DomWidget *widget = m_driver->widgetByName(normalized)) return m_driver->findOrInsertWidget(widget); - if (DomAction *action = m_driver->actionByName(normalized)) + if (const DomAction *action = m_driver->actionByName(normalized)) return m_driver->findOrInsertAction(action); if (const DomButtonGroup *group = m_driver->findButtonGroup(normalized)) return m_driver->findOrInsertButtonGroup(group); @@ -2465,25 +2460,13 @@ void WriteInitialization::acceptConnection(DomConnection *connection) << ");\n"; } -DomWidget *WriteInitialization::findWidget(QLatin1String widgetClass) -{ - for (int i = m_widgetChain.count() - 1; i >= 0; --i) { - DomWidget *widget = m_widgetChain.at(i); - - if (widget && m_uic->customWidgetsInfo()->extends(widget->attributeClass(), widgetClass)) - return widget; - } - - return 0; -} - static void generateMultiDirectiveBegin(QTextStream &outputStream, const QSet<QString> &directives) { if (directives.isEmpty()) return; if (directives.size() == 1) { - outputStream << "#ifndef " << *directives.cbegin() << endl; + outputStream << language::openQtConfig(*directives.cbegin()); return; } @@ -2491,7 +2474,10 @@ static void generateMultiDirectiveBegin(QTextStream &outputStream, const QSet<QS // sort (always generate in the same order): std::sort(list.begin(), list.end()); - outputStream << "#if !defined(" << list.join(QLatin1String(") || !defined(")) << ')' << endl; + outputStream << "#if " << language::qtConfig(list.constFirst()); + for (int i = 1, size = list.size(); i < size; ++i) + outputStream << " || " << language::qtConfig(list.at(i)); + outputStream << endl; } static void generateMultiDirectiveEnd(QTextStream &outputStream, const QSet<QString> &directives) @@ -2548,9 +2534,11 @@ QString WriteInitialization::Item::writeSetupUi(const QString &parent, Item::Emp QMultiMap<QString, QString>::ConstIterator it = m_setupUiData.setters.constBegin(); while (it != m_setupUiData.setters.constEnd()) { - openIfndef(m_setupUiStream, it.key()); + if (!it.key().isEmpty()) + m_setupUiStream << language::openQtConfig(it.key()); m_setupUiStream << m_indent << uniqueName << it.value() << endl; - closeIfndef(m_setupUiStream, it.key()); + if (!it.key().isEmpty()) + m_setupUiStream << language::closeQtConfig(it.key()); ++it; } for (Item *child : qAsConst(m_children)) @@ -2577,14 +2565,17 @@ void WriteInitialization::Item::writeRetranslateUi(const QString &parentPath) while (it != m_retranslateUiData.setters.constEnd()) { const QString newDirective = it.key(); if (oldDirective != newDirective) { - closeIfndef(m_retranslateUiStream, oldDirective); - openIfndef(m_retranslateUiStream, newDirective); + if (!oldDirective.isEmpty()) + m_retranslateUiStream << language::closeQtConfig(oldDirective); + if (!newDirective.isEmpty()) + m_retranslateUiStream << language::openQtConfig(newDirective); oldDirective = newDirective; } m_retranslateUiStream << m_indent << uniqueName << it.value() << endl; ++it; } - closeIfndef(m_retranslateUiStream, oldDirective); + if (!oldDirective.isEmpty()) + m_retranslateUiStream << language::closeQtConfig(oldDirective); for (int i = 0; i < m_children.size(); i++) m_children[i]->writeRetranslateUi(uniqueName + QLatin1String("->child(") + QString::number(i) + QLatin1Char(')')); diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index cce83bd677..c408c44b40 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -174,8 +174,6 @@ private: void writeRetranslateUi(const QString &parentPath); void addSetter(const QString &setter, const QString &directive = QString(), bool translatable = false); // don't call it if you already added *this as a child of another Item void addChild(Item *child); // all setters should already been added - int setupUiCount() const { return m_setupUiData.setters.count(); } - int retranslateUiCount() const { return m_retranslateUiData.setters.count(); } private: struct ItemData { @@ -223,9 +221,6 @@ private: void enableSorting(DomWidget *w, const QString &varName, const QString &tempName); QString findDeclaration(const QString &name); - DomWidget *findWidget(QLatin1String widgetClass); - - bool isValidObject(const QString &name) const; private: QString writeFontProperties(const DomFont *f); diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp index 0ac0c2b6a3..d6a409152b 100644 --- a/src/tools/uic/customwidgetsinfo.cpp +++ b/src/tools/uic/customwidgetsinfo.cpp @@ -31,6 +31,8 @@ #include "ui4.h" #include "utils.h" +#include <utility> + QT_BEGIN_NAMESPACE CustomWidgetsInfo::CustomWidgetsInfo() = default; @@ -73,6 +75,24 @@ bool CustomWidgetsInfo::extends(const QString &classNameIn, QLatin1String baseCl return false; } +bool CustomWidgetsInfo::extendsOneOf(const QString &classNameIn, + const QStringList &baseClassNames) const +{ + if (baseClassNames.contains(classNameIn)) + return true; + + QString className = classNameIn; + while (const DomCustomWidget *c = customWidget(className)) { + const QString extends = c->elementExtends(); + if (className == extends) // Faulty legacy custom widget entries exist. + return false; + if (baseClassNames.contains(extends)) + return true; + className = extends; + } + return false; +} + bool CustomWidgetsInfo::isCustomWidgetContainer(const QString &className) const { if (const DomCustomWidget *dcw = m_customWidgets.value(className, 0)) @@ -96,5 +116,24 @@ QString CustomWidgetsInfo::customWidgetAddPageMethod(const QString &name) const return QString(); } +// add page methods for simple containers taking only the widget parameter +QString CustomWidgetsInfo::simpleContainerAddPageMethod(const QString &name) const +{ + using AddPageMethod = std::pair<const char *, const char *>; + + static AddPageMethod addPageMethods[] = { + {"QStackedWidget", "addWidget"}, + {"QToolBar", "addWidget"}, + {"QDockWidget", "setWidget"}, + {"QScrollArea", "setWidget"}, + {"QSplitter", "addWidget"}, + {"QMdiArea", "addSubWindow"} + }; + for (const auto &m : addPageMethods) { + if (extends(name, QLatin1String(m.first))) + return QLatin1String(m.second); + } + return QString(); +} QT_END_NAMESPACE diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h index 944ed59215..8a10999027 100644 --- a/src/tools/uic/customwidgetsinfo.h +++ b/src/tools/uic/customwidgetsinfo.h @@ -48,20 +48,16 @@ public: void acceptCustomWidgets(DomCustomWidgets *node) override; void acceptCustomWidget(DomCustomWidget *node) override; - inline QStringList customWidgets() const - { return m_customWidgets.keys(); } - - inline bool hasCustomWidget(const QString &name) const - { return m_customWidgets.contains(name); } - inline DomCustomWidget *customWidget(const QString &name) const { return m_customWidgets.value(name); } QString customWidgetAddPageMethod(const QString &name) const; + QString simpleContainerAddPageMethod(const QString &name) const; QString realClassName(const QString &className) const; bool extends(const QString &className, QLatin1String baseClassName) const; + bool extendsOneOf(const QString &className, const QStringList &baseClassNames) const; bool isCustomWidgetContainer(const QString &className) const; diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h index bebf139c5a..4015e39dbc 100644 --- a/src/tools/uic/databaseinfo.h +++ b/src/tools/uic/databaseinfo.h @@ -48,12 +48,6 @@ public: inline QStringList connections() const { return m_connections; } - inline QStringList cursors(const QString &connection) const - { return m_cursors.value(connection); } - - inline QStringList fields(const QString &connection) const - { return m_fields.value(connection); } - private: QStringList m_connections; QMap<QString, QStringList> m_cursors; diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index 91a48815fd..03fa1e17cf 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -33,6 +33,8 @@ #include <qfileinfo.h> #include <qdebug.h> +#include <algorithm> + QT_BEGIN_NAMESPACE Driver::Driver() @@ -43,39 +45,37 @@ Driver::Driver() Driver::~Driver() = default; -QString Driver::findOrInsertWidget(DomWidget *ui_widget) -{ - if (!m_widgets.contains(ui_widget)) - m_widgets.insert(ui_widget, unique(ui_widget->attributeName(), ui_widget->attributeClass())); +static inline QString spacerItemClass() { return QStringLiteral("QSpacerItem"); } +static inline QString actionGroupClass() { return QStringLiteral("QActionGroup"); } +static inline QString actionClass() { return QStringLiteral("QAction"); } +static inline QString buttonGroupClass() { return QStringLiteral("QButtonGroup"); } - return m_widgets.value(ui_widget); +template <class DomClass> +QString Driver::findOrInsert(DomObjectHash<DomClass> *domHash, const DomClass *dom, + const QString &className) +{ + auto it = domHash->find(dom); + if (it == domHash->end()) + it = domHash->insert(dom, this->unique(dom->attributeName(), className)); + return it.value(); } -QString Driver::findOrInsertSpacer(DomSpacer *ui_spacer) +QString Driver::findOrInsertWidget(const DomWidget *ui_widget) { - if (!m_spacers.contains(ui_spacer)) { - QString name; - if (ui_spacer->hasAttributeName()) - name = ui_spacer->attributeName(); - m_spacers.insert(ui_spacer, unique(name, QLatin1String("QSpacerItem"))); - } - - return m_spacers.value(ui_spacer); + return findOrInsert(&m_widgets, ui_widget, ui_widget->attributeClass()); } -QString Driver::findOrInsertLayout(DomLayout *ui_layout) +QString Driver::findOrInsertSpacer(const DomSpacer *ui_spacer) { - if (!m_layouts.contains(ui_layout)) { - QString name; - if (ui_layout->hasAttributeName()) - name = ui_layout->attributeName(); - m_layouts.insert(ui_layout, unique(name, ui_layout->attributeClass())); - } + return findOrInsert(&m_spacers, ui_spacer, spacerItemClass()); +} - return m_layouts.value(ui_layout); +QString Driver::findOrInsertLayout(const DomLayout *ui_layout) +{ + return findOrInsert(&m_layouts, ui_layout, ui_layout->attributeClass()); } -QString Driver::findOrInsertLayoutItem(DomLayoutItem *ui_layoutItem) +QString Driver::findOrInsertLayoutItem(const DomLayoutItem *ui_layoutItem) { switch (ui_layoutItem->kind()) { case DomLayoutItem::Widget: @@ -93,38 +93,29 @@ QString Driver::findOrInsertLayoutItem(DomLayoutItem *ui_layoutItem) return QString(); } -QString Driver::findOrInsertActionGroup(DomActionGroup *ui_group) +QString Driver::findOrInsertActionGroup(const DomActionGroup *ui_group) { - if (!m_actionGroups.contains(ui_group)) - m_actionGroups.insert(ui_group, unique(ui_group->attributeName(), QLatin1String("QActionGroup"))); - - return m_actionGroups.value(ui_group); + return findOrInsert(&m_actionGroups, ui_group, actionGroupClass()); } -QString Driver::findOrInsertAction(DomAction *ui_action) +QString Driver::findOrInsertAction(const DomAction *ui_action) { - if (!m_actions.contains(ui_action)) - m_actions.insert(ui_action, unique(ui_action->attributeName(), QLatin1String("QAction"))); - - return m_actions.value(ui_action); + return findOrInsert(&m_actions, ui_action, actionClass()); } QString Driver::findOrInsertButtonGroup(const DomButtonGroup *ui_group) { - ButtonGroupNameHash::iterator it = m_buttonGroups.find(ui_group); - if (it == m_buttonGroups.end()) - it = m_buttonGroups.insert(ui_group, unique(ui_group->attributeName(), QLatin1String("QButtonGroup"))); - return it.value(); + return findOrInsert(&m_buttonGroups, ui_group, buttonGroupClass()); } // Find a group by its non-uniqified name const DomButtonGroup *Driver::findButtonGroup(const QString &attributeName) const { - const ButtonGroupNameHash::const_iterator cend = m_buttonGroups.constEnd(); - for (ButtonGroupNameHash::const_iterator it = m_buttonGroups.constBegin(); it != cend; ++it) + for (auto it = m_buttonGroups.cbegin(), end = m_buttonGroups.cend(); it != end; ++it) { if (it.key()->attributeName() == attributeName) return it.key(); - return 0; + } + return nullptr; } @@ -136,11 +127,9 @@ QString Driver::findOrInsertName(const QString &name) QString Driver::normalizedName(const QString &name) { QString result = name; - QChar *data = result.data(); - for (int i = name.size(); --i >= 0; ++data) { - if (!data->isLetterOrNumber()) - *data = QLatin1Char('_'); - } + std::replace_if(result.begin(), result.end(), + [] (QChar c) { return !c.isLetterOrNumber(); }, + QLatin1Char('_')); return result; } @@ -149,23 +138,21 @@ QString Driver::unique(const QString &instanceName, const QString &className) QString name; bool alreadyUsed = false; - if (instanceName.size()) { - int id = 1; - name = instanceName; - name = normalizedName(name); + if (!instanceName.isEmpty()) { + name = normalizedName(instanceName); QString base = name; - while (m_nameRepository.contains(name)) { + for (int id = 1; m_nameRepository.contains(name); ++id) { alreadyUsed = true; - name = base + QString::number(id++); + name = base + QString::number(id); } - } else if (className.size()) { + } else if (!className.isEmpty()) { name = unique(qtify(className)); } else { name = unique(QLatin1String("var")); } - if (alreadyUsed && className.size()) { + if (alreadyUsed && !className.isEmpty()) { fprintf(stderr, "%s: Warning: The name '%s' (%s) is already in use, defaulting to '%s'.\n", qPrintable(m_option.messagePrefix()), qPrintable(instanceName), qPrintable(className), @@ -181,17 +168,10 @@ QString Driver::qtify(const QString &name) QString qname = name; if (qname.at(0) == QLatin1Char('Q') || qname.at(0) == QLatin1Char('K')) - qname = qname.mid(1); + qname.remove(0, 1); - int i=0; - while (i < qname.length()) { - if (qname.at(i).toLower() != qname.at(i)) - qname[i] = qname.at(i).toLower(); - else - break; - - ++i; - } + for (int i = 0, size = qname.size(); i < size && qname.at(i).isUpper(); ++i) + qname[i] = qname.at(i).toLower(); return qname; } @@ -306,56 +286,17 @@ bool Driver::uic(const QString &fileName, QTextStream *out) return rtn; } -void Driver::reset() -{ - Q_ASSERT( m_output == 0 ); - - m_option = Option(); - m_output = 0; - m_problems.clear(); - - QStringList m_problems; - - m_widgets.clear(); - m_spacers.clear(); - m_layouts.clear(); - m_actionGroups.clear(); - m_actions.clear(); - m_nameRepository.clear(); - m_pixmaps.clear(); -} - -void Driver::insertPixmap(const QString &pixmap) -{ - m_pixmaps.insert(pixmap, true); -} - -bool Driver::containsPixmap(const QString &pixmap) const -{ - return m_pixmaps.contains(pixmap); -} - -DomWidget *Driver::widgetByName(const QString &name) const +const DomWidget *Driver::widgetByName(const QString &name) const { return m_widgets.key(name); } -DomSpacer *Driver::spacerByName(const QString &name) const -{ - return m_spacers.key(name); -} - -DomLayout *Driver::layoutByName(const QString &name) const -{ - return m_layouts.key(name); -} - -DomActionGroup *Driver::actionGroupByName(const QString &name) const +const DomActionGroup *Driver::actionGroupByName(const QString &name) const { return m_actionGroups.key(name); } -DomAction *Driver::actionByName(const QString &name) const +const DomAction *Driver::actionByName(const QString &name) const { return m_actions.key(name); } diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h index 1563bdbd83..1303d0bf8a 100644 --- a/src/tools/uic/driver.h +++ b/src/tools/uic/driver.h @@ -49,7 +49,7 @@ class DomButtonGroup; class Driver { - Q_DISABLE_COPY(Driver) + Q_DISABLE_COPY_MOVE(Driver) public: Driver(); virtual ~Driver(); @@ -63,13 +63,6 @@ public: inline QTextStream &output() const { return *m_output; } inline Option &option() { return m_option; } - // initialization - void reset(); - - // error - inline QStringList problems() { return m_problems; } - inline void addProblem(const QString &problem) { m_problems.append(problem); } - // utils static QString headerFileName(const QString &fileName); QString headerFileName() const; @@ -80,50 +73,42 @@ public: const QString &className=QString()); // symbol table - QString findOrInsertWidget(DomWidget *ui_widget); - QString findOrInsertSpacer(DomSpacer *ui_spacer); - QString findOrInsertLayout(DomLayout *ui_layout); - QString findOrInsertLayoutItem(DomLayoutItem *ui_layoutItem); + QString findOrInsertWidget(const DomWidget *ui_widget); + QString findOrInsertSpacer(const DomSpacer *ui_spacer); + QString findOrInsertLayout(const DomLayout *ui_layout); + QString findOrInsertLayoutItem(const DomLayoutItem *ui_layoutItem); QString findOrInsertName(const QString &name); - QString findOrInsertActionGroup(DomActionGroup *ui_group); - QString findOrInsertAction(DomAction *ui_action); + QString findOrInsertActionGroup(const DomActionGroup *ui_group); + QString findOrInsertAction(const DomAction *ui_action); QString findOrInsertButtonGroup(const DomButtonGroup *ui_group); // Find a group by its non-uniqified name const DomButtonGroup *findButtonGroup(const QString &attributeName) const; - inline bool hasName(const QString &name) const - { return m_nameRepository.contains(name); } - - DomWidget *widgetByName(const QString &name) const; - DomSpacer *spacerByName(const QString &name) const; - DomLayout *layoutByName(const QString &name) const; - DomActionGroup *actionGroupByName(const QString &name) const; - DomAction *actionByName(const QString &name) const; - - // pixmap - void insertPixmap(const QString &pixmap); - bool containsPixmap(const QString &pixmap) const; + const DomWidget *widgetByName(const QString &name) const; + const DomActionGroup *actionGroupByName(const QString &name) const; + const DomAction *actionByName(const QString &name) const; bool useIdBasedTranslations() const { return m_idBasedTranslations; } void setUseIdBasedTranslations(bool u) { m_idBasedTranslations = u; } private: + template <class DomClass> using DomObjectHash = QHash<const DomClass *, QString>; + + template <class DomClass> + QString findOrInsert(DomObjectHash<DomClass> *domHash, const DomClass *dom, const QString &className); + Option m_option; QTextStream m_stdout; QTextStream *m_output; - QStringList m_problems; - // symbol tables - QHash<DomWidget*, QString> m_widgets; - QHash<DomSpacer*, QString> m_spacers; - QHash<DomLayout*, QString> m_layouts; - QHash<DomActionGroup*, QString> m_actionGroups; - typedef QHash<const DomButtonGroup*, QString> ButtonGroupNameHash; - ButtonGroupNameHash m_buttonGroups; - QHash<DomAction*, QString> m_actions; + DomObjectHash<DomWidget> m_widgets; + DomObjectHash<DomSpacer> m_spacers; + DomObjectHash<DomLayout> m_layouts; + DomObjectHash<DomActionGroup> m_actionGroups; + DomObjectHash<DomButtonGroup> m_buttonGroups; + DomObjectHash<DomAction> m_actions; QHash<QString, bool> m_nameRepository; - QHash<QString, bool> m_pixmaps; bool m_idBasedTranslations = false; }; diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp index 41bd62bbf4..0516b854ff 100644 --- a/src/tools/uic/main.cpp +++ b/src/tools/uic/main.cpp @@ -131,7 +131,7 @@ int runUic(int argc, char *argv[]) QTextStream *out = 0; QFile f; - if (driver.option().outputFile.size()) { + if (!driver.option().outputFile.isEmpty()) { f.setFileName(driver.option().outputFile); if (!f.open(QIODevice::WriteOnly | QFile::Text)) { fprintf(stderr, "Could not create output file\n"); diff --git a/src/tools/uic/shared/language.cpp b/src/tools/uic/shared/language.cpp new file mode 100644 index 0000000000..730e1562bc --- /dev/null +++ b/src/tools/uic/shared/language.cpp @@ -0,0 +1,144 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "language.h" + +#include <QtCore/qtextstream.h> + +namespace language { + +QTextStream &operator<<(QTextStream &str, const qtConfig &c) +{ + str << "QT_CONFIG(" << c.parameter() << ')'; + return str; +} + +QTextStream &operator<<(QTextStream &str, const openQtConfig &c) +{ + str << "#if " << qtConfig(c.parameter()) << '\n'; + return str; +} + +QTextStream &operator<<(QTextStream &str, const closeQtConfig &c) +{ + str << "#endif // " << qtConfig(c.parameter()) << '\n'; + return str; +} + +struct EnumLookup +{ + int value; + const char *valueString; +}; + +template <int N> +const char *lookupEnum(const EnumLookup(&array)[N], int value, int defaultIndex = 0) +{ + for (int i = 0; i < N; ++i) { + if (value == array[i].value) + return array[i].valueString; + } + const char *defaultValue = array[defaultIndex].valueString; + qWarning("uic: Warning: Invalid enumeration value %d, defaulting to %s", + value, defaultValue); + return defaultValue; +} + +const char *toolbarArea(int v) +{ + static const EnumLookup toolBarAreas[] = + { + {0, "NoToolBarArea"}, + {0x1, "LeftToolBarArea"}, + {0x2, "RightToolBarArea"}, + {0x4, "TopToolBarArea"}, + {0x8, "BottomToolBarArea"}, + {0xf, "AllToolBarAreas"} + }; + return lookupEnum(toolBarAreas, v); +} + +const char *sizePolicy(int v) +{ + static const EnumLookup sizePolicies[] = + { + {0, "Fixed"}, + {0x1, "Minimum"}, + {0x4, "Maximum"}, + {0x5, "Preferred"}, + {0x3, "MinimumExpanding"}, + {0x7, "Expanding"}, + {0xD, "Ignored"} + }; + return lookupEnum(sizePolicies, v, 3); +} + +const char *dockWidgetArea(int v) +{ + static const EnumLookup dockWidgetAreas[] = + { + {0, "NoDockWidgetArea"}, + {0x1, "LeftDockWidgetArea"}, + {0x2, "RightDockWidgetArea"}, + {0x4, "TopDockWidgetArea"}, + {0x8, "BottomDockWidgetArea"}, + {0xf, "AllDockWidgetAreas"} + }; + return lookupEnum(dockWidgetAreas, v); +} + +const char *paletteColorRole(int v) +{ + static const EnumLookup colorRoles[] = + { + {0, "WindowText"}, + {1, "Button"}, + {2, "Light"}, + {3, "Midlight"}, + {4, "Dark"}, + {5, "Mid"}, + {6, "Text"}, + {7, "BrightText"}, + {8, "ButtonText"}, + {9, "Base"}, + {10, "Window"}, + {11, "Shadow"}, + {12, "Highlight"}, + {13, "HighlightedText"}, + {14, "Link"}, + {15, "LinkVisited"}, + {16, "AlternateBase"}, + {17, "NoRole"}, + {18, "ToolTipBase"}, + {19, "ToolTipText"}, + {20, "PlaceholderText"}, + }; + return lookupEnum(colorRoles, v); +} + +} // namespace language diff --git a/src/tools/uic/globaldefs.h b/src/tools/uic/shared/language.h index 5ad193c29a..e7201b6529 100644 --- a/src/tools/uic/globaldefs.h +++ b/src/tools/uic/shared/language.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,16 +26,56 @@ ** ****************************************************************************/ -#ifndef GLOBALDEFS_H -#define GLOBALDEFS_H +#ifndef LANGUAGE_H +#define LANGUAGE_H -#include <qglobal.h> +#include <QtCore/qstringview.h> -QT_BEGIN_NAMESPACE +QT_FORWARD_DECLARE_CLASS(QTextStream) -enum { BOXLAYOUT_DEFAULT_MARGIN = 11 }; -enum { BOXLAYOUT_DEFAULT_SPACING = 6 }; +namespace language { -QT_END_NAMESPACE +// Base class for streamable objects with one QStringView parameter +class StringViewStreamable +{ +public: + StringViewStreamable(QStringView parameter) : m_parameter(parameter) {} -#endif // GLOBALDEFS_H + QStringView parameter() const { return m_parameter; } + +private: + QStringView m_parameter; +}; + +class qtConfig : public StringViewStreamable +{ +public: + qtConfig(QStringView name) : StringViewStreamable(name) {} +}; + +QTextStream &operator<<(QTextStream &str, const qtConfig &c); + +class openQtConfig : public StringViewStreamable +{ +public: + openQtConfig(QStringView name) : StringViewStreamable(name) {} +}; + +QTextStream &operator<<(QTextStream &str, const openQtConfig &c); + +class closeQtConfig : public StringViewStreamable +{ +public: + closeQtConfig(QStringView name) : StringViewStreamable(name) {} +}; + +QTextStream &operator<<(QTextStream &, const closeQtConfig &c); + +const char *toolbarArea(int v); +const char *sizePolicy(int v); +const char *dockWidgetArea(int v); +const char *paletteColorRole(int v); + +} // namespace language + +#endif // LANGUAGE_H diff --git a/src/tools/uic/shared/shared.pri b/src/tools/uic/shared/shared.pri new file mode 100644 index 0000000000..dce2af8bf1 --- /dev/null +++ b/src/tools/uic/shared/shared.pri @@ -0,0 +1,5 @@ +INCLUDEPATH += $$PWD + +HEADERS += $$PWD/language.h + +SOURCES += $$PWD/language.cpp diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h index 43d4633d83..7e8eda57d9 100644 --- a/src/tools/uic/treewalker.h +++ b/src/tools/uic/treewalker.h @@ -101,7 +101,6 @@ struct TreeWalker virtual void acceptTime(DomTime *time); virtual void acceptDateTime(DomDateTime *dateTime); virtual void acceptProperty(DomProperty *property); - typedef QVector<DomScript *> DomScripts; typedef QVector<DomWidget *> DomWidgets; virtual void acceptIncludes(DomIncludes *includes); virtual void acceptInclude(DomInclude *incl); diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index a5b331192f..225dc6aeb2 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -106,13 +106,13 @@ bool Uic::printDependencies() void Uic::writeCopyrightHeader(DomUI *ui) { QString comment = ui->elementComment(); - if (comment.size()) + if (!comment.isEmpty()) out << "/*\n" << comment << "\n*/\n\n"; out << "/********************************************************************************\n"; out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; out << "**\n"; - out << "** Created by: Qt User Interface Compiler version " << QLatin1String(QT_VERSION_STR) << "\n"; + out << "** Created by: Qt User Interface Compiler version " << QT_VERSION_STR << "\n"; out << "**\n"; out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; out << "********************************************************************************/\n\n"; @@ -243,55 +243,34 @@ void Uic::writeHeaderProtectionEnd() out << "#endif // " << h << "\n"; } -bool Uic::isMainWindow(const QString &className) const -{ - return customWidgetsInfo()->extends(className, QLatin1String("QMainWindow")); -} - -bool Uic::isToolBar(const QString &className) const -{ - return customWidgetsInfo()->extends(className, QLatin1String("QToolBar")); -} - bool Uic::isButton(const QString &className) const { - return customWidgetsInfo()->extends(className, QLatin1String("QRadioButton")) - || customWidgetsInfo()->extends(className, QLatin1String("QToolButton")) - || customWidgetsInfo()->extends(className, QLatin1String("QCheckBox")) - || customWidgetsInfo()->extends(className, QLatin1String("QPushButton")) - || customWidgetsInfo()->extends(className, QLatin1String("QCommandLinkButton")); + static const QStringList buttons = { + QLatin1String("QRadioButton"), QLatin1String("QToolButton"), + QLatin1String("QCheckBox"), QLatin1String("QPushButton"), + QLatin1String("QCommandLinkButton") + }; + return customWidgetsInfo()->extendsOneOf(className, buttons); } bool Uic::isContainer(const QString &className) const { - return customWidgetsInfo()->extends(className, QLatin1String("QStackedWidget")) - || customWidgetsInfo()->extends(className, QLatin1String("QToolBox")) - || customWidgetsInfo()->extends(className, QLatin1String("QTabWidget")) - || customWidgetsInfo()->extends(className, QLatin1String("QScrollArea")) - || customWidgetsInfo()->extends(className, QLatin1String("QMdiArea")) - || customWidgetsInfo()->extends(className, QLatin1String("QWizard")) - || customWidgetsInfo()->extends(className, QLatin1String("QDockWidget")); -} - -bool Uic::isCustomWidgetContainer(const QString &className) const -{ - return customWidgetsInfo()->isCustomWidgetContainer(className); -} - -bool Uic::isStatusBar(const QString &className) const -{ - return customWidgetsInfo()->extends(className, QLatin1String("QStatusBar")); -} - -bool Uic::isMenuBar(const QString &className) const -{ - return customWidgetsInfo()->extends(className, QLatin1String("QMenuBar")); + static const QStringList containers = { + QLatin1String("QStackedWidget"), QLatin1String("QToolBox"), + QLatin1String("QTabWidget"), QLatin1String("QScrollArea"), + QLatin1String("QMdiArea"), QLatin1String("QWizard"), + QLatin1String("QDockWidget") + }; + + return customWidgetsInfo()->extendsOneOf(className, containers); } bool Uic::isMenu(const QString &className) const { - return customWidgetsInfo()->extends(className, QLatin1String("QMenu")) - || customWidgetsInfo()->extends(className, QLatin1String("QPopupMenu")); + static const QStringList menus = { + QLatin1String("QMenu"), QLatin1String("QPopupMenu") + }; + return customWidgetsInfo()->extendsOneOf(className, menus); } QT_END_NAMESPACE diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h index 4c961aa0a5..af5f42c6db 100644 --- a/src/tools/uic/uic.h +++ b/src/tools/uic/uic.h @@ -53,7 +53,7 @@ struct Option; class Uic { - Q_DISABLE_COPY(Uic) + Q_DISABLE_COPY_MOVE(Uic) public: Uic(Driver *driver); ~Uic(); @@ -85,13 +85,8 @@ public: bool write(DomUI *ui); - bool isMainWindow(const QString &className) const; - bool isToolBar(const QString &className) const; - bool isStatusBar(const QString &className) const; bool isButton(const QString &className) const; bool isContainer(const QString &className) const; - bool isCustomWidgetContainer(const QString &className) const; - bool isMenuBar(const QString &className) const; bool isMenu(const QString &className) const; private: diff --git a/src/tools/uic/uic.pri b/src/tools/uic/uic.pri index 3f0bab05dd..1c9098dcf9 100644 --- a/src/tools/uic/uic.pri +++ b/src/tools/uic/uic.pri @@ -5,7 +5,6 @@ HEADERS += \ $$PWD/customwidgetsinfo.h \ $$PWD/databaseinfo.h \ $$PWD/driver.h \ - $$PWD/globaldefs.h \ $$PWD/option.h \ $$PWD/treewalker.h \ $$PWD/utils.h \ diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index 18511395d9..4469ce50e5 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -5,6 +5,7 @@ option(host_build) DEFINES += QT_UIC QT_NO_CAST_FROM_ASCII QT_NO_FOREACH include(uic.pri) +include(shared/shared.pri) include(cpp/cpp.pri) HEADERS += uic.h diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 7132bb3297..722aa3e278 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -646,7 +646,7 @@ void QColorWell::mouseMoveEvent(QMouseEvent *e) drg->setMimeData(mime); drg->setPixmap(pix); mousePressed = false; - drg->start(); + drg->exec(Qt::CopyAction); } #endif } @@ -842,8 +842,8 @@ void QColorLuminancePicker::paintEvent(QPaintEvent *) p.drawPixmap(1, coff, *pix); const QPalette &g = palette(); qDrawShadePanel(&p, r, g, true); - p.setPen(g.foreground().color()); - p.setBrush(g.foreground()); + p.setPen(g.windowText().color()); + p.setBrush(g.windowText()); QPolygon a; int y = val2y(val); a.setPoints(3, w, y, w+5, y+5, w+5, y-5); @@ -1131,7 +1131,7 @@ void QColorShowLabel::mouseMoveEvent(QMouseEvent *e) drg->setMimeData(mime); drg->setPixmap(pix); mousePressed = false; - drg->start(); + drg->exec(Qt::CopyAction); } #endif } diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index c9093095a7..efd2c2ffea 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -422,7 +422,7 @@ QDialog::~QDialog() /*! \internal This function is called by the push button \a pushButton when it - becomes the default button. If \a pushButton is 0, the dialogs + becomes the default button. If \a pushButton is \nullptr, the dialogs default default button becomes the default button. This is what a push button calls when it loses focus. */ @@ -760,6 +760,20 @@ void QDialog::setVisible(bool visible) if (!testAttribute(Qt::WA_DontShowOnScreen) && d->canBeNativeDialog() && d->setNativeDialogVisible(visible)) return; + // We should not block windows by the invisible modal dialog + // if a platform-specific dialog is implemented as an in-process + // Qt window, because in this case it will also be blocked. + const bool dontBlockWindows = testAttribute(Qt::WA_DontShowOnScreen) + && d->styleHint(QPlatformDialogHelper::DialogIsQtWindow).toBool(); + Qt::WindowModality oldModality; + bool wasModalitySet; + + if (dontBlockWindows) { + oldModality = windowModality(); + wasModalitySet = testAttribute(Qt::WA_SetWindowModality); + setWindowModality(Qt::NonModal); + } + if (visible) { if (testAttribute(Qt::WA_WState_ExplicitShowHide) && !testAttribute(Qt::WA_WState_Hidden)) return; @@ -826,6 +840,11 @@ void QDialog::setVisible(bool visible) d->eventLoop->exit(); } + if (dontBlockWindows) { + setWindowModality(oldModality); + setAttribute(Qt::WA_SetWindowModality, wasModalitySet); + } + #if QT_CONFIG(pushbutton) const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme(); if (d->mainDef && isActiveWindow() @@ -927,6 +946,7 @@ void QDialog::adjustPosition(QWidget* w) move(p); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -995,7 +1015,7 @@ void QDialog::setExtension(QWidget* extension) /*! \obsolete - Returns the dialog's extension or 0 if no extension has been + Returns the dialog's extension or \nullptr if no extension has been defined. Instead of using this functionality, we recommend that you simply call @@ -1071,7 +1091,7 @@ void QDialog::showExtension(bool showIt) #endif } } - +#endif /*! \reimp */ QSize QDialog::sizeHint() const diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index 7f267dd939..ce57ce5de7 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -69,11 +69,12 @@ public: void setVisible(bool visible) override; - void setOrientation(Qt::Orientation orientation); - Qt::Orientation orientation() const; - - void setExtension(QWidget* extension); - QWidget* extension() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED void setOrientation(Qt::Orientation orientation); + QT_DEPRECATED Qt::Orientation orientation() const; + QT_DEPRECATED void setExtension(QWidget* extension); + QT_DEPRECATED QWidget* extension() const; +#endif QSize sizeHint() const override; QSize minimumSizeHint() const override; @@ -96,7 +97,9 @@ public Q_SLOTS: virtual void accept(); virtual void reject(); - void showExtension(bool); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED void showExtension(bool); +#endif protected: QDialog(QDialogPrivate &, QWidget *parent, Qt::WindowFlags f = Qt::WindowFlags()); diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index eb3479b3e0..3e756da505 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -73,6 +73,9 @@ #elif defined(Q_OS_WIN) # include <QtCore/qt_windows.h> #endif +#if defined(Q_OS_WASM) +#include <private/qwasmlocalfileaccess_p.h> +#endif QT_BEGIN_NAMESPACE @@ -1359,6 +1362,7 @@ void QFileDialog::setNameFilter(const QString &filter) } +#if QT_DEPRECATED_SINCE(5, 13) /*! \property QFileDialog::nameFilterDetailsVisible \obsolete @@ -1380,6 +1384,7 @@ bool QFileDialog::isNameFilterDetailsVisible() const { return !testOption(HideNameFilterDetails); } +#endif /* @@ -1879,6 +1884,7 @@ bool QFileDialog::isReadOnly() const return testOption(ReadOnly); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \property QFileDialog::resolveSymlinks \obsolete @@ -1899,6 +1905,7 @@ bool QFileDialog::resolveSymlinks() const { return !testOption(DontResolveSymlinks); } +#endif /*! \property QFileDialog::confirmOverwrite @@ -2344,6 +2351,85 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent, } /*! + This is a convenience static function that will return the content of a file + selected by the user. + + This function is used to access local files on Qt for WebAssembly, where the web + sandbox places restrictions on how such access may happen. Its implementation will + make the browser display a native file dialog, where the user makes the file selection. + + It can also be used on other platforms, where it will fall back to using QFileDialog. + + The function is asynchronous and returns immediately. The \a fileOpenCompleted + callback will be called when a file has been selected and its contents has been + read into memory. + + \snippet code/src_gui_dialogs_qfiledialog.cpp 14 + \since 5.13 +*/ +void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::function<void(const QString &, const QByteArray &)> &fileOpenCompleted) +{ +#ifdef Q_OS_WASM + auto openFileImpl = std::make_shared<std::function<void(void)>>(); + QString fileName; + QByteArray fileContent; + *openFileImpl = [=]() mutable { + auto fileDialogClosed = [&](bool fileSelected) { + if (!fileSelected) { + fileOpenCompleted(fileName, fileContent); + openFileImpl.reset(); + } + }; + auto acceptFile = [&](uint64_t size, const std::string name) -> char * { + const uint64_t twoGB = 1ULL << 31; // QByteArray limit + if (size > twoGB) + return nullptr; + + fileName = QString::fromStdString(name); + fileContent.resize(size); + return fileContent.data(); + }; + auto fileContentReady = [&]() mutable { + fileOpenCompleted(fileName, fileContent); + openFileImpl.reset(); + }; + + auto qtFilterStringToWebAcceptString = [](const QString &qtString) { + // The Qt and Web name filter string formats are similar, but + // not identical. + return qtString.toStdString(); // ### TODO + }; + + QWasmLocalFileAccess::openFile(qtFilterStringToWebAcceptString(nameFilter), fileDialogClosed, acceptFile, fileContentReady); + }; + + (*openFileImpl)(); +#else + QFileDialog *dialog = new QFileDialog(); + dialog->selectNameFilter(nameFilter); + + auto fileSelected = [=](const QString &fileName) { + QByteArray fileContent; + if (!fileName.isNull()) { + QFile selectedFile(fileName); + selectedFile.open(QIODevice::ReadOnly); + fileContent = selectedFile.readAll(); + } + fileOpenCompleted(fileName, fileContent); + }; + + auto dialogClosed = [=](int code) { + Q_UNUSED(code); + delete dialog; + }; + + connect(dialog, &QFileDialog::fileSelected, fileSelected); + connect(dialog, &QFileDialog::finished, dialogClosed); + dialog->show(); +#endif +} + +/*! This is a convenience static function that will return a file name selected by the user. The file does not have to exist. @@ -3695,7 +3781,7 @@ void QFileDialogPrivate::_q_goToDirectory(const QString &path) } QDir dir(path2); if (!dir.exists()) - dir = getEnvironmentVariable(path2); + dir.setPath(getEnvironmentVariable(path2)); if (dir.exists() || path2.isEmpty() || path2 == model->myComputer().toString()) { _q_enterDirectory(index); diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index a4d289a77a..c75795fd77 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -46,6 +46,8 @@ #include <QtCore/qurl.h> #include <QtWidgets/qdialog.h> +#include <functional> + QT_REQUIRE_CONFIG(filedialog); QT_BEGIN_NAMESPACE @@ -65,11 +67,13 @@ class Q_WIDGETS_EXPORT QFileDialog : public QDialog Q_PROPERTY(FileMode fileMode READ fileMode WRITE setFileMode) Q_PROPERTY(AcceptMode acceptMode READ acceptMode WRITE setAcceptMode) Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE false) - Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks DESIGNABLE false) Q_PROPERTY(bool confirmOverwrite READ confirmOverwrite WRITE setConfirmOverwrite DESIGNABLE false) Q_PROPERTY(QString defaultSuffix READ defaultSuffix WRITE setDefaultSuffix) +#if QT_DEPRECATED_SINCE(5, 13) + Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks DESIGNABLE false) Q_PROPERTY(bool nameFilterDetailsVisible READ isNameFilterDetailsVisible WRITE setNameFilterDetailsVisible DESIGNABLE false) +#endif Q_PROPERTY(Options options READ options WRITE setOptions) Q_PROPERTY(QStringList supportedSchemes READ supportedSchemes WRITE setSupportedSchemes) @@ -117,8 +121,12 @@ public: void selectUrl(const QUrl &url); QList<QUrl> selectedUrls() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setOption(HideNameFilterDetails, !enabled) instead") void setNameFilterDetailsVisible(bool enabled); + QT_DEPRECATED_X("Use !testOption(HideNameFilterDetails) instead") bool isNameFilterDetailsVisible() const; +#endif void setNameFilter(const QString &filter); void setNameFilters(const QStringList &filters); @@ -148,8 +156,12 @@ public: void setReadOnly(bool enabled); bool isReadOnly() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setOption(DontResolveSymlinks, !enabled) instead") void setResolveSymlinks(bool enabled); + QT_DEPRECATED_X("Use !testOption(DontResolveSymlinks) instead") bool resolveSymlinks() const; +#endif void setSidebarUrls(const QList<QUrl> &urls); QList<QUrl> sidebarUrls() const; @@ -263,6 +275,8 @@ public: Options options = Options(), const QStringList &supportedSchemes = QStringList()); + static void getOpenFileContent(const QString &nameFilter, + const std::function<void(const QString &, const QByteArray &)> &fileContentsReady); protected: QFileDialog(const QFileDialogArgs &args); diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 2e49696b77..96d0c1190e 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -290,7 +290,7 @@ private: virtual void helperPrepareShow(QPlatformDialogHelper *) override; virtual void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override; - Q_DISABLE_COPY(QFileDialogPrivate) + Q_DISABLE_COPY_MOVE(QFileDialogPrivate) }; class QFileDialogLineEdit : public QLineEdit diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index 477c6bd540..2b81180ecb 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -534,7 +534,7 @@ void QFontDialogPrivate::updateFamilies() //and try some fall backs match_t type = MATCH_NONE; - if (bestFamilyType <= MATCH_NONE && familyName2 == f.lastResortFamily()) + if (bestFamilyType <= MATCH_NONE && familyName2 == QStringLiteral("helvetica")) type = MATCH_LAST_RESORT; if (bestFamilyType <= MATCH_LAST_RESORT && familyName2 == f.family()) type = MATCH_APP; diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index ac1952a642..c9818624fb 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -834,7 +834,7 @@ QMessageBox::QMessageBox(QWidget *parent) The message box is an \l{Qt::ApplicationModal} {application modal} dialog box. - On \macos, if \a parent is not 0 and you want your message box + On \macos, if \a parent is not \nullptr and you want your message box to appear as a Qt::Sheet of that parent, set the message box's \l{setWindowModality()} {window modality} to Qt::WindowModal (default). Otherwise, the message box will be a standard dialog. @@ -983,7 +983,7 @@ QMessageBox::StandardButton QMessageBox::standardButton(QAbstractButton *button) \since 4.2 Returns a pointer corresponding to the standard button \a which, - or 0 if the standard button doesn't exist in this message box. + or \nullptr if the standard button doesn't exist in this message box. \sa standardButtons, standardButton() */ @@ -1106,7 +1106,7 @@ void QMessageBoxPrivate::detectEscapeButton() \since 4.2 Returns the button that was clicked by the user, - or 0 if the user hit the \uicontrol Esc key and + or \nullptr if the user hit the \uicontrol Esc key and no \l{setEscapeButton()}{escape button} was set. If exec() hasn't been called yet, returns nullptr. @@ -1173,7 +1173,7 @@ void QMessageBox::setDefaultButton(QMessageBox::StandardButton button) /*! \since 5.2 Sets the checkbox \a cb on the message dialog. The message box takes ownership of the checkbox. - The argument \a cb can be 0 to remove an existing checkbox from the message box. + The argument \a cb can be \nullptr to remove an existing checkbox from the message box. \sa checkBox() */ @@ -1205,7 +1205,7 @@ void QMessageBox::setCheckBox(QCheckBox *cb) /*! \since 5.2 - Returns the checkbox shown on the dialog. This is 0 if no checkbox is set. + Returns the checkbox shown on the dialog. This is \nullptr if no checkbox is set. \sa setCheckBox() */ @@ -1570,7 +1570,7 @@ QList<QAbstractButton *> QMessageBox::buttons() const \since 4.5 Returns the button role for the specified \a button. This function returns - \l InvalidRole if \a button is 0 or has not been added to the message box. + \l InvalidRole if \a button is \nullptr or has not been added to the message box. \sa buttons(), addButton() */ @@ -1835,7 +1835,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te /*! Displays a simple message box about Qt, with the given \a title - and centered over \a parent (if \a parent is not 0). The message + and centered over \a parent (if \a parent is not \nullptr). The message includes the version number of Qt being used by the application. This is useful for inclusion in the \uicontrol Help menu of an application, diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 4b993a9e65..0a2edb1eee 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -284,9 +284,9 @@ public: Q_SIGNALS: void buttonClicked(QAbstractButton *button); -#ifdef Q_QDOC +#ifdef Q_CLANG_QDOC public Q_SLOTS: - int exec(); + int exec() override; #endif protected: diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp index e1fb1055ae..078dd6463b 100644 --- a/src/widgets/dialogs/qprogressdialog.cpp +++ b/src/widgets/dialogs/qprogressdialog.cpp @@ -47,7 +47,6 @@ #include "qapplication.h" #include "qstyle.h" #include "qpushbutton.h" -#include "qcursor.h" #include "qtimer.h" #include "qelapsedtimer.h" #include <private/qdialog_p.h> @@ -94,9 +93,6 @@ public: bool cancellation_flag; bool setValue_called; QElapsedTimer starttime; -#ifndef QT_NO_CURSOR - QCursor parentCursor; -#endif int showTime; bool autoClose; bool autoReset; @@ -597,12 +593,6 @@ void QProgressDialog::setRange(int minimum, int maximum) void QProgressDialog::reset() { Q_D(QProgressDialog); -#ifndef QT_NO_CURSOR - if (value() >= 0) { - if (parentWidget()) - parentWidget()->setCursor(d->parentCursor); - } -#endif if (d->autoClose || d->forceHide) hide(); d->bar->reset(); diff --git a/src/widgets/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp index d52f18b406..2c8c66e1e2 100644 --- a/src/widgets/dialogs/qsidebar.cpp +++ b/src/widgets/dialogs/qsidebar.cpp @@ -381,8 +381,6 @@ QSidebar::QSidebar(QWidget *parent) : QListView(parent) void QSidebar::setModelAndUrls(QFileSystemModel *model, const QList<QUrl> &newUrls) { - // ### TODO make icon size dynamic - setIconSize(QSize(24,24)); setUniformItemSizes(true); urlModel = new QUrlModel(this); urlModel->setFileSystemModel(model); diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 21e1ff2778..5eae70baf2 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -769,7 +769,7 @@ void QWizardPrivate::reset() for (int i = history.count() - 1; i >= 0; --i) q->cleanupPage(history.at(i)); history.clear(); - for (QWizardPage *page : pageMap) + for (QWizardPage *page : qAsConst(pageMap)) page->d_func()->initialized = false; current = -1; @@ -2374,8 +2374,8 @@ void QWizard::removePage(int id) /*! \fn QWizardPage *QWizard::page(int id) const - Returns the page with the given \a id, or 0 if there is no such - page. + Returns the page with the given \a id, or \nullptr if there is no + such page. \sa addPage(), setPage() */ @@ -2462,8 +2462,8 @@ int QWizard::startId() const } /*! - Returns a pointer to the current page, or 0 if there is no current - page (e.g., before the wizard is shown). + Returns a pointer to the current page, or \nullptr if there is no + current page (e.g., before the wizard is shown). This is equivalent to calling page(currentId()). @@ -2954,7 +2954,7 @@ void QWizard::setDefaultProperty(const char *className, const char *property, Passing 0 shows no side widget. - When the \a widget is not 0 the wizard reparents it. + When the \a widget is not \nullptr the wizard reparents it. Any previous side widget is hidden. @@ -2963,7 +2963,7 @@ void QWizard::setDefaultProperty(const char *className, const char *property, All widgets set here will be deleted by the wizard when it is destroyed unless you separately reparent the widget after setting - some other side widget (or 0). + some other side widget (or \nullptr). By default, no side widget is present. */ @@ -2981,7 +2981,7 @@ void QWizard::setSideWidget(QWidget *widget) /*! \since 4.7 - Returns the widget on the left side of the wizard or 0. + Returns the widget on the left side of the wizard or \nullptr. By default, no side widget is present. */ @@ -3969,7 +3969,7 @@ void QWizardPage::registerField(const QString &name, QWidget *widget, const char } /*! - Returns the wizard associated with this page, or 0 if this page + Returns the wizard associated with this page, or \nullptr if this page hasn't been inserted into a QWizard yet. \sa QWizard::addPage(), QWizard::setPage() diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index d302dedaa3..02c5e52c2c 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -84,7 +84,7 @@ class QWizard; class QVistaHelper : public QObject { - Q_DISABLE_COPY(QVistaHelper) + Q_DISABLE_COPY_MOVE(QVistaHelper) public: QVistaHelper(QWizard *wizard); ~QVistaHelper() override; diff --git a/src/widgets/doc/snippets/code/doc_src_examples_dropsite.qdoc b/src/widgets/doc/snippets/code/doc_src_examples_dropsite.qdoc deleted file mode 100644 index a91933cdce..0000000000 --- a/src/widgets/doc/snippets/code/doc_src_examples_dropsite.qdoc +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [0] -\code -foreach(variable, container) -\endcode -//! [0] diff --git a/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc index 9af04f6b4c..098eaf4717 100644 --- a/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc +++ b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc @@ -514,13 +514,15 @@ QLabel { border-width: 1px 2px 3px 4px } /* 1px 2px 3px 4px */ //! [84] -QLabel { border-color: red } /* opaque red */ -QLabel { border-color: #FF0000 } /* opaque red */ -QLabel { border-color: rgba(255, 0, 0, 75%) } /* 75% opaque red */ -QLabel { border-color: rgb(255, 0, 0) } /* opaque red */ -QLabel { border-color: rgb(100%, 0%, 0%) } /* opaque red */ -QLabel { border-color: hsv(60, 255, 255) } /* opaque yellow */ -QLabel { border-color: hsva(240, 255, 255, 75%) } /* 75% blue */ +QLabel { border-color: red } /* opaque red */ +QLabel { border-color: #FF0000 } /* opaque red */ +QLabel { border-color: rgba(255, 0, 0, 75%) } /* 75% opaque red */ +QLabel { border-color: rgb(255, 0, 0) } /* opaque red */ +QLabel { border-color: rgb(100%, 0%, 0%) } /* opaque red */ +QLabel { border-color: hsv(60, 100%, 100%) } /* opaque yellow */ +QLabel { border-color: hsva(240, 255, 255, 75%) } /* 75% blue */ +QLabel { border-color: hsl(60, 100%, 50%) } /* opaque yellow */ +QLabel { border-color: hsla(240, 255, 50%, 75%) } /* 75% blue */ //! [84] diff --git a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp index 06cca37111..1e9daf824b 100644 --- a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp +++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp @@ -144,3 +144,14 @@ dialog.exec(); //! [14] "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" //! [14] + +//! [14] +auto fileOpenCompleted = [](const QSting &fileName, const QByteArray &fileContent) { + if (fileName.isEmpty()) { + // No file was selected + } else { + // Use fileName and fileContent + } +} +QFileDialog::getOpenFileContent("Images (*.png *.xpm *.jpg)", fileContentReady); +//! [14] diff --git a/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp index 4dad563660..cc1568cb9d 100644 --- a/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp +++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp @@ -59,7 +59,7 @@ mapper->toFirst(); //! [1] -QDataWidgetMapper *mapper = new QDataWidgetMapper(); +QDataWidgetMapper *mapper = new QDataWidgetMapper; mapper->setModel(myModel); mapper->addMapping(nameLineEdit, 0); mapper->addMapping(ageSpinBox, 1); @@ -67,7 +67,7 @@ mapper->addMapping(ageSpinBox, 1); //! [2] -QDataWidgetMapper *mapper = new QDataWidgetMapper(); -connect(myTableView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), - mapper, SLOT(setCurrentModelIndex(QModelIndex))); +QDataWidgetMapper *mapper = new QDataWidgetMapper; +connect(myTableView->selectionModel(), &QItemSelectionModel::currentRowChanged, + mapper, &QDataWidgetMapper::setCurrentModelIndex); //! [2] diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp index a907a0421f..0a70c1d32a 100644 --- a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp +++ b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp @@ -100,7 +100,8 @@ QSize MyWidget::sizeHint() const //! [4] void showAllHiddenTopLevelWidgets() { - foreach (QWidget *widget, QApplication::topLevelWidgets()) { + const QWidgetList topLevelWidgets = QApplication::topLevelWidgets(); + for (QWidget *widget : topLevelWidgets) { if (widget->isHidden()) widget->show(); } @@ -111,7 +112,8 @@ void showAllHiddenTopLevelWidgets() //! [5] void updateAllWidgets() { - foreach (QWidget *widget, QApplication::allWidgets()) + const QWidgetList allWidgets = QApplication::allWidgets(); + for (QWidget *widget : allWidgets) widget->update(); } //! [5] @@ -171,13 +173,15 @@ appname -session id //! [10] -foreach (const QString &command, mySession.restartCommand()) +const QStringList commands = mySession.restartCommand(); +for (const QString &command : commands) do_something(command); //! [10] //! [11] -foreach (const QString &command, mySession.discardCommand()) +const QStringList commands = mySession.discardCommand(); +for (const QString &command : commands) do_something(command); //! [11] diff --git a/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp index 4b1c4cd645..da3fd28056 100644 --- a/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp +++ b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp @@ -81,7 +81,7 @@ exec(e->globalPos()); //! [6] QMenu menu; QAction *at = actions[0]; // Assumes actions is not empty -foreach (QAction *a, actions) +for (QAction *a : qAsConst(actions)) menu.addAction(a); menu.exec(pos, at); //! [6] diff --git a/src/widgets/doc/snippets/dialogs/dialogs.cpp b/src/widgets/doc/snippets/dialogs/dialogs.cpp index cca3ac8d75..7fa793c70f 100644 --- a/src/widgets/doc/snippets/dialogs/dialogs.cpp +++ b/src/widgets/doc/snippets/dialogs/dialogs.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> typedef QDialog WordCountDialog; typedef QDialog FindDialog; @@ -76,7 +76,8 @@ void EditorWindow::find() { if (!findDialog) { findDialog = new FindDialog(this); - connect(findDialog, SIGNAL(findNext()), this, SLOT(findNext())); + connect(findDialog, &FindDialog::findNext, + this, &EditorWindow::findNext); } findDialog->show(); @@ -249,9 +250,9 @@ Operation::Operation(QObject *parent) : QObject(parent), steps(0) { pd = new QProgressDialog("Operation in progress.", "Cancel", 0, 100); - connect(pd, SIGNAL(canceled()), this, SLOT(cancel())); + connect(pd, &QProgressDialog::canceled, this, &Operation::cancel); t = new QTimer(this); - connect(t, SIGNAL(timeout()), this, SLOT(perform())); + connect(t, &QTimer::timeout, this, &Operation::perform); t->start(0); } //! [4] //! [5] diff --git a/src/widgets/doc/snippets/dockwidgets/mainwindow.cpp b/src/widgets/doc/snippets/dockwidgets/mainwindow.cpp index f6959cc12b..53f91589bf 100644 --- a/src/widgets/doc/snippets/dockwidgets/mainwindow.cpp +++ b/src/widgets/doc/snippets/dockwidgets/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" @@ -63,8 +63,8 @@ MainWindow::MainWindow(QWidget *parent) textBrowser = new QTextBrowser(this); - connect(headingList, SIGNAL(itemClicked(QListWidgetItem*)), - this, SLOT(updateText(QListWidgetItem*))); + connect(headingList, &QListWidget::itemClicked, + this, &MainWindow::updateText); updateText(headingList->item(0)); headingList->setCurrentRow(0); @@ -119,7 +119,7 @@ void MainWindow::setupMenus() QAction *exitAct = new QAction(tr("E&xit"), this); exitAct->setShortcut(tr("Ctrl+Q")); exitAct->setStatusTip(tr("Exit the application")); - connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows())); + connect(exitAct, &QAction::triggered, qApp, &QApplication::closeAllWindows); QMenu *fileMenu = menuBar()->addMenu(tr("&File")); fileMenu->addAction(exitAct); diff --git a/src/widgets/doc/snippets/mdiareasnippets.cpp b/src/widgets/doc/snippets/mdiareasnippets.cpp index b9d6f05daf..dec7aaa1e7 100644 --- a/src/widgets/doc/snippets/mdiareasnippets.cpp +++ b/src/widgets/doc/snippets/mdiareasnippets.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> void mainWindowExample() { @@ -95,7 +95,7 @@ int main(int argv, char **args) QAction *act = new QAction(qApp); act->setShortcut(Qt::ALT + Qt::Key_S); act->setShortcutContext( Qt::ApplicationShortcut ); - QObject::connect(act, SIGNAL(triggered()), qApp, SLOT(aboutQt())); + QObject::connect(act, &QAction::triggered, qApp, &QApplication::aboutQt); QWidget widget5; widget5.show(); diff --git a/src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp b/src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp index c2af9c4cf1..45f1eb7aa3 100644 --- a/src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp +++ b/src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp @@ -73,7 +73,8 @@ listView->setDropIndicatorShown(true); this->listView = listView; - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); + connect(quitAction, &QAction::triggered, + this, &QWidget::close); setupListItems(); diff --git a/src/widgets/doc/snippets/qlistview-dnd/model.cpp b/src/widgets/doc/snippets/qlistview-dnd/model.cpp index 710bbb2964..6835479e7a 100644 --- a/src/widgets/doc/snippets/qlistview-dnd/model.cpp +++ b/src/widgets/doc/snippets/qlistview-dnd/model.cpp @@ -54,7 +54,7 @@ A simple model that uses a QStringList as its data source. */ -#include <QtGui> +#include <QtWidgets> #include "model.h" @@ -121,7 +121,7 @@ bool DragDropListModel::dropMimeData(const QMimeData *data, //! [6] insertRows(beginRow, rows, QModelIndex()); - foreach (const QString &text, newItems) { + for (const QString &text : qAsConst(newItems)) { QModelIndex idx = index(beginRow, 0, QModelIndex()); setData(idx, text); beginRow++; @@ -146,12 +146,12 @@ Qt::ItemFlags DragDropListModel::flags(const QModelIndex &index) const //! [8] QMimeData *DragDropListModel::mimeData(const QModelIndexList &indexes) const { - QMimeData *mimeData = new QMimeData(); + QMimeData *mimeData = new QMimeData; QByteArray encodedData; QDataStream stream(&encodedData, QIODevice::WriteOnly); - foreach (const QModelIndex &index, indexes) { + for (const QModelIndex &index : indexes) { if (index.isValid()) { QString text = data(index, Qt::DisplayRole).toString(); stream << text; diff --git a/src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp b/src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp index 1153250b17..70df2b112e 100644 --- a/src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp +++ b/src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" @@ -74,7 +74,7 @@ listWidget->setDragDropMode(QAbstractItemView::InternalMove); this->listWidget = listWidget; - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); + connect(quitAction, &QAction::triggered, this, &QWidget::close); setupListItems(); diff --git a/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp index ff69fd2efd..13b20bb856 100644 --- a/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp +++ b/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" @@ -77,14 +77,13 @@ MainWindow::MainWindow() listWidget = new QListWidget(this); listWidget->setSelectionMode(QAbstractItemView::SingleSelection); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending())); - connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending())); - connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem())); - connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem())); - connect(listWidget, - SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), - this, SLOT(updateMenus(QListWidgetItem*))); + connect(quitAction, &QAction::triggered, this, &QWidget::close); + connect(ascendingAction, &QAction::triggered, this, &MainWindow::sortAscending); + connect(descendingAction, &QAction::triggered, this, &MainWindow::sortDescending); + connect(insertAction, &QAction::triggered, this, &MainWindow::insertItem); + connect(removeAction, &QAction::triggered, this, &MainWindow::removeItem); + connect(listWidget, &QListWidget::currentItemChanged, + this, &MainWindow::updateMenus); setupListItems(); updateMenus(listWidget->currentItem()); diff --git a/src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp b/src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp index a6284bd578..2d4b1023f1 100644 --- a/src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp +++ b/src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> int main(int argc, char *argv[]) { @@ -74,9 +74,8 @@ int main(int argc, char *argv[]) filteredView->setWindowTitle("Filtered view onto a string list model"); QLineEdit *patternEditor = new QLineEdit; - QObject:: - connect(patternEditor, SIGNAL(textChanged(QString)), - filterModel, SLOT(setFilterRegExp(QString))); + QObject::connect(patternEditor, &QLineEdit::textChanged, + filterModel, &QSortFilterProxyModel::setFilterWildcard); QVBoxLayout *layout = new QVBoxLayout(window); layout->addWidget(filteredView); diff --git a/src/widgets/doc/snippets/qstackedlayout/main.cpp b/src/widgets/doc/snippets/qstackedlayout/main.cpp index 765608848c..9c61939dee 100644 --- a/src/widgets/doc/snippets/qstackedlayout/main.cpp +++ b/src/widgets/doc/snippets/qstackedlayout/main.cpp @@ -48,13 +48,12 @@ ** ****************************************************************************/ -#include <QtGui> -#include <QApplication> +#include <QtWidgets> class Widget : public QWidget { public: - Widget(QWidget *parent = 0); + Widget(QWidget *parent = nullptr); }; Widget::Widget(QWidget *parent) @@ -75,8 +74,8 @@ Widget::Widget(QWidget *parent) pageComboBox->addItem(tr("Page 1")); pageComboBox->addItem(tr("Page 2")); pageComboBox->addItem(tr("Page 3")); - connect(pageComboBox, SIGNAL(activated(int)), - stackedLayout, SLOT(setCurrentIndex(int))); + connect(pageComboBox, QOverload<int>::of(&QComboBox::activated), + stackedLayout, &QStackedLayout::setCurrentIndex); //! [1] //! [2] diff --git a/src/widgets/doc/snippets/qstackedwidget/main.cpp b/src/widgets/doc/snippets/qstackedwidget/main.cpp index a6c9c7afe3..077c281830 100644 --- a/src/widgets/doc/snippets/qstackedwidget/main.cpp +++ b/src/widgets/doc/snippets/qstackedwidget/main.cpp @@ -48,8 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> -#include <QApplication> +#include <QtWidgets> class Widget : public QWidget { @@ -75,8 +74,8 @@ Widget::Widget(QWidget *parent) pageComboBox->addItem(tr("Page 1")); pageComboBox->addItem(tr("Page 2")); pageComboBox->addItem(tr("Page 3")); - connect(pageComboBox, SIGNAL(activated(int)), - stackedWidget, SLOT(setCurrentIndex(int))); + connect(pageComboBox, QOverload<int>::of(&QComboBox::activated), + stackedWidget, &QStackedWidget::setCurrentIndex); //! [1] //! [2] QVBoxLayout *layout = new QVBoxLayout; diff --git a/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp b/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp index 95113153e1..d2c50336f6 100644 --- a/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp +++ b/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" @@ -72,9 +72,9 @@ MainWindow::MainWindow() //! [0] tableWidget->setSelectionMode(QAbstractItemView::ExtendedSelection); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(tableWidthAction, SIGNAL(triggered()), this, SLOT(changeWidth())); - connect(tableHeightAction, SIGNAL(triggered()), this, SLOT(changeHeight())); + connect(quitAction, &QAction::triggered, this, &QWidget::close); + connect(tableWidthAction, &QAction::triggered, this, &MainWindow::changeWidth); + connect(tableHeightAction, &QAction::triggered, this, &MainWindow::changeHeight); setupTableItems(); diff --git a/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp index 15b9457dd5..47b63b2b3f 100644 --- a/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp +++ b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp @@ -48,8 +48,8 @@ ** ****************************************************************************/ -#include <QtGui> -#include "math.h" +#include <QtWidgets> +#include <math.h> #include "mainwindow.h" @@ -89,9 +89,9 @@ MainWindow::MainWindow() tableWidget->setHorizontalHeaderItem(1, squaresHeaderItem); tableWidget->setHorizontalHeaderItem(2, cubesHeaderItem); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(sumItemsAction, SIGNAL(triggered()), this, SLOT(sumItems())); - connect(averageItemsAction, SIGNAL(triggered()), this, SLOT(averageItems())); + connect(quitAction, &QAction::triggered, this, &QWidget::close); + connect(sumItemsAction, &QAction::triggered, this, &MainWindow::sumItems); + connect(averageItemsAction, &QAction::triggered, this, &MainWindow::averageItems); setupTableItems(); @@ -119,12 +119,11 @@ void MainWindow::setupTableItems() void MainWindow::averageItems() { - QList<QTableWidgetItem *> selected = tableWidget->selectedItems(); - QTableWidgetItem *item; + const QList<QTableWidgetItem *> selected = tableWidget->selectedItems(); int number = 0; double total = 0; - foreach (item, selected) { + for (QTableWidgetItem *item : selected) { bool ok; double value = item->text().toDouble(&ok); @@ -140,12 +139,11 @@ void MainWindow::averageItems() void MainWindow::sumItems() { //! [4] - QList<QTableWidgetItem *> selected = tableWidget->selectedItems(); - QTableWidgetItem *item; + const QList<QTableWidgetItem *> selected = tableWidget->selectedItems(); int number = 0; double total = 0; - foreach (item, selected) { + for (QTableWidgetItem *item : selected) { bool ok; double value = item->text().toDouble(&ok); diff --git a/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp index ee7e028a13..b9e258cb03 100644 --- a/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp +++ b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" @@ -90,16 +90,15 @@ MainWindow::MainWindow() treeWidget->setHeaderLabels(headers); //! [2] - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending())); - connect(autoSortAction, SIGNAL(triggered()), this, SLOT(updateSortItems())); - connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending())); - connect(findItemsAction, SIGNAL(triggered()), this, SLOT(findItems())); - connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem())); - connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem())); - connect(treeWidget, - SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), - this, SLOT(updateMenus(QTreeWidgetItem*))); + connect(quitAction, &QAction::triggered, this, &QWidget::close); + connect(ascendingAction, &QAction::triggered, this, &MainWindow::sortAscending); + connect(autoSortAction, &QAction::triggered, this, &MainWindow::updateSortItems); + connect(descendingAction, &QAction::triggered, this, &MainWindow::sortDescending); + connect(findItemsAction, &QAction::triggered, this, &MainWindow::findItems); + connect(insertAction, &QAction::triggered, this, &MainWindow::insertItem); + connect(removeAction, &QAction::triggered, this, &MainWindow::removeItem); + connect(treeWidget, &QTreeWidget::currentItemChanged, + this, &MainWindow::updateMenus); setupTreeItems(); updateMenus(treeWidget->currentItem()); @@ -150,18 +149,16 @@ void MainWindow::findItems() if (itemText.isEmpty()) return; -//! [6] - QTreeWidgetItem *item; -//! [6] - foreach (item, treeWidget->selectedItems()) - treeWidget->setItemSelected(item, false); + const QList<QTreeWidgetItem *> items = treeWidget->selectedItems(); + for (QTreeWidgetItem *item : items) + item->setSelected(false); //! [7] - QList<QTreeWidgetItem *> found = treeWidget->findItems( + const QList<QTreeWidgetItem *> found = treeWidget->findItems( itemText, Qt::MatchWildcard); - foreach (item, found) { - treeWidget->setItemSelected(item, true); + for (QTreeWidgetItem *item : found) { + item->setSelected(true); // Show the item->text(0) for each item. } //! [7] diff --git a/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp b/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp index 5f1f606185..bfe099bbb4 100644 --- a/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp +++ b/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" @@ -85,16 +85,15 @@ MainWindow::MainWindow() headers << tr("Subject") << tr("Default"); treeWidget->setHeaderLabels(headers); - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - connect(ascendingAction, SIGNAL(triggered()), this, SLOT(sortAscending())); - connect(autoSortAction, SIGNAL(triggered()), this, SLOT(updateSortItems())); - connect(descendingAction, SIGNAL(triggered()), this, SLOT(sortDescending())); - connect(findItemsAction, SIGNAL(triggered()), this, SLOT(findItems())); - connect(insertAction, SIGNAL(triggered()), this, SLOT(insertItem())); - connect(removeAction, SIGNAL(triggered()), this, SLOT(removeItem())); - connect(treeWidget, - SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), - this, SLOT(updateMenus(QTreeWidgetItem*))); + connect(quitAction, &QAction::triggered, this, &QWidget::close); + connect(ascendingAction, &QAction::triggered, this, &MainWindow::sortAscending); + connect(autoSortAction, &QAction::triggered, this, &MainWindow::updateSortItems); + connect(descendingAction, &QAction::triggered, this, &MainWindow::sortDescending); + connect(findItemsAction, &QAction::triggered, this, &MainWindow::findItems); + connect(insertAction, &QAction::triggered, this, &MainWindow::insertItem); + connect(removeAction, &QAction::triggered, this, &MainWindow::removeItem); + connect(treeWidget, &QTreeWidget::currentItemChanged, + this, &MainWindow::updateMenus); setupTreeItems(); updateMenus(treeWidget->currentItem()); diff --git a/src/widgets/doc/snippets/reading-selections/window.cpp b/src/widgets/doc/snippets/reading-selections/window.cpp index 08805fe4b3..045d66a199 100644 --- a/src/widgets/doc/snippets/reading-selections/window.cpp +++ b/src/widgets/doc/snippets/reading-selections/window.cpp @@ -81,9 +81,9 @@ MainWindow::MainWindow(QWidget *parent) QAction *selectAllAction = actionMenu->addAction(tr("&Select All")); menuBar()->addMenu(actionMenu); - connect(fillAction, SIGNAL(triggered()), this, SLOT(fillSelection())); - connect(clearAction, SIGNAL(triggered()), this, SLOT(clearSelection())); - connect(selectAllAction, SIGNAL(triggered()), this, SLOT(selectAll())); + connect(fillAction, &QAction::triggered, this, &MainWindow::fillSelection); + connect(clearAction, &QAction::triggered, this, &MainWindow::clearSelection); + connect(selectAllAction, &QAction::triggered, this, &MainWindow::selectAll); selectionModel = table->selectionModel(); @@ -94,10 +94,9 @@ MainWindow::MainWindow(QWidget *parent) void MainWindow::fillSelection() { //! [0] - QModelIndexList indexes = selectionModel->selectedIndexes(); - QModelIndex index; + const QModelIndexList indexes = selectionModel->selectedIndexes(); - foreach(index, indexes) { + for (const QModelIndex &index : indexes) { QString text = QString("(%1,%2)").arg(index.row()).arg(index.column()); model->setData(index, text); } @@ -106,11 +105,10 @@ void MainWindow::fillSelection() void MainWindow::clearSelection() { - QModelIndexList indexes = selectionModel->selectedIndexes(); - QModelIndex index; + const QModelIndexList indexes = selectionModel->selectedIndexes(); - foreach(index, indexes) - model->setData(index, ""); + for (const QModelIndex &index : indexes) + model->setData(index, QString()); } void MainWindow::selectAll() diff --git a/src/widgets/doc/snippets/updating-selections/window.cpp b/src/widgets/doc/snippets/updating-selections/window.cpp index 0bdcf8a64d..26e9b56ae4 100644 --- a/src/widgets/doc/snippets/updating-selections/window.cpp +++ b/src/widgets/doc/snippets/updating-selections/window.cpp @@ -74,12 +74,10 @@ MainWindow::MainWindow(QWidget *parent) table->setModel(model); selectionModel = table->selectionModel(); - connect(selectionModel, - SIGNAL(selectionChanged(QItemSelection,QItemSelection)), - this, SLOT(updateSelection(QItemSelection,QItemSelection))); - connect(selectionModel, - SIGNAL(currentChanged(QModelIndex,QModelIndex)), - this, SLOT(changeCurrent(QModelIndex,QModelIndex))); + connect(selectionModel, &QItemSelectionModel::selectionChanged, + this, &MainWindow::updateSelection); + connect(selectionModel, &QItemSelectionModel::currentChanged, + this, &MainWindow::changeCurrent); statusBar(); setCentralWidget(table); @@ -89,10 +87,9 @@ MainWindow::MainWindow(QWidget *parent) void MainWindow::updateSelection(const QItemSelection &selected, const QItemSelection &deselected) { - QModelIndex index; QModelIndexList items = selected.indexes(); - foreach (index, items) { + for (const QModelIndex &index : qAsConst(items)) { QString text = QString("(%1,%2)").arg(index.row()).arg(index.column()); model->setData(index, text); //! [0] //! [1] @@ -102,8 +99,8 @@ void MainWindow::updateSelection(const QItemSelection &selected, //! [2] items = deselected.indexes(); - foreach (index, items) - model->setData(index, ""); + for (const QModelIndex &index : qAsConst(items)) { + model->setData(index, QString()); } //! [2] diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc index f6b7c80656..9335ff78c9 100644 --- a/src/widgets/doc/src/model-view-programming.qdoc +++ b/src/widgets/doc/src/model-view-programming.qdoc @@ -693,9 +693,9 @@ \l QAbstractItemDelegate class. Delegates are expected to be able to render their contents themselves - by implementing the \l{QItemDelegate::paint()}{paint()} - and \l{QItemDelegate::sizeHint()}{sizeHint()} functions. - However, simple widget-based delegates can subclass \l QItemDelegate + by implementing the \l{QStyledItemDelegate::paint()}{paint()} + and \l{QStyledItemDelegate::sizeHint()}{sizeHint()} functions. + However, simple widget-based delegates can subclass \l QStyledItemDelegate instead of \l QAbstractItemDelegate, and take advantage of the default implementations of these functions. @@ -709,14 +709,14 @@ \section2 Using an existing delegate - The standard views provided with Qt use instances of \l QItemDelegate + The standard views provided with Qt use instances of \l QStyledItemDelegate to provide editing facilities. This default implementation of the delegate interface renders items in the usual style for each of the standard views: \l QListView, \l QTableView, and \l QTreeView. All the standard roles are handled by the default delegate used by the standard views. The way these are interpreted is described in the - QItemDelegate documentation. + QStyledItemDelegate documentation. The delegate used by a view is returned by the \l{QAbstractItemView::itemDelegate()}{itemDelegate()} function. @@ -799,7 +799,7 @@ In this case, we ensure that the spin box is up-to-date, and update the model with the value it contains using the index specified. - The standard \l QItemDelegate class informs the view when it has + The standard \l QStyledItemDelegate class informs the view when it has finished editing by emitting the \l{QAbstractItemDelegate::closeEditor()}{closeEditor()} signal. The view ensures that the editor widget is closed and destroyed. In @@ -838,11 +838,11 @@ assist any subsequent editing operations. This is achieved by emitting the \l{QAbstractItemDelegate::closeEditor()}{closeEditor()} signal with a suitable hint. This is taken care of by the default - QItemDelegate event filter which we installed on the spin box when + QStyledItemDelegate event filter which we installed on the spin box when it was constructed. The behavior of the spin box could be adjusted to make it more user - friendly. In the default event filter supplied by QItemDelegate, if + friendly. In the default event filter supplied by QStyledItemDelegate, if the user hits \uicontrol Return to confirm their choice in the spin box, the delegate commits the value to the model and closes the spin box. We can change this behavior by installing our own event filter on the @@ -1003,8 +1003,8 @@ \snippet reading-selections/window.cpp 0 - The above code uses Qt's convenient \l{Container Classes}{foreach - keyword} to iterate over, and modify, the items corresponding to the + The above code uses a range-based for-loop to iterate over, + and modify, the items corresponding to the indexes returned by the selection model. The selection model emits signals to indicate changes in the @@ -1611,7 +1611,6 @@ We can obtain a list of matching items with the \c findItems() function: - \snippet qtreewidget-using/mainwindow.cpp 6 \snippet qtreewidget-using/mainwindow.cpp 7 The above code causes items in a tree widget to be selected if they diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc index 43f9dda49a..00323eace6 100644 --- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -2881,14 +2881,20 @@ | \tt{rgba(\e{r}, \e{g}, \e{b}, \e{a})} \br | \tt{hsv(\e{h}, \e{s}, \e{v})} \br | \tt{hsva(\e{h}, \e{s}, \e{v}, \e{a})} \br + | \tt{hsl(\e{h}, \e{s}, \e{l})} \br + | \tt{hsla(\e{h}, \e{s}, \e{l}, \e{a})} \br | \tt{#\e{rrggbb}} \br | \l{QColor::setNamedColor()}{Color Name} \br - \li Specifies a color as RGB (red, green, blue) or RGBA - (red, green, blue, alpha) or HSV (hue, saturation, value) or HSVA - (hue, saturation, value, alpha) or a named color. The \c rgb() or \c rgba() - syntax can be used with integer values between 0 and 255, or with - percentages. The value of s, v, and a in \c hsv() or \c hsva() must all - be in the range 0-255; the value of h must be in the range 0-359. + \li Specifies a color as RGB (red, green, blue), RGBA (red, + green, blue, alpha), HSV (hue, saturation, value), HSVA + (hue, saturation, value, alpha), HSL (hue, saturation, + lightness), HSLA (hue, saturation, lightness, alpha) or a + named color. The \c rgb() or \c rgba() syntax can be used + with integer values between 0 and 255, or with percentages. + The value of s, v, l and a in \c hsv(), \c hsva() \c hsl() + or \c hsla() must all be in the range 0-255 or with + percentages, the value of h must be in the range 0-359. + The support for HSL(A) is available since 5.13. Examples: diff --git a/src/widgets/effects/qgraphicseffect_p.h b/src/widgets/effects/qgraphicseffect_p.h index c5c7ff5900..2f3bd2f7fd 100644 --- a/src/widgets/effects/qgraphicseffect_p.h +++ b/src/widgets/effects/qgraphicseffect_p.h @@ -88,7 +88,7 @@ protected: private: Q_DECLARE_PRIVATE(QGraphicsEffectSource) - Q_DISABLE_COPY(QGraphicsEffectSource) + Q_DISABLE_COPY_MOVE(QGraphicsEffectSource) friend class QGraphicsEffect; friend class QGraphicsEffectPrivate; friend class QGraphicsScenePrivate; diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp index 60edd01d00..e1e8175423 100644 --- a/src/widgets/effects/qpixmapfilter.cpp +++ b/src/widgets/effects/qpixmapfilter.cpp @@ -54,6 +54,8 @@ #include "private/qmemrotate_p.h" #include "private/qdrawhelper_p.h" +#include <memory> + QT_BEGIN_NAMESPACE class QPixmapFilterPrivate : public QObjectPrivate @@ -319,7 +321,7 @@ static void convolute( const QImage processImage = (srcImage.format() != QImage::Format_ARGB32_Premultiplied ) ? srcImage.convertToFormat(QImage::Format_ARGB32_Premultiplied) : srcImage; // TODO: support also other formats directly without copying - int *fixedKernel = new int[kernelWidth*kernelHeight]; + std::unique_ptr<int[]> fixedKernel(new int[kernelWidth * kernelHeight]); for(int i = 0; i < kernelWidth*kernelHeight; i++) { fixedKernel[i] = (int)(65536 * kernel[i]); @@ -403,7 +405,6 @@ static void convolute( } yk++; } - delete[] fixedKernel; } /*! diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp index d9005afbef..6b7052a0ab 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp +++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp @@ -552,20 +552,19 @@ int QGraphicsGridLayout::count() const } /*! - Returns the layout item at \a index, or 0 if there is no layout item at - this index. + Returns the layout item at \a index, or \nullptr if there is no + layout item at this index. */ QGraphicsLayoutItem *QGraphicsGridLayout::itemAt(int index) const { Q_D(const QGraphicsGridLayout); if (index < 0 || index >= d->engine.itemCount()) { qWarning("QGraphicsGridLayout::itemAt: invalid index %d", index); - return 0; + return nullptr; } - QGraphicsLayoutItem *item = 0; if (QGraphicsGridLayoutEngineItem *engineItem = static_cast<QGraphicsGridLayoutEngineItem*>(d->engine.itemAt(index))) - item = engineItem->layoutItem(); - return item; + return engineItem->layoutItem(); + return nullptr; } /*! diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index 86f3d6a2f0..6e53ea94f3 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -661,9 +661,9 @@ \value ItemSceneChange The item is moved to a new scene. This notification is also sent when the item is added to its initial scene, and when it is removed. - The item's scene() is the old scene (or 0 if the item has not been added to a - scene yet). The value argument is the new scene (i.e., a QGraphicsScene - pointer), or a null pointer if the item is removed from a scene. Do not + The item's scene() is the old scene, or \nullptr if the item has not been added + to a scene yet. The value argument is the new scene (i.e., a QGraphicsScene + pointer), or \nullptr if the item is removed from a scene. Do not override this change by passing this item to QGraphicsScene::addItem() as this notification is delivered; instead, you can return the new scene from itemChange(). Use this feature with caution; objecting to a scene change can @@ -1542,7 +1542,7 @@ void QGraphicsItemCache::purge() Constructs a QGraphicsItem with the given \a parent item. It does not modify the parent object returned by QObject::parent(). - If \a parent is 0, you can add the item to a scene by calling + If \a parent is \nullptr, you can add the item to a scene by calling QGraphicsScene::addItem(). The item will then become a top-level item. \sa QGraphicsScene::addItem(), setParentItem() @@ -1650,8 +1650,8 @@ QGraphicsItem::~QGraphicsItem() } /*! - Returns the current scene for the item, or 0 if the item is not stored in - a scene. + Returns the current scene for the item, or \nullptr if the item is + not stored in a scene. To add or move an item to a scene, call QGraphicsScene::addItem(). */ @@ -1661,15 +1661,15 @@ QGraphicsScene *QGraphicsItem::scene() const } /*! - Returns a pointer to this item's item group, or 0 if this item is not - member of a group. + Returns a pointer to this item's item group, or \nullptr if this + item is not member of a group. \sa QGraphicsItemGroup, QGraphicsScene::createItemGroup() */ QGraphicsItemGroup *QGraphicsItem::group() const { if (!d_ptr->isMemberOfGroup) - return 0; + return nullptr; QGraphicsItem *parent = const_cast<QGraphicsItem *>(this); while ((parent = parent->d_ptr->parent)) { if (QGraphicsItemGroup *group = qgraphicsitem_cast<QGraphicsItemGroup *>(parent)) @@ -1677,11 +1677,11 @@ QGraphicsItemGroup *QGraphicsItem::group() const } // Unreachable; if d_ptr->isMemberOfGroup is != 0, then one parent of this // item is a group item. - return 0; + return nullptr; } /*! - Adds this item to the item group \a group. If \a group is 0, this item is + Adds this item to the item group \a group. If \a group is \nullptr, this item is removed from any current group and added as a child of the previous group's parent. @@ -1699,7 +1699,7 @@ void QGraphicsItem::setGroup(QGraphicsItemGroup *group) /*! Returns a pointer to this item's parent item. If this item does not have a - parent, 0 is returned. + parent, \nullptr is returned. \sa setParentItem(), childItems() */ @@ -1710,8 +1710,9 @@ QGraphicsItem *QGraphicsItem::parentItem() const /*! Returns this item's top-level item. The top-level item is the item's - topmost ancestor item whose parent is 0. If an item has no parent, its own - pointer is returned (i.e., a top-level item is its own top-level item). + topmost ancestor item whose parent is \nullptr. If an item has no + parent, its own pointer is returned (i.e., a top-level item is its + own top-level item). \sa parentItem() */ @@ -1734,7 +1735,7 @@ QGraphicsItem *QGraphicsItem::topLevelItem() const QGraphicsObject *QGraphicsItem::parentObject() const { QGraphicsItem *p = d_ptr->parent; - return (p && p->d_ptr->isObject) ? static_cast<QGraphicsObject *>(p) : 0; + return (p && p->d_ptr->isObject) ? static_cast<QGraphicsObject *>(p) : nullptr; } /*! @@ -1757,23 +1758,24 @@ QGraphicsWidget *QGraphicsItem::parentWidget() const \since 4.4 Returns a pointer to the item's top level widget (i.e., the item's - ancestor whose parent is 0, or whose parent is not a widget), or 0 if this - item does not have a top level widget. If the item is its own top level - widget, this function returns a pointer to the item itself. + ancestor whose parent is \nullptr, or whose parent is not a widget), or + \nullptr if this item does not have a top level widget. If the item + is its own top level widget, this function returns a pointer to the + item itself. */ QGraphicsWidget *QGraphicsItem::topLevelWidget() const { if (const QGraphicsWidget *p = parentWidget()) return p->topLevelWidget(); - return isWidget() ? static_cast<QGraphicsWidget *>(const_cast<QGraphicsItem *>(this)) : 0; + return isWidget() ? static_cast<QGraphicsWidget *>(const_cast<QGraphicsItem *>(this)) : nullptr; } /*! \since 4.4 - Returns the item's window, or 0 if this item does not have a window. If - the item is a window, it will return itself. Otherwise it will return the - closest ancestor that is a window. + Returns the item's window, or \nullptr if this item does not have a + window. If the item is a window, it will return itself. Otherwise + it will return the closest ancestor that is a window. \sa QGraphicsWidget::isWindow() */ @@ -1782,15 +1784,15 @@ QGraphicsWidget *QGraphicsItem::window() const QGraphicsItem *p = panel(); if (p && p->isWindow()) return static_cast<QGraphicsWidget *>(p); - return 0; + return nullptr; } /*! \since 4.6 - Returns the item's panel, or 0 if this item does not have a panel. If the - item is a panel, it will return itself. Otherwise it will return the - closest ancestor that is a panel. + Returns the item's panel, or \nullptr if this item does not have a + panel. If the item is a panel, it will return itself. Otherwise it + will return the closest ancestor that is a panel. \sa isPanel(), ItemIsPanel */ @@ -1798,7 +1800,7 @@ QGraphicsItem *QGraphicsItem::panel() const { if (d_ptr->flags & ItemIsPanel) return const_cast<QGraphicsItem *>(this); - return d_ptr->parent ? d_ptr->parent->panel() : 0; + return d_ptr->parent ? d_ptr->parent->panel() : nullptr; } /*! @@ -2397,7 +2399,7 @@ bool QGraphicsItem::isVisible() const /*! \since 4.4 Returns \c true if the item is visible to \a parent; otherwise, false is - returned. \a parent can be 0, in which case this function will return + returned. \a parent can be \nullptr, in which case this function will return whether the item is visible to the scene or not. An item may not be visible to its ancestors even if isVisible() is true. It @@ -2925,7 +2927,7 @@ void QGraphicsItem::setOpacity(qreal opacity) } /*! - Returns a pointer to this item's effect if it has one; otherwise 0. + Returns a pointer to this item's effect if it has one; otherwise \nullptr. \since 4.6 */ @@ -2939,7 +2941,7 @@ QGraphicsEffect *QGraphicsItem::graphicsEffect() const Sets \a effect as the item's effect. If there already is an effect installed on this item, QGraphicsItem will delete the existing effect before installing the new \a effect. You can delete an existing effect by calling - setGraphicsEffect(0). + setGraphicsEffect(\nullptr). If \a effect is the installed effect on a different item, setGraphicsEffect() will remove the effect from the item and install it on this item. @@ -3577,7 +3579,7 @@ void QGraphicsItemPrivate::clearFocusHelper(bool giveFocusToParent, bool hiddenB /*! \since 4.6 - Returns this item's focus proxy, or 0 if this item has no + Returns this item's focus proxy, or \nullptr if this item has no focus proxy. \sa setFocusProxy(), setFocus(), hasFocus() @@ -3640,7 +3642,7 @@ void QGraphicsItem::setFocusProxy(QGraphicsItem *item) If this item, a child or descendant of this item currently has input focus, this function will return a pointer to that item. If - no descendant has input focus, 0 is returned. + no descendant has input focus, \nullptr is returned. \sa hasFocus(), setFocus(), QWidget::focusWidget() */ @@ -3995,6 +3997,7 @@ void QGraphicsItem::ensureVisible(const QRectF &rect, int xmargin, int ymargin) ensureVisible(QRectF(\a x, \a y, \a w, \a h), \a xmargin, \a ymargin). */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -4010,6 +4013,7 @@ QMatrix QGraphicsItem::matrix() const { return transform().toAffine(); } +#endif /*! \since 4.3 @@ -4320,6 +4324,7 @@ void QGraphicsItem::setTransformOriginPoint(const QPointF &origin) */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -4332,7 +4337,7 @@ QMatrix QGraphicsItem::sceneMatrix() const d_ptr->ensureSceneTransform(); return d_ptr->sceneTransform.toAffine(); } - +#endif /*! \since 4.3 @@ -4544,6 +4549,7 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co return x; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -4582,6 +4588,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine) // Send post-notification. itemChange(ItemTransformHasChanged, QVariant::fromValue<QTransform>(newTransform)); } +#endif /*! \since 4.3 @@ -4636,6 +4643,7 @@ void QGraphicsItem::setTransform(const QTransform &matrix, bool combine) d_ptr->sendScenePosChange(); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -4645,6 +4653,7 @@ void QGraphicsItem::resetMatrix() { resetTransform(); } +#endif /*! \since 4.3 @@ -5790,7 +5799,7 @@ void QGraphicsItemPrivate::clearSubFocus(QGraphicsItem *rootItem, QGraphicsItem /*! \internal - Sets the focusProxy pointer to 0 for all items that have this item as their + Sets the focusProxy pointer to \nullptr for all items that have this item as their focusProxy. */ void QGraphicsItemPrivate::resetFocusProxy() @@ -6001,7 +6010,7 @@ void QGraphicsItem::scroll(qreal dx, qreal dy, const QRectF &rect) Maps the point \a point, which is in this item's coordinate system, to \a item's coordinate system, and returns the mapped coordinate. - If \a item is 0, this function returns the same as mapToScene(). + If \a item is \nullptr, this function returns the same as mapToScene(). \sa itemTransform(), mapToParent(), mapToScene(), transform(), mapFromItem(), {The Graphics View Coordinate System} @@ -6071,7 +6080,7 @@ QPointF QGraphicsItem::mapToScene(const QPointF &point) const Maps the rectangle \a rect, which is in this item's coordinate system, to \a item's coordinate system, and returns the mapped rectangle as a polygon. - If \a item is 0, this function returns the same as mapToScene(). + If \a item is \nullptr, this function returns the same as mapToScene(). \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The Graphics View Coordinate System} @@ -6142,7 +6151,7 @@ QPolygonF QGraphicsItem::mapToScene(const QRectF &rect) const \a item's coordinate system, and returns the mapped rectangle as a new rectangle (i.e., the bounding rectangle of the resulting polygon). - If \a item is 0, this function returns the same as mapRectToScene(). + If \a item is \nullptr, this function returns the same as mapRectToScene(). \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The Graphics View Coordinate System} @@ -6217,7 +6226,7 @@ QRectF QGraphicsItem::mapRectToScene(const QRectF &rect) const this item's coordinate system, and returns the mapped rectangle as a new rectangle (i.e., the bounding rectangle of the resulting polygon). - If \a item is 0, this function returns the same as mapRectFromScene(). + If \a item is \nullptr, this function returns the same as mapRectFromScene(). \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The Graphics View Coordinate System} @@ -6290,7 +6299,7 @@ QRectF QGraphicsItem::mapRectFromScene(const QRectF &rect) const Maps the polygon \a polygon, which is in this item's coordinate system, to \a item's coordinate system, and returns the mapped polygon. - If \a item is 0, this function returns the same as mapToScene(). + If \a item is \nullptr, this function returns the same as mapToScene(). \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The Graphics View Coordinate System} @@ -6337,7 +6346,7 @@ QPolygonF QGraphicsItem::mapToScene(const QPolygonF &polygon) const Maps the path \a path, which is in this item's coordinate system, to \a item's coordinate system, and returns the mapped path. - If \a item is 0, this function returns the same as mapToScene(). + If \a item is \nullptr, this function returns the same as mapToScene(). \sa itemTransform(), mapToParent(), mapToScene(), mapFromItem(), {The Graphics View Coordinate System} @@ -6384,7 +6393,7 @@ QPainterPath QGraphicsItem::mapToScene(const QPainterPath &path) const Maps the point \a point, which is in \a item's coordinate system, to this item's coordinate system, and returns the mapped coordinate. - If \a item is 0, this function returns the same as mapFromScene(). + If \a item is \nullptr, this function returns the same as mapFromScene(). \sa itemTransform(), mapFromParent(), mapFromScene(), transform(), mapToItem(), {The Graphics View Coordinate System} @@ -6456,7 +6465,7 @@ QPointF QGraphicsItem::mapFromScene(const QPointF &point) const this item's coordinate system, and returns the mapped rectangle as a polygon. - If \a item is 0, this function returns the same as mapFromScene() + If \a item is \nullptr, this function returns the same as mapFromScene() \sa itemTransform(), mapToItem(), mapFromParent(), transform(), {The Graphics View Coordinate System} @@ -6524,7 +6533,7 @@ QPolygonF QGraphicsItem::mapFromScene(const QRectF &rect) const Maps the polygon \a polygon, which is in \a item's coordinate system, to this item's coordinate system, and returns the mapped polygon. - If \a item is 0, this function returns the same as mapFromScene(). + If \a item is \nullptr, this function returns the same as mapFromScene(). \sa itemTransform(), mapToItem(), mapFromParent(), transform(), {The Graphics View Coordinate System} @@ -6569,7 +6578,7 @@ QPolygonF QGraphicsItem::mapFromScene(const QPolygonF &polygon) const Maps the path \a path, which is in \a item's coordinate system, to this item's coordinate system, and returns the mapped path. - If \a item is 0, this function returns the same as mapFromScene(). + If \a item is \nullptr, this function returns the same as mapFromScene(). \sa itemTransform(), mapFromParent(), mapFromScene(), mapToItem(), {The Graphics View Coordinate System} @@ -6633,15 +6642,15 @@ bool QGraphicsItem::isAncestorOf(const QGraphicsItem *child) const /*! \since 4.4 - Returns the closest common ancestor item of this item and \a other, or 0 - if either \a other is 0, or there is no common ancestor. + Returns the closest common ancestor item of this item and \a other, + or \nullptr if either \a other is \nullptr, or there is no common ancestor. \sa isAncestorOf() */ QGraphicsItem *QGraphicsItem::commonAncestorItem(const QGraphicsItem *other) const { if (!other) - return 0; + return nullptr; if (other == this) return const_cast<QGraphicsItem *>(this); const QGraphicsItem *thisw = this; @@ -6726,7 +6735,7 @@ void QGraphicsItem::setData(int key, const QVariant &value) \since 4.2 Returns the given \a item cast to type T if \a item is of type T; - otherwise, 0 is returned. + otherwise, \nullptr is returned. \note To make this function work correctly with custom items, reimplement the \l{QGraphicsItem::}{type()} function for each custom QGraphicsItem diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index c228e765d8..7dd4441ae9 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -283,10 +283,16 @@ public: inline void ensureVisible(qreal x, qreal y, qreal w, qreal h, int xmargin = 50, int ymargin = 50); // Local transformation +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use transform() instead") QMatrix matrix() const; + QT_DEPRECATED_X("Use sceneTransform() instead") QMatrix sceneMatrix() const; + QT_DEPRECATED_X("Use setTransform() instead") void setMatrix(const QMatrix &matrix, bool combine = false); + QT_DEPRECATED_X("Use resetTransform() instead") void resetMatrix(); +#endif QTransform transform() const; QTransform sceneTransform() const; QTransform deviceTransform(const QTransform &viewportTransform) const; @@ -487,7 +493,9 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsItem::GraphicsItemFlags) +#ifndef Q_CLANG_QDOC Q_DECLARE_INTERFACE(QGraphicsItem, "org.qt-project.Qt.QGraphicsItem") +#endif inline void QGraphicsItem::setPos(qreal ax, qreal ay) { setPos(QPointF(ax, ay)); } diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp index 572ec141bc..78b91d5c39 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp +++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp @@ -549,6 +549,7 @@ void QGraphicsItemAnimation::setStep(qreal step) afterAnimationStep(step); } +#if QT_DEPRECATED_SINCE(5, 13) /*! Resets the item to its starting position and transformation. @@ -563,6 +564,7 @@ void QGraphicsItemAnimation::reset() d->startPos = d->item->pos(); d->startMatrix = d->item->matrix(); } +#endif /*! \fn void QGraphicsItemAnimation::beforeAnimationStep(qreal step) diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index 7417d7729c..f983bd8026 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.h +++ b/src/widgets/graphicsview/qgraphicsitemanimation.h @@ -96,7 +96,10 @@ public: public Q_SLOTS: void setStep(qreal x); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setStep(0) instead") void reset(); +#endif protected: virtual void beforeAnimationStep(qreal step); diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 28b335ceaa..efcafa5e6a 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -83,7 +83,9 @@ private: friend class QGraphicsWidget; }; +#ifndef Q_CLANG_QDOC Q_DECLARE_INTERFACE(QGraphicsLayout, "org.qt-project.Qt.QGraphicsLayout") +#endif QT_END_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.cpp b/src/widgets/graphicsview/qgraphicslayoutitem.cpp index aed154a95f..1192bad51e 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.cpp +++ b/src/widgets/graphicsview/qgraphicslayoutitem.cpp @@ -193,7 +193,7 @@ QSizeF *QGraphicsLayoutItemPrivate::effectiveSizeHints(const QSizeF &constraint) /*! \internal - Returns the parent item of this layout, or 0 if this layout is + Returns the parent item of this layout, or \nullptr if this layout is not installed on any widget. If this is the item that the layout is installed on, it will return "itself". @@ -214,7 +214,7 @@ QGraphicsItem *QGraphicsLayoutItemPrivate::parentItem() const while (parent && parent->isLayout()) { parent = parent->parentLayoutItem(); } - return parent ? parent->graphicsItem() : 0; + return parent ? parent->graphicsItem() : nullptr; } /*! @@ -368,7 +368,7 @@ bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const passing a QGraphicsLayoutItem pointer to QGraphicsLayoutItem's protected constructor, or by calling setParentLayoutItem(). The parentLayoutItem() function returns a pointer to the item's layoutItem - parent. If the item's parent is 0 or if the parent does not inherit + parent. If the item's parent is \nullptr or if the parent does not inherit from QGraphicsItem, the parentLayoutItem() function then returns \nullptr. isLayout() returns \c true if the QGraphicsLayoutItem subclass is itself a layout, or false otherwise. @@ -737,7 +737,7 @@ QRectF QGraphicsLayoutItem::geometry() const This virtual function provides the \a left, \a top, \a right and \a bottom contents margins for this QGraphicsLayoutItem. The default implementation assumes all contents margins are 0. The parameters point to values stored - in qreals. If any of the pointers is 0, that value will not be updated. + in qreals. If any of the pointers is \nullptr, that value will not be updated. \sa QGraphicsWidget::setContentsMargins() */ @@ -826,8 +826,8 @@ void QGraphicsLayoutItem::updateGeometry() } /*! - Returns the parent of this QGraphicsLayoutItem, or 0 if there is no parent, - or if the parent does not inherit from QGraphicsLayoutItem + Returns the parent of this QGraphicsLayoutItem, or \nullptr if there is + no parent, or if the parent does not inherit from QGraphicsLayoutItem (QGraphicsLayoutItem is often used through multiple inheritance with QObject-derived classes). @@ -917,7 +917,7 @@ QGraphicsItem *QGraphicsLayoutItem::graphicsItem() const * advantage of the automatic reparenting capabilities of QGraphicsLayout it * should set this value. * Note that if you delete \a item and not delete the layout item, you are - * responsible of calling setGraphicsItem(0) in order to avoid having a + * responsible of calling setGraphicsItem(\nullptr) in order to avoid having a * dangling pointer. * * \sa graphicsItem() diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 44f430034b..86a0a87361 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -116,7 +116,9 @@ private: friend class QGraphicsLayout; }; +#ifndef Q_CLANG_QDOC Q_DECLARE_INTERFACE(QGraphicsLayoutItem, "org.qt-project.Qt.QGraphicsLayoutItem") +#endif inline void QGraphicsLayoutItem::setMinimumSize(qreal aw, qreal ah) { setMinimumSize(QSizeF(aw, ah)); } diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp b/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp index af969b346d..da2510a8cb 100644 --- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp +++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp @@ -50,15 +50,13 @@ QT_BEGIN_NAMESPACE QGraphicsLayoutStyleInfo::QGraphicsLayoutStyleInfo(const QGraphicsLayoutPrivate *layout) : m_layout(layout), m_style(0) { - m_widget = new QWidget; // pixelMetric might need a widget ptr - if (m_widget) - m_styleOption.initFrom(m_widget); + m_widget.reset(new QWidget); // pixelMetric might need a widget ptr + m_styleOption.initFrom(m_widget.get()); m_isWindow = m_styleOption.state & QStyle::State_Window; } QGraphicsLayoutStyleInfo::~QGraphicsLayoutStyleInfo() { - delete m_widget; } qreal QGraphicsLayoutStyleInfo::combinedLayoutSpacing(QLayoutPolicy::ControlTypes controls1, @@ -93,7 +91,7 @@ qreal QGraphicsLayoutStyleInfo::windowMargin(Qt::Orientation orientation) const const_cast<QStyleOption*>(&m_styleOption), widget()); } -QWidget *QGraphicsLayoutStyleInfo::widget() const { return m_widget; } +QWidget *QGraphicsLayoutStyleInfo::widget() const { return m_widget.get(); } QStyle *QGraphicsLayoutStyleInfo::style() const { diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h index 7886de432c..c3af9f4554 100644 --- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h +++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h @@ -54,6 +54,8 @@ #include <QtGui/private/qabstractlayoutstyleinfo_p.h> #include <QtWidgets/qstyleoption.h> +#include <memory> + QT_REQUIRE_CONFIG(graphicsview); QT_BEGIN_NAMESPACE @@ -93,7 +95,7 @@ private: const QGraphicsLayoutPrivate *m_layout; mutable QStyle *m_style; QStyleOption m_styleOption; - QWidget *m_widget; + std::unique_ptr<QWidget> m_widget; }; QT_END_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp index 513cf9d361..e9f092020f 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp +++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp @@ -556,7 +556,7 @@ QGraphicsProxyWidget::~QGraphicsProxyWidget() exclusively either inside or outside of Graphics View. You cannot embed a widget as long as it is is visible elsewhere in the UI, at the same time. - \a widget must be a top-level widget whose parent is 0. + \a widget must be a top-level widget whose parent is \nullptr. When the widget is embedded, its state (e.g., visible, enabled, geometry, size hints) is copied into the proxy widget. If the embedded widget is @@ -739,7 +739,7 @@ QWidget *QGraphicsProxyWidget::widget() const Returns the rectangle for \a widget, which must be a descendant of widget(), or widget() itself, in this proxy item's local coordinates. - If no widget is embedded, \a widget is 0, or \a widget is not a + If no widget is embedded, \a widget is \nullptr, or \a widget is not a descendant of the embedded widget, this function returns an empty QRectF. \sa widget() diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index bba992144d..a60c2872ae 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -1929,6 +1929,7 @@ void QGraphicsScene::setBspTreeDepth(int depth) bspTree->setBspTreeDepth(depth); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \property QGraphicsScene::sortCacheEnabled \brief whether sort caching is enabled @@ -1949,6 +1950,7 @@ void QGraphicsScene::setSortCacheEnabled(bool enabled) return; d->sortCacheEnabled = enabled; } +#endif /*! Calculates and returns the bounding rect of all items on the scene. This @@ -2144,8 +2146,8 @@ QList<QGraphicsItem *> QGraphicsScene::collidingItems(const QGraphicsItem *item, \overload \obsolete - Returns the topmost visible item at the specified \a position, or 0 if - there are no items at this position. + Returns the topmost visible item at the specified \a position, or + \nullptr if there are no items at this position. This function is deprecated and returns incorrect results if the scene contains items that ignore transformations. Use the overload that takes @@ -2159,7 +2161,7 @@ QList<QGraphicsItem *> QGraphicsScene::collidingItems(const QGraphicsItem *item, /*! \since 4.6 - Returns the topmost visible item at the specified \a position, or 0 + Returns the topmost visible item at the specified \a position, or \nullptr if there are no items at this position. \a deviceTransform is the transformation that applies to the view, and needs to @@ -2173,7 +2175,7 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position, const QTransform { const QList<QGraphicsItem *> itemsAtPoint = items(position, Qt::IntersectsItemShape, Qt::DescendingOrder, deviceTransform); - return itemsAtPoint.isEmpty() ? 0 : itemsAtPoint.first(); + return itemsAtPoint.isEmpty() ? nullptr : itemsAtPoint.first(); } /*! @@ -2182,7 +2184,7 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position, const QTransform \since 4.6 Returns the topmost visible item at the position specified by (\a x, \a - y), or 0 if there are no items at this position. + y), or \nullptr if there are no items at this position. \a deviceTransform is the transformation that applies to the view, and needs to be provided if the scene contains items that ignore transformations. @@ -2199,7 +2201,7 @@ QGraphicsItem *QGraphicsScene::itemAt(const QPointF &position, const QTransform \obsolete Returns the topmost visible item at the position specified by (\a x, \a - y), or 0 if there are no items at this position. + y), or \nullptr if there are no items at this position. This convenience function is equivalent to calling \c {itemAt(QPointF(x, y))}. @@ -2941,9 +2943,9 @@ void QGraphicsScene::removeItem(QGraphicsItem *item) /*! When the scene is active, this functions returns the scene's current focus - item, or 0 if no item currently has focus. When the scene is inactive, this - functions returns the item that will gain input focus when the scene becomes - active. + item, or \nullptr if no item currently has focus. When the scene is inactive, + this functions returns the item that will gain input focus when the scene + becomes active. The focus item receives keyboard input when the scene receives a key event. @@ -2961,12 +2963,12 @@ QGraphicsItem *QGraphicsScene::focusItem() const focusReason, after removing focus from any previous item that may have had focus. - If \a item is 0, or if it either does not accept focus (i.e., it does not + If \a item is \nullptr, or if it either does not accept focus (i.e., it does not have the QGraphicsItem::ItemIsFocusable flag enabled), or is not visible or not enabled, this function only removes focus from any previous focusitem. - If item is not 0, and the scene does not currently have focus (i.e., + If item is not \nullptr, and the scene does not currently have focus (i.e., hasFocus() returns \c false), this function will call setFocus() automatically. @@ -3062,9 +3064,9 @@ bool QGraphicsScene::stickyFocus() const } /*! - Returns the current mouse grabber item, or 0 if no item is currently - grabbing the mouse. The mouse grabber item is the item that receives all - mouse events sent to the scene. + Returns the current mouse grabber item, or \nullptr if no item is + currently grabbing the mouse. The mouse grabber item is the item + that receives all mouse events sent to the scene. An item becomes a mouse grabber when it receives and accepts a mouse press event, and it stays the mouse grabber until either of @@ -5547,7 +5549,7 @@ bool QGraphicsScene::focusNextPrevChild(bool next) \a oldFocusItem is a pointer to the item that previously had focus, or 0 if no item had focus before the signal was emitted. \a newFocusItem - is a pointer to the item that gained input focus, or 0 if focus was lost. + is a pointer to the item that gained input focus, or \nullptr if focus was lost. \a reason is the reason for the focus change (e.g., if the scene was deactivated while an input field had focus, \a oldFocusItem would point to the input field item, \a newFocusItem would be 0, and \a reason would be @@ -5582,7 +5584,7 @@ QStyle *QGraphicsScene::style() const the style for all widgets in the scene that do not have a style explicitly assigned to them. - If \a style is 0, QGraphicsScene will revert to QApplication::style(). + If \a style is \nullptr, QGraphicsScene will revert to QApplication::style(). \sa style() */ @@ -5703,7 +5705,8 @@ bool QGraphicsScene::isActive() const /*! \since 4.6 - Returns the current active panel, or 0 if no panel is currently active. + Returns the current active panel, or \nullptr if no panel is + currently active. \sa QGraphicsScene::setActivePanel() */ @@ -5720,7 +5723,7 @@ QGraphicsItem *QGraphicsScene::activePanel() const deactivate any currently active panel. If the scene is currently inactive, \a item remains inactive until the - scene becomes active (or, ir \a item is 0, no item will be activated). + scene becomes active (or, ir \a item is \nullptr, no item will be activated). \sa activePanel(), isActive(), QGraphicsItem::isActive() */ @@ -5733,8 +5736,8 @@ void QGraphicsScene::setActivePanel(QGraphicsItem *item) /*! \since 4.4 - Returns the current active window, or 0 if no window is currently - active. + Returns the current active window, or \nullptr if no window is + currently active. \sa QGraphicsScene::setActiveWindow() */ @@ -5743,7 +5746,7 @@ QGraphicsWidget *QGraphicsScene::activeWindow() const Q_D(const QGraphicsScene); if (d->activePanel && d->activePanel->isWindow()) return static_cast<QGraphicsWidget *>(d->activePanel); - return 0; + return nullptr; } /*! diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index 287e551db7..71b8fc3013 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -141,8 +141,10 @@ public: ItemIndexMethod itemIndexMethod() const; void setItemIndexMethod(ItemIndexMethod method); - bool isSortCacheEnabled() const; - void setSortCacheEnabled(bool enabled); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED bool isSortCacheEnabled() const; + QT_DEPRECATED void setSortCacheEnabled(bool enabled); +#endif int bspTreeDepth() const; void setBspTreeDepth(int depth); diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h index b6387a2c56..eb6bbbf49b 100644 --- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -99,7 +99,7 @@ protected: private : Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex) - Q_DISABLE_COPY(QGraphicsSceneBspTreeIndex) + Q_DISABLE_COPY_MOVE(QGraphicsSceneBspTreeIndex) Q_PRIVATE_SLOT(d_func(), void _q_updateSortCache()) Q_PRIVATE_SLOT(d_func(), void _q_updateIndex()) diff --git a/src/widgets/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp index 398ef1aaf5..5077a39d67 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.cpp +++ b/src/widgets/graphicsview/qgraphicssceneevent.cpp @@ -319,8 +319,8 @@ QGraphicsSceneEvent::~QGraphicsSceneEvent() } /*! - Returns the widget where the event originated, or 0 if the event - originates from another application. + Returns the widget where the event originated, or \nullptr if the + event originates from another application. */ QWidget *QGraphicsSceneEvent::widget() const { diff --git a/src/widgets/graphicsview/qgraphicssceneindex_p.h b/src/widgets/graphicsview/qgraphicssceneindex_p.h index bdc57bd9ea..86637e836b 100644 --- a/src/widgets/graphicsview/qgraphicssceneindex_p.h +++ b/src/widgets/graphicsview/qgraphicssceneindex_p.h @@ -115,7 +115,7 @@ protected: friend class QGraphicsItemPrivate; friend class QGraphicsSceneBspTreeIndex; private: - Q_DISABLE_COPY(QGraphicsSceneIndex) + Q_DISABLE_COPY_MOVE(QGraphicsSceneIndex) Q_DECLARE_PRIVATE(QGraphicsSceneIndex) }; @@ -151,7 +151,7 @@ inline void QGraphicsSceneIndexPrivate::items_helper(const QRectF &rect, QGraphi if (order == Qt::DescendingOrder) { const int n = items->size(); for (int i = 0; i < n / 2; ++i) - items->swap(i, n - i - 1); + items->swapItemsAt(i, n - i - 1); } } diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp index 24647dd74c..5fe520132f 100644 --- a/src/widgets/graphicsview/qgraphicsview.cpp +++ b/src/widgets/graphicsview/qgraphicsview.cpp @@ -1676,7 +1676,7 @@ void QGraphicsView::setInteractive(bool allowed) /*! Returns a pointer to the scene that is currently visualized in the - view. If no scene is currently visualized, 0 is returned. + view. If no scene is currently visualized, \nullptr is returned. \sa setScene() */ diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index a4534c73dd..c994136091 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -159,7 +159,7 @@ QT_BEGIN_NAMESPACE manage the relationships between parent and child items. These functions control the stacking order of items as well as their ownership. - \note The QObject::parent() should always return 0 for QGraphicsWidgets, + \note The QObject::parent() should always return \nullptr for QGraphicsWidgets, but this policy is not strictly defined. \sa QGraphicsProxyWidget, QGraphicsItem, {Widgets and Layouts} @@ -518,7 +518,7 @@ void QGraphicsWidget::setContentsMargins(qreal left, qreal top, qreal right, qre /*! Gets the widget's contents margins. The margins are stored in \a left, \a top, \a right and \a bottom, as pointers to qreals. Each argument can - be \e {omitted} by passing 0. + be \e {omitted} by passing \nullptr. \sa setContentsMargins() */ @@ -573,7 +573,7 @@ void QGraphicsWidget::setWindowFrameMargins(qreal left, qreal top, qreal right, /*! Gets the widget's window frame margins. The margins are stored in \a left, \a top, \a right and \a bottom as pointers to qreals. Each argument can - be \e {omitted} by passing 0. + be \e {omitted} by passing \nullptr. \sa setWindowFrameMargins(), windowFrameRect() */ @@ -780,7 +780,7 @@ QSizeF QGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c \brief The layout of the widget Any existing layout manager is deleted before the new layout is assigned. If - \a layout is 0, the widget is left without a layout. Existing subwidgets' + \a layout is \nullptr, the widget is left without a layout. Existing subwidgets' geometries will remain unaffected. QGraphicsWidget takes ownership of \a layout. @@ -792,7 +792,7 @@ QSizeF QGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c explicitly managed by \a layout remain unaffected by the layout after it has been assigned to this widget. - If no layout is currently managing this widget, layout() will return 0. + If no layout is currently managing this widget, layout() will return \nullptr. */ @@ -803,8 +803,8 @@ QSizeF QGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c */ /*! - Returns this widget's layout, or 0 if no layout is currently managing this - widget. + Returns this widget's layout, or \nullptr if no layout is currently + managing this widget. \sa setLayout() */ @@ -818,7 +818,7 @@ QGraphicsLayout *QGraphicsWidget::layout() const \fn void QGraphicsWidget::setLayout(QGraphicsLayout *layout) Sets the layout for this widget to \a layout. Any existing layout manager - is deleted before the new layout is assigned. If \a layout is 0, the + is deleted before the new layout is assigned. If \a layout is \nullptr, the widget is left without a layout. Existing subwidgets' geometries will remain unaffected. @@ -937,11 +937,11 @@ QStyle *QGraphicsWidget::style() const Sets the widget's style to \a style. QGraphicsWidget does \e not take ownership of \a style. - If no style is assigned, or \a style is 0, the widget will use + If no style is assigned, or \a style is \nullptr, the widget will use QGraphicsScene::style() (if this has been set). Otherwise the widget will use QApplication::style(). - This function sets the Qt::WA_SetStyle attribute if \a style is not 0; + This function sets the Qt::WA_SetStyle attribute if \a style is not \nullptr; otherwise it clears the attribute. \sa style() @@ -1871,7 +1871,7 @@ void QGraphicsWidget::setFocusPolicy(Qt::FocusPolicy policy) /*! If this widget, a child or descendant of this widget currently has input focus, this function will return a pointer to that widget. If - no descendant widget has input focus, 0 is returned. + no descendant widget has input focus, \nullptr is returned. \sa QGraphicsItem::focusItem(), QWidget::focusWidget() */ @@ -1880,7 +1880,7 @@ QGraphicsWidget *QGraphicsWidget::focusWidget() const Q_D(const QGraphicsWidget); if (d->subFocusItem && d->subFocusItem->d_ptr->isWidget) return static_cast<QGraphicsWidget *>(d->subFocusItem); - return 0; + return nullptr; } #ifndef QT_NO_SHORTCUT @@ -2022,7 +2022,7 @@ void QGraphicsWidget::addActions(QList<QAction *> actions) \since 4.5 Inserts the action \a action to this widget's list of actions, - before the action \a before. It appends the action if \a before is 0 or + before the action \a before. It appends the action if \a before is \nullptr or \a before is not a valid action for this widget. A QGraphicsWidget should only have one of each action. @@ -2062,7 +2062,7 @@ void QGraphicsWidget::insertAction(QAction *before, QAction *action) \since 4.5 Inserts the actions \a actions to this widget's list of actions, - before the action \a before. It appends the action if \a before is 0 or + before the action \a before. It appends the action if \a before is \nullptr or \a before is not a valid action for this widget. A QGraphicsWidget can have at most one of each action. @@ -2131,9 +2131,9 @@ QList<QAction *> QGraphicsWidget::actions() const \snippet code/src_gui_graphicsview_qgraphicswidget.cpp 2 - If \a first is 0, this indicates that \a second should be the first widget + If \a first is \nullptr, this indicates that \a second should be the first widget to receive input focus should the scene gain Tab focus (i.e., the user - hits Tab so that focus passes into the scene). If \a second is 0, this + hits Tab so that focus passes into the scene). If \a second is \nullptr, this indicates that \a first should be the first widget to gain focus if the scene gained BackTab focus. diff --git a/src/widgets/graphicsview/qsimplex_p.h b/src/widgets/graphicsview/qsimplex_p.h index 2342da2437..369f2f5f82 100644 --- a/src/widgets/graphicsview/qsimplex_p.h +++ b/src/widgets/graphicsview/qsimplex_p.h @@ -150,7 +150,7 @@ struct QSimplexConstraint class QSimplex { - Q_DISABLE_COPY(QSimplex) + Q_DISABLE_COPY_MOVE(QSimplex) public: QSimplex(); ~QSimplex(); diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp index 9508aed3d3..448e775a71 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.cpp +++ b/src/widgets/itemviews/qabstractitemdelegate.cpp @@ -88,7 +88,7 @@ QT_BEGIN_NAMESPACE and is part of Qt's \l{Model/View Programming}{model/view framework}. To render an item in a custom way, you must implement paint() and - sizeHint(). The QItemDelegate class provides default implementations for + sizeHint(). The QStyledItemDelegate class provides default implementations for these functions; if you do not need custom rendering, subclass that class instead. @@ -115,7 +115,7 @@ QT_BEGIN_NAMESPACE The second approach is to handle user events directly by reimplementing editorEvent(). - \sa {model-view-programming}{Model/View Programming}, QItemDelegate, + \sa {model-view-programming}{Model/View Programming}, QStyledItemDelegate, {Pixelator Example}, QStyledItemDelegate, QStyle */ @@ -345,6 +345,7 @@ bool QAbstractItemDelegate::editorEvent(QEvent *, return false; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -364,6 +365,7 @@ QString QAbstractItemDelegate::elidedText(const QFontMetrics &fontMetrics, int w { return fontMetrics.elidedText(text, mode, width); } +#endif /*! \since 4.3 diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index 575728e806..5696e55691 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -103,8 +103,11 @@ public: const QStyleOptionViewItem &option, const QModelIndex &index); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QFontMetrics::elidedText() instead") static QString elidedText(const QFontMetrics &fontMetrics, int width, Qt::TextElideMode mode, const QString &text); +#endif virtual bool helpEvent(QHelpEvent *event, QAbstractItemView *view, diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 02eae33a12..63803767c8 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -940,8 +940,8 @@ void QAbstractItemView::setItemDelegateForRow(int row, QAbstractItemDelegate *de \since 4.2 Returns the item delegate used by this view and model for the given \a row, - or 0 if no delegate has been assigned. You can call itemDelegate() to get a - pointer to the current delegate for a given index. + or \nullptr if no delegate has been assigned. You can call itemDelegate() + to get a pointer to the current delegate for a given index. \sa setItemDelegateForRow(), itemDelegateForColumn(), setItemDelegate() */ @@ -2438,8 +2438,14 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) break; case Qt::Key_Space: case Qt::Key_Select: - if (!edit(currentIndex(), AnyKeyPressed, event) && d->selectionModel) - d->selectionModel->select(currentIndex(), selectionCommand(currentIndex(), event)); + if (!edit(currentIndex(), AnyKeyPressed, event)) { + if (d->selectionModel) + d->selectionModel->select(currentIndex(), selectionCommand(currentIndex(), event)); + if (event->key() == Qt::Key_Space) { + keyboardSearch(event->text()); + event->accept(); + } + } #ifdef QT_KEYPAD_NAVIGATION if ( event->key()==Qt::Key_Select ) { // Also do Key_Enter action. @@ -2915,6 +2921,7 @@ void QAbstractItemView::editorDestroyed(QObject *editor) setState(NoState); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete Sets the horizontal scroll bar's steps per item to \a steps. @@ -2972,6 +2979,7 @@ int QAbstractItemView::verticalStepsPerItem() const { return 1; } +#endif /*! Moves to and selects the item best matching the string \a search. @@ -3205,7 +3213,7 @@ bool QAbstractItemView::isPersistentEditorOpen(const QModelIndex &index) const This function should only be used to display static content within the visible area corresponding to an item of data. If you want to display custom dynamic content or implement a custom editor widget, subclass - QItemDelegate instead. + QStyledItemDelegate instead. \sa {Delegate Classes} */ diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 981582c166..be8fa07c94 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -272,10 +272,12 @@ Q_SIGNALS: protected: QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = nullptr); - void setHorizontalStepsPerItem(int steps); - int horizontalStepsPerItem() const; - void setVerticalStepsPerItem(int steps); - int verticalStepsPerItem() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED void setHorizontalStepsPerItem(int steps); + QT_DEPRECATED int horizontalStepsPerItem() const; + QT_DEPRECATED void setVerticalStepsPerItem(int steps); + QT_DEPRECATED int verticalStepsPerItem() const; +#endif enum CursorAction { MoveUp, MoveDown, MoveLeft, MoveRight, MoveHome, MoveEnd, MovePageUp, MovePageDown, diff --git a/src/widgets/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp index 1fe17721ba..a4eed2d885 100644 --- a/src/widgets/itemviews/qcolumnview.cpp +++ b/src/widgets/itemviews/qcolumnview.cpp @@ -801,7 +801,7 @@ void QColumnView::initializeColumn(QAbstractItemView *column) const } /*! - Returns the preview widget, or 0 if there is none. + Returns the preview widget, or \nullptr if there is none. \sa setPreviewWidget(), updatePreviewWidget() */ diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h index 9f0d2a40dc..7b36b1f3da 100644 --- a/src/widgets/itemviews/qcolumnview_p.h +++ b/src/widgets/itemviews/qcolumnview_p.h @@ -181,6 +181,7 @@ public: /*! * This is a delegate that will paint the triangle */ +// ### Qt6: QStyledItemDelegate class QColumnViewDelegate : public QItemDelegate { diff --git a/src/widgets/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h index 7e2793074b..5eb8012204 100644 --- a/src/widgets/itemviews/qcolumnviewgrip_p.h +++ b/src/widgets/itemviews/qcolumnviewgrip_p.h @@ -82,7 +82,7 @@ protected: private: Q_DECLARE_PRIVATE(QColumnViewGrip) - Q_DISABLE_COPY(QColumnViewGrip) + Q_DISABLE_COPY_MOVE(QColumnViewGrip) }; class QColumnViewGripPrivate : public QWidgetPrivate diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp index 1f0dbff7a9..125ee73194 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.cpp +++ b/src/widgets/itemviews/qdatawidgetmapper.cpp @@ -324,6 +324,7 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed() QDataWidgetMapper::QDataWidgetMapper(QObject *parent) : QObject(*new QDataWidgetMapperPrivate, parent) { + // ### Qt6: QStyledItemDelegate setItemDelegate(new QItemDelegate(this)); } diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp index 78fc623fb5..b94c31fb42 100644 --- a/src/widgets/itemviews/qdirmodel.cpp +++ b/src/widgets/itemviews/qdirmodel.cpp @@ -1252,11 +1252,10 @@ void QDirModelPrivate::restorePersistentIndexes() for (const SavedPersistent &sp : qAsConst(savedPersistent)) { QPersistentModelIndexData *data = sp.data; QModelIndex idx = q->index(sp.path, sp.column); - if (idx != data->index || data->model == 0) { + if (idx != data->index || data->index.model() == nullptr) { //data->model may be equal to 0 if the model is getting destroyed persistent.indexes.remove(data->index); data->index = idx; - data->model = q; if (idx.isValid()) persistent.indexes.insert(idx, data); } diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp index 7bfa51337d..62abf56751 100644 --- a/src/widgets/itemviews/qheaderview.cpp +++ b/src/widgets/itemviews/qheaderview.cpp @@ -2321,9 +2321,10 @@ void QHeaderView::initializeSections() if (stretchLastSection()) // we've already gotten the size hint d->maybeRestorePrevLastSectionAndStretchLast(); - //make sure we update the hidden sections + // make sure we update the hidden sections + // simulate remove from newCount to oldCount if (newCount < oldCount) - d->updateHiddenSections(0, newCount-1); + d->updateHiddenSections(newCount, oldCount); } } @@ -3116,9 +3117,25 @@ void QHeaderView::scrollContentsBy(int dx, int dy) \reimp \internal */ -void QHeaderView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &) +void QHeaderView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) { Q_D(QHeaderView); + if (!roles.isEmpty()) { + const auto doesRoleAffectSize = [](int role) -> bool { + switch (role) { + case Qt::DisplayRole: + case Qt::DecorationRole: + case Qt::SizeHintRole: + case Qt::FontRole: + return true; + default: + // who knows what a subclass or custom style might do + return role >= Qt::UserRole; + } + }; + if (std::none_of(roles.begin(), roles.end(), doesRoleAffectSize)) + return; + } d->invalidateCachedSizeHint(); if (d->hasAutoResizeSections()) { bool resizeRequired = d->globalResizeMode == ResizeToContents; @@ -3874,9 +3891,9 @@ void QHeaderViewPrivate::updateDefaultSectionSizeFromStyle() void QHeaderViewPrivate::recalcSectionStartPos() const // linear (but fast) { int pixelpos = 0; - for (QVector<SectionItem>::const_iterator i = sectionItems.constBegin(); i != sectionItems.constEnd(); ++i) { - i->calculated_startpos = pixelpos; // write into const mutable - pixelpos += i->size; + for (const SectionItem &i : sectionItems) { + i.calculated_startpos = pixelpos; // write into const mutable + pixelpos += i.size; } sectionStartposRecalc = false; } diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index dff4cc4593..6e57e0c32b 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -266,7 +266,7 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const \row \li \l Qt::AccessibleDescriptionRole \li QString \row \li \l Qt::AccessibleTextRole \li QString \endomit - \row \li \l Qt::BackgroundRole \li QBrush + \row \li \l Qt::BackgroundRole \li QBrush (\since 4.2) \row \li \l Qt::BackgroundColorRole \li QColor (obsolete; use Qt::BackgroundRole instead) \row \li \l Qt::CheckStateRole \li Qt::CheckState \row \li \l Qt::DecorationRole \li QIcon, QPixmap and QColor @@ -278,7 +278,7 @@ QSizeF QItemDelegatePrivate::doTextLayout(int lineWidth) const \row \li \l Qt::StatusTipRole \li \endomit \row \li \l Qt::TextAlignmentRole \li Qt::Alignment - \row \li \l Qt::ForegroundRole \li QBrush + \row \li \l Qt::ForegroundRole \li QBrush (\since 4.2) \row \li \l Qt::TextColorRole \li QColor (obsolete; use Qt::ForegroundRole instead) \omit \row \li \l Qt::ToolTipRole @@ -724,8 +724,8 @@ void QItemDelegate::drawDecoration(QPainter *painter, const QStyleOptionViewItem QPoint p = QStyle::alignedRect(option.direction, option.decorationAlignment, pixmap.size(), rect).topLeft(); if (option.state & QStyle::State_Selected) { - QPixmap *pm = selected(pixmap, option.palette, option.state & QStyle::State_Enabled); - painter->drawPixmap(p, *pm); + const QPixmap pm = selectedPixmap(pixmap, option.palette, option.state & QStyle::State_Enabled); + painter->drawPixmap(p, pm); } else { painter->drawPixmap(p, pixmap); } @@ -1001,17 +1001,32 @@ static QString qPixmapSerial(quint64 i, bool enabled) return QString((const QChar *)ptr, int(&arr[sizeof(arr) / sizeof(ushort)] - ptr)); } +#if QT_DEPRECATED_SINCE(5, 13) +QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const +{ + const QString key = qPixmapSerial(pixmap.cacheKey(), enabled); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + QPixmap *pm = QPixmapCache::find(key); + if (pm) + return pm; + selectedPixmap(pixmap, palette, enabled); + return QPixmapCache::find(key); +QT_WARNING_POP +} +#endif + /*! \internal Returns the selected version of the given \a pixmap using the given \a palette. The \a enabled argument decides whether the normal or disabled highlight color of the palette is used. */ -QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const +QPixmap QItemDelegate::selectedPixmap(const QPixmap &pixmap, const QPalette &palette, bool enabled) { - QString key = qPixmapSerial(pixmap.cacheKey(), enabled); - QPixmap *pm = QPixmapCache::find(key); - if (!pm) { + const QString key = qPixmapSerial(pixmap.cacheKey(), enabled); + QPixmap pm; + if (!QPixmapCache::find(key, &pm)) { QImage img = pixmap.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); QColor color = palette.color(enabled ? QPalette::Normal : QPalette::Disabled, @@ -1023,13 +1038,12 @@ QPixmap *QItemDelegate::selected(const QPixmap &pixmap, const QPalette &palette, painter.fillRect(0, 0, img.width(), img.height(), color); painter.end(); - QPixmap selected = QPixmap(QPixmap::fromImage(img)); - int n = (img.sizeInBytes() >> 10) + 1; + pm = QPixmap(QPixmap::fromImage(img)); + const int n = (img.sizeInBytes() >> 10) + 1; if (QPixmapCache::cacheLimit() < n) QPixmapCache::setCacheLimit(n); - QPixmapCache::insert(key, selected); - pm = QPixmapCache::find(key); + QPixmapCache::insert(key, pm); } return pm; } @@ -1089,7 +1103,7 @@ QRect QItemDelegate::doCheck(const QStyleOptionViewItem &option, opt.rect = bounding; const QWidget *widget = d->widget(option); // cast QStyle *style = widget ? widget->style() : QApplication::style(); - return style->subElementRect(QStyle::SE_ViewItemCheckIndicator, &opt, widget); + return style->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &opt, widget); } return QRect(); } diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index 539dec4374..e504615fb2 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -113,7 +113,12 @@ protected: const QStyleOptionViewItem &option) const; QPixmap decoration(const QStyleOptionViewItem &option, const QVariant &variant) const; + +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use selectedPixmap() instead") QPixmap *selected(const QPixmap &pixmap, const QPalette &palette, bool enabled) const; +#endif + static QPixmap selectedPixmap(const QPixmap &pixmap, const QPalette &palette, bool enabled); QRect doCheck(const QStyleOptionViewItem &option, const QRect &bounding, const QVariant &variant) const; diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp index 0986da9707..43dd004530 100644 --- a/src/widgets/itemviews/qitemeditorfactory.cpp +++ b/src/widgets/itemviews/qitemeditorfactory.cpp @@ -122,7 +122,7 @@ Q_SIGNALS: \inmodule QtWidgets When editing data in an item view, editors are created and - displayed by a delegate. QItemDelegate, which is the delegate by + displayed by a delegate. QStyledItemDelegate, which is the delegate by default installed on Qt's item views, uses a QItemEditorFactory to create editors for it. A default unique instance provided by QItemEditorFactory is used by all item delegates. If you set a @@ -156,7 +156,7 @@ Q_SIGNALS: Additional editors can be registered with the registerEditor() function. - \sa QItemDelegate, {Model/View Programming}, {Color Editor Factory Example} + \sa QStyledItemDelegate, {Model/View Programming}, {Color Editor Factory Example} */ /*! @@ -375,7 +375,7 @@ void QItemEditorFactory::setDefaultFactory(QItemEditorFactory *factory) QItemEditorCreatorBase objects are specialized widget factories that provide editor widgets for one particular QVariant data type. They are used by QItemEditorFactory to create editors for - \l{QItemDelegate}s. Creator bases must be registered with + \l{QStyledItemDelegate}s. Creator bases must be registered with QItemEditorFactory::registerEditor(). An editor should provide a user property for the data it edits. @@ -457,7 +457,7 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase() \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 1 The constructor takes the name of the property that contains the - editing data. QItemDelegate can then access the property by name + editing data. QStyledItemDelegate can then access the property by name when it sets and retrieves editing data. Only use this class if your editor does not define a user property (using the USER keyword in the Q_PROPERTY macro). If the widget has a user @@ -472,7 +472,7 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase() Constructs an editor creator object using \a valuePropertyName as the name of the property to be used for editing. The - property name is used by QItemDelegate when setting and + property name is used by QStyledItemDelegate when setting and getting editor data. Note that the \a valuePropertyName is only used if the editor @@ -508,11 +508,11 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase() \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 2 Setting the \c editorFactory created above in an item delegate via - QItemDelegate::setItemEditorFactory() makes sure that all values of type + QStyledItemDelegate::setItemEditorFactory() makes sure that all values of type QVariant::DateTime will be edited in \c{MyFancyDateTimeEdit}. The editor must provide a user property that will contain the - editing data. The property is used by \l{QItemDelegate}s to set + editing data. The property is used by \l{QStyledItemDelegate}s to set and retrieve the data (using Qt's \l{Meta-Object System}{meta-object system}). You set the user property with the USER keyword: @@ -520,7 +520,7 @@ QItemEditorCreatorBase::~QItemEditorCreatorBase() \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 3 \sa QItemEditorCreatorBase, QItemEditorCreator, - QItemEditorFactory, QItemDelegate, {Color Editor Factory Example} + QItemEditorFactory, QStyledItemDelegate, {Color Editor Factory Example} */ /*! diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp index 6b5857f1ca..e7b2aaec29 100644 --- a/src/widgets/itemviews/qlistview.cpp +++ b/src/widgets/itemviews/qlistview.cpp @@ -2263,8 +2263,8 @@ int QListModeViewBase::verticalScrollToValue(int index, QListView::ScrollHint hi } else { int scrollBarValue = verticalScrollBar()->value(); int numHidden = 0; - for (int i = 0; i < flowPositions.count() - 1 && i <= scrollBarValue; ++i) - if (isHidden(i)) + for (const auto &idx : qAsConst(dd->hiddenRows)) + if (idx.row() <= scrollBarValue) ++numHidden; value = qBound(0, scrollValueMap.at(verticalScrollBar()->value()) - numHidden, flowPositions.count() - 1); } @@ -2704,21 +2704,24 @@ int QListModeViewBase::perItemScrollToValue(int index, int scrollValue, int view return scrollValue; itemExtent += spacing(); - QVector<int> visibleFlowPositions; - visibleFlowPositions.reserve(flowPositions.count() - 1); - for (int i = 0; i < flowPositions.count() - 1; i++) { // flowPositions count is +1 larger than actual row count - if (!isHidden(i)) - visibleFlowPositions.append(flowPositions.at(i)); - } - + QVector<int> hiddenRows = dd->hiddenRowIds(); + std::sort(hiddenRows.begin(), hiddenRows.end()); + int hiddenRowsBefore = 0; + for (int i = 0; i < hiddenRows.size() - 1; ++i) + if (hiddenRows.at(i) > index + hiddenRowsBefore) + break; + else + ++hiddenRowsBefore; if (!wrap) { int topIndex = index; const int bottomIndex = topIndex; - const int bottomCoordinate = visibleFlowPositions.at(index); - + const int bottomCoordinate = flowPositions.at(index + hiddenRowsBefore); while (topIndex > 0 && - (bottomCoordinate - visibleFlowPositions.at(topIndex - 1) + itemExtent) <= (viewportSize)) { + (bottomCoordinate - flowPositions.at(topIndex + hiddenRowsBefore - 1) + itemExtent) <= (viewportSize)) { topIndex--; + // will the next one be a hidden row -> skip + while (hiddenRowsBefore > 0 && hiddenRows.at(hiddenRowsBefore - 1) >= topIndex + hiddenRowsBefore - 1) + hiddenRowsBefore--; } const int itemCount = bottomIndex - topIndex + 1; @@ -2737,7 +2740,7 @@ int QListModeViewBase::perItemScrollToValue(int index, int scrollValue, int view ? Qt::Horizontal : Qt::Vertical); if (flowOrientation == orientation) { // scrolling in the "flow" direction // ### wrapped scrolling in the flow direction - return visibleFlowPositions.at(index); // ### always pixel based for now + return flowPositions.at(index + hiddenRowsBefore); // ### always pixel based for now } else if (!segmentStartRows.isEmpty()) { // we are scrolling in the "segment" direction int segment = qBinarySearch<int>(segmentStartRows, index, 0, segmentStartRows.count() - 1); int leftSegment = segment; @@ -3371,9 +3374,9 @@ int QListView::visualIndex(const QModelIndex &index) const d->executePostedLayout(); QListViewItem itm = d->indexToListViewItem(index); int visualIndex = d->commonListView->itemIndex(itm); - for (int row = 0; row <= index.row() && visualIndex >= 0; row++) { - if (d->isHidden(row)) - visualIndex--; + for (const auto &idx : qAsConst(d->hiddenRows)) { + if (idx.row() <= index.row()) + --visualIndex; } return visualIndex; } diff --git a/src/widgets/itemviews/qlistview_p.h b/src/widgets/itemviews/qlistview_p.h index 181386d4d0..3f997ef7e3 100644 --- a/src/widgets/itemviews/qlistview_p.h +++ b/src/widgets/itemviews/qlistview_p.h @@ -377,6 +377,14 @@ public: QModelIndex idx = model->index(row, 0, root); return isPersistent(idx) && hiddenRows.contains(idx); } + // helper to avoid checking for isPersistent and creating persistent indexes as above in isHidden + QVector<int> hiddenRowIds() const { + QVector<int> rowIds; + rowIds.reserve(hiddenRows.size()); + for (const auto &idx : hiddenRows) + rowIds += idx.row(); + return rowIds; + } inline bool isHiddenOrDisabled(int row) const { return isHidden(row) || !isIndexEnabled(modelIndex(row)); } void removeCurrentAndDisabled(QVector<QModelIndex> *indexes, const QModelIndex ¤t) const; diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp index b9c0e0a4b7..a9899983c2 100644 --- a/src/widgets/itemviews/qlistwidget.cpp +++ b/src/widgets/itemviews/qlistwidget.cpp @@ -227,6 +227,22 @@ bool QListModel::setData(const QModelIndex &index, const QVariant &value, int ro return true; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QListModel::clearItemData(const QModelIndex &index) +{ + if (!checkIndex(index, CheckIndexOption::IndexIsValid)) + return false; + QListWidgetItem *item = items.at(index.row()); + const auto beginIter = item->d->values.cbegin(); + const auto endIter = item->d->values.cend(); + if (std::all_of(beginIter, endIter, [](const QWidgetItemData& data) -> bool { return !data.value.isValid(); })) + return true; //it's already cleared + item->d->values.clear(); + emit dataChanged(index, index, QVector<int>{}); + return true; +} +#endif + QMap<int, QVariant> QListModel::itemData(const QModelIndex &index) const { QMap<int, QVariant> roles; @@ -277,6 +293,30 @@ bool QListModel::removeRows(int row, int count, const QModelIndex &parent) return true; } +/*! + \since 5.13 + \reimp +*/ +bool QListModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) +{ + if (sourceRow < 0 + || sourceRow + count - 1 >= rowCount(sourceParent) + || destinationChild <= 0 + || destinationChild > rowCount(destinationParent) + || sourceRow == destinationChild - 1 + || count <= 0) { + return false; + } + if (!beginMoveRows(QModelIndex(), sourceRow, sourceRow + count - 1, QModelIndex(), destinationChild)) + return false; + destinationChild--; + const int fromRow = destinationChild < sourceRow ? (sourceRow + count - 1) : sourceRow; + while (count--) + items.move(fromRow, destinationChild); + endMoveRows(); + return true; +} + Qt::ItemFlags QListModel::flags(const QModelIndex &index) const { if (!index.isValid() || index.row() >= items.count() || index.model() != this) @@ -289,7 +329,7 @@ void QListModel::sort(int column, Qt::SortOrder order) if (column != 0) return; - emit layoutAboutToBeChanged(); + emit layoutAboutToBeChanged({}, QAbstractItemModel::VerticalSortHint); QVector < QPair<QListWidgetItem*,int> > sorting(items.count()); for (int i = 0; i < items.count(); ++i) { @@ -313,7 +353,7 @@ void QListModel::sort(int column, Qt::SortOrder order) } changePersistentIndexList(fromIndexes, toIndexes); - emit layoutChanged(); + emit layoutChanged({}, QAbstractItemModel::VerticalSortHint); } /** @@ -543,24 +583,6 @@ Qt::DropActions QListModel::supportedDropActions() const */ /*! - \fn void QListWidgetItem::setSelected(bool select) - \since 4.2 - - Sets the selected state of the item to \a select. - - \sa isSelected() -*/ - -/*! - \fn bool QListWidgetItem::isSelected() const - \since 4.2 - - Returns \c true if the item is selected; otherwise returns \c false. - - \sa setSelected() -*/ - -/*! \fn void QListWidgetItem::setHidden(bool hide) \since 4.2 @@ -594,14 +616,14 @@ Qt::DropActions QListModel::supportedDropActions() const \sa type() */ -QListWidgetItem::QListWidgetItem(QListWidget *view, int type) - : rtti(type), view(view), d(new QListWidgetItemPrivate(this)), +QListWidgetItem::QListWidgetItem(QListWidget *listview, int type) + : rtti(type), view(listview), d(new QListWidgetItemPrivate(this)), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled |Qt::ItemIsDragEnabled) { - if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0)) + if (QListModel *model = listModel()) model->insert(model->rowCount(), this); } @@ -621,16 +643,18 @@ QListWidgetItem::QListWidgetItem(QListWidget *view, int type) \sa type() */ -QListWidgetItem::QListWidgetItem(const QString &text, QListWidget *view, int type) - : rtti(type), view(0), d(new QListWidgetItemPrivate(this)), +QListWidgetItem::QListWidgetItem(const QString &text, QListWidget *listview, int type) + : rtti(type), view(listview), d(new QListWidgetItemPrivate(this)), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled |Qt::ItemIsDragEnabled) { - setData(Qt::DisplayRole, text); - this->view = view; - if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0)) + { + QSignalBlocker b(view); + setData(Qt::DisplayRole, text); + } + if (QListModel *model = listModel()) model->insert(model->rowCount(), this); } @@ -652,17 +676,19 @@ QListWidgetItem::QListWidgetItem(const QString &text, QListWidget *view, int typ \sa type() */ QListWidgetItem::QListWidgetItem(const QIcon &icon,const QString &text, - QListWidget *view, int type) - : rtti(type), view(0), d(new QListWidgetItemPrivate(this)), + QListWidget *listview, int type) + : rtti(type), view(listview), d(new QListWidgetItemPrivate(this)), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled |Qt::ItemIsDragEnabled) { - setData(Qt::DisplayRole, text); - setData(Qt::DecorationRole, icon); - this->view = view; - if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0)) + { + QSignalBlocker b(view); + setData(Qt::DisplayRole, text); + setData(Qt::DecorationRole, icon); + } + if (QListModel *model = listModel()) model->insert(model->rowCount(), this); } @@ -671,7 +697,7 @@ QListWidgetItem::QListWidgetItem(const QIcon &icon,const QString &text, */ QListWidgetItem::~QListWidgetItem() { - if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0)) + if (QListModel *model = listModel()) model->remove(this); delete d; } @@ -708,7 +734,7 @@ void QListWidgetItem::setData(int role, const QVariant &value) } if (!found) d->values.append(QWidgetItemData(role, value)); - if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : nullptr)) { + if (QListModel *model = listModel()) { const QVector<int> roles((role == Qt::DisplayRole) ? QVector<int>({Qt::DisplayRole, Qt::EditRole}) : QVector<int>({role})); @@ -775,7 +801,7 @@ void QListWidgetItem::write(QDataStream &out) const \sa data(), flags() */ QListWidgetItem::QListWidgetItem(const QListWidgetItem &other) - : rtti(Type), view(0), + : rtti(Type), view(nullptr), d(new QListWidgetItemPrivate(this)), itemFlags(other.itemFlags) { @@ -797,6 +823,15 @@ QListWidgetItem &QListWidgetItem::operator=(const QListWidgetItem &other) return *this; } +/*! + \internal + returns the QListModel if a view is set + */ +QListModel *QListWidgetItem::listModel() const +{ + return (view ? qobject_cast<QListModel*>(view->model()) : nullptr); +} + #ifndef QT_NO_DATASTREAM /*! @@ -949,6 +984,50 @@ QDataStream &operator>>(QDataStream &in, QListWidgetItem &item) */ /*! + \fn void QListWidgetItem::setSelected(bool select) + \since 4.2 + + Sets the selected state of the item to \a select. + + \sa isSelected() +*/ +void QListWidgetItem::setSelected(bool select) +{ + const QListModel *model = listModel(); + if (!model || !view->selectionModel()) + return; + const QAbstractItemView::SelectionMode selectionMode = view->selectionMode(); + if (selectionMode == QAbstractItemView::NoSelection) + return; + const QModelIndex index = model->index(this); + if (selectionMode == QAbstractItemView::SingleSelection) + view->selectionModel()->select(index, select + ? QItemSelectionModel::ClearAndSelect + : QItemSelectionModel::Deselect); + else + view->selectionModel()->select(index, select + ? QItemSelectionModel::Select + : QItemSelectionModel::Deselect); +} + +/*! + \fn bool QListWidgetItem::isSelected() const + \since 4.2 + + Returns \c true if the item is selected; otherwise returns \c false. + + \sa setSelected() +*/ +bool QListWidgetItem::isSelected() const +{ + const QListModel *model = listModel(); + if (!model || !view->selectionModel()) + return false; + const QModelIndex index = model->index(this); + return view->selectionModel()->isSelected(index); +} + +/*! \fn void QListWidgetItem::setFlags(Qt::ItemFlags flags) Sets the item flags for the list item to \a flags. @@ -958,7 +1037,7 @@ QDataStream &operator>>(QDataStream &in, QListWidgetItem &item) void QListWidgetItem::setFlags(Qt::ItemFlags aflags) { itemFlags = aflags; - if (QListModel *model = (view ? qobject_cast<QListModel*>(view->model()) : 0)) + if (QListModel *model = listModel()) model->itemChanged(this); } @@ -1678,7 +1757,7 @@ QWidget *QListWidget::itemWidget(QListWidgetItem *item) const This function should only be used to display static content in the place of a list widget item. If you want to display custom dynamic content or - implement a custom editor widget, use QListView and subclass QItemDelegate + implement a custom editor widget, use QListView and subclass QStyledItemDelegate instead. \sa itemWidget(), removeItemWidget(), {Delegate Classes} @@ -1690,6 +1769,7 @@ void QListWidget::setItemWidget(QListWidgetItem *item, QWidget *widget) QAbstractItemView::setIndexWidget(index, widget); } +#if QT_DEPRECATED_SINCE(5, 13) /*! Returns \c true if \a item is selected; otherwise returns \c false. @@ -1699,9 +1779,7 @@ void QListWidget::setItemWidget(QListWidgetItem *item, QWidget *widget) */ bool QListWidget::isItemSelected(const QListWidgetItem *item) const { - Q_D(const QListWidget); - QModelIndex index = d->listModel()->index(const_cast<QListWidgetItem*>(item)); - return selectionModel()->isSelected(index); + return ((item && item->listWidget() == this) ? item->isSelected() : false); } /*! @@ -1714,20 +1792,10 @@ bool QListWidget::isItemSelected(const QListWidgetItem *item) const */ void QListWidget::setItemSelected(const QListWidgetItem *item, bool select) { - Q_D(QListWidget); - QModelIndex index = d->listModel()->index(const_cast<QListWidgetItem*>(item)); - - if (d->selectionMode == SingleSelection) { - selectionModel()->select(index, select - ? QItemSelectionModel::ClearAndSelect - : QItemSelectionModel::Deselect); - } else if (d->selectionMode != NoSelection) { - selectionModel()->select(index, select - ? QItemSelectionModel::Select - : QItemSelectionModel::Deselect); - } - + if (item && item->listWidget() == this) + const_cast<QListWidgetItem*>(item)->setSelected(select); } +#endif /*! Returns a list of all selected items in the list widget. @@ -1763,6 +1831,7 @@ QList<QListWidgetItem*> QListWidget::findItems(const QString &text, Qt::MatchFla return items; } +#if QT_DEPRECATED_SINCE(5, 13) /*! Returns \c true if the \a item is explicitly hidden; otherwise returns \c false. @@ -1786,6 +1855,7 @@ void QListWidget::setItemHidden(const QListWidgetItem *item, bool hide) { setRowHidden(row(item), hide); } +#endif /*! Scrolls the view if necessary to ensure that the \a item is visible. diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 947fdb1a2f..c093d13e6d 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -61,10 +61,10 @@ class Q_WIDGETS_EXPORT QListWidgetItem friend class QListWidget; public: enum ItemType { Type = 0, UserType = 1000 }; - explicit QListWidgetItem(QListWidget *view = nullptr, int type = Type); - explicit QListWidgetItem(const QString &text, QListWidget *view = nullptr, int type = Type); + explicit QListWidgetItem(QListWidget *listview = nullptr, int type = Type); + explicit QListWidgetItem(const QString &text, QListWidget *listview = nullptr, int type = Type); explicit QListWidgetItem(const QIcon &icon, const QString &text, - QListWidget *view = nullptr, int type = Type); + QListWidget *listview = nullptr, int type = Type); QListWidgetItem(const QListWidgetItem &other); virtual ~QListWidgetItem(); @@ -72,8 +72,8 @@ public: inline QListWidget *listWidget() const { return view; } - inline void setSelected(bool select); - inline bool isSelected() const; + void setSelected(bool select); + bool isSelected() const; inline void setHidden(bool hide); inline bool isHidden() const; @@ -114,20 +114,28 @@ public: inline void setTextAlignment(int alignment) { setData(Qt::TextAlignmentRole, alignment); } +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QListWidgetItem::background() instead") inline QColor backgroundColor() const - { return qvariant_cast<QColor>(data(Qt::BackgroundColorRole)); } + { return qvariant_cast<QColor>(data(Qt::BackgroundRole)); } + QT_DEPRECATED_X ("Use QListWidgetItem::setBackground() instead") virtual void setBackgroundColor(const QColor &color) - { setData(Qt::BackgroundColorRole, color); } + { setData(Qt::BackgroundRole, color); } +#endif inline QBrush background() const { return qvariant_cast<QBrush>(data(Qt::BackgroundRole)); } inline void setBackground(const QBrush &brush) { setData(Qt::BackgroundRole, brush); } +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QListWidgetItem::foreground() instead") inline QColor textColor() const - { return qvariant_cast<QColor>(data(Qt::TextColorRole)); } + { return qvariant_cast<QColor>(data(Qt::ForegroundRole)); } + QT_DEPRECATED_X ("Use QListWidgetItem::setForeground() instead") inline void setTextColor(const QColor &color) - { setData(Qt::TextColorRole, color); } + { setData(Qt::ForegroundRole, color); } +#endif inline QBrush foreground() const { return qvariant_cast<QBrush>(data(Qt::ForegroundRole)); } @@ -158,6 +166,7 @@ public: inline int type() const { return rtti; } private: + QListModel *listModel() const; int rtti; QVector<void *> dummy; QListWidget *view; @@ -246,13 +255,21 @@ public: void setItemWidget(QListWidgetItem *item, QWidget *widget); inline void removeItemWidget(QListWidgetItem *item); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QListWidgetItem::isSelected() instead") bool isItemSelected(const QListWidgetItem *item) const; + QT_DEPRECATED_X ("Use QListWidgetItem::setSelected() instead") void setItemSelected(const QListWidgetItem *item, bool select); +#endif QList<QListWidgetItem*> selectedItems() const; QList<QListWidgetItem*> findItems(const QString &text, Qt::MatchFlags flags) const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QListWidgetItem::isHidden() instead") bool isItemHidden(const QListWidgetItem *item) const; + QT_DEPRECATED_X ("Use QListWidgetItem::setHidden() instead") void setItemHidden(const QListWidgetItem *item, bool hide); +#endif #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) protected: #endif @@ -331,17 +348,11 @@ inline void QListWidget::addItem(QListWidgetItem *aitem) inline QListWidgetItem *QListWidget::itemAt(int ax, int ay) const { return itemAt(QPoint(ax, ay)); } -inline void QListWidgetItem::setSelected(bool aselect) -{ if (view) view->setItemSelected(this, aselect); } - -inline bool QListWidgetItem::isSelected() const -{ return (view ? view->isItemSelected(this) : false); } - inline void QListWidgetItem::setHidden(bool ahide) -{ if (view) view->setItemHidden(this, ahide); } +{ if (view) view->setRowHidden(view->row(this), ahide); } inline bool QListWidgetItem::isHidden() const -{ return (view ? view->isItemHidden(this) : false); } +{ return (view ? view->isRowHidden(view->row(this)) : false); } QT_END_NAMESPACE diff --git a/src/widgets/itemviews/qlistwidget_p.h b/src/widgets/itemviews/qlistwidget_p.h index 9cb3d5966b..65a7124322 100644 --- a/src/widgets/itemviews/qlistwidget_p.h +++ b/src/widgets/itemviews/qlistwidget_p.h @@ -100,11 +100,15 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool clearItemData(const QModelIndex &index) override; +#endif QMap<int, QVariant> itemData(const QModelIndex &index) const override; bool insertRows(int row, int count = 1, const QModelIndex &parent = QModelIndex()) override; bool removeRows(int row, int count = 1, const QModelIndex &parent = QModelIndex()) override; + bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override; Qt::ItemFlags flags(const QModelIndex &index) const override; diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index 0f7566e8ec..22067851cb 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -139,7 +139,7 @@ public: \row \li \l Qt::AccessibleDescriptionRole \li QString \row \li \l Qt::AccessibleTextRole \li QString \endomit - \row \li \l Qt::BackgroundRole \li QBrush + \row \li \l Qt::BackgroundRole \li QBrush (\since 4.2) \row \li \l Qt::BackgroundColorRole \li QColor (obsolete; use Qt::BackgroundRole instead) \row \li \l Qt::CheckStateRole \li Qt::CheckState \row \li \l Qt::DecorationRole \li QIcon, QPixmap, QImage and QColor @@ -151,7 +151,7 @@ public: \row \li \l Qt::StatusTipRole \li \endomit \row \li \l Qt::TextAlignmentRole \li Qt::Alignment - \row \li \l Qt::ForegroundRole \li QBrush + \row \li \l Qt::ForegroundRole \li QBrush (\since 4.2) \row \li \l Qt::TextColorRole \li QColor (obsolete; use Qt::ForegroundRole instead) \omit \row \li \l Qt::ToolTipRole diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index 9c509583e6..dd43c6d3e4 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -138,20 +138,21 @@ void QSpanCollection::updateSpan(QSpanCollection::Span *span, int old_height) } /** \internal - * \return a spans that spans over cell x,y (column,row) or 0 if there is none. + * \return a spans that spans over cell x,y (column,row) + * or \nullptr if there is none. */ QSpanCollection::Span *QSpanCollection::spanAt(int x, int y) const { Index::const_iterator it_y = index.lowerBound(-y); if (it_y == index.end()) - return 0; + return nullptr; SubIndex::const_iterator it_x = (*it_y).lowerBound(-x); if (it_x == (*it_y).end()) - return 0; + return nullptr; Span *span = *it_x; if (span->right() >= x && span->bottom() >= y) return span; - return 0; + return nullptr; } @@ -964,6 +965,15 @@ void QTableViewPrivate::_q_updateSpanRemovedColumns(const QModelIndex &parent, i /*! \internal + Sort the model when the header sort indicator changed +*/ +void QTableViewPrivate::_q_sortIndicatorChanged(int column, Qt::SortOrder order) +{ + model->sort(column, order); +} + +/*! + \internal Draws a table cell. */ void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) @@ -1099,7 +1109,7 @@ int QTableViewPrivate::heightHintForIndex(const QModelIndex &index, int hint, QS \l showGrid property. The items shown in a table view, like those in the other item views, are - rendered and edited using standard \l{QItemDelegate}{delegates}. However, + rendered and edited using standard \l{QStyledItemDelegate}{delegates}. However, for some tasks it is sometimes useful to be able to insert widgets in a table instead. Widgets are set for particular indexes with the \l{QAbstractItemView::}{setIndexWidget()} function, and @@ -1171,8 +1181,6 @@ QSize QTableView::viewportSizeHint() const Q_D(const QTableView); QSize result( (d->verticalHeader->isHidden() ? 0 : d->verticalHeader->width()) + d->horizontalHeader->length(), (d->horizontalHeader->isHidden() ? 0 : d->horizontalHeader->height()) + d->verticalHeader->length()); - result += QSize(verticalScrollBar()->isVisible() ? verticalScrollBar()->width() : 0, - horizontalScrollBar()->isVisible() ? horizontalScrollBar()->height() : 0); return result; } @@ -1443,12 +1451,12 @@ void QTableView::paintEvent(QPaintEvent *event) //firstVisualRow is the visual index of the first visible row. lastVisualRow is the visual index of the last visible Row. //same goes for ...VisualColumn int firstVisualRow = qMax(verticalHeader->visualIndexAt(0),0); - int lastVisualRow = verticalHeader->visualIndexAt(verticalHeader->viewport()->height()); + int lastVisualRow = verticalHeader->visualIndexAt(verticalHeader->height()); if (lastVisualRow == -1) lastVisualRow = d->model->rowCount(d->root) - 1; int firstVisualColumn = horizontalHeader->visualIndexAt(0); - int lastVisualColumn = horizontalHeader->visualIndexAt(horizontalHeader->viewport()->width()); + int lastVisualColumn = horizontalHeader->visualIndexAt(horizontalHeader->width()); if (rightToLeft) qSwap(firstVisualColumn, lastVisualColumn); if (firstVisualColumn == -1) @@ -2634,25 +2642,27 @@ void QTableView::setColumnHidden(int column, bool hide) void QTableView::setSortingEnabled(bool enable) { Q_D(QTableView); - d->sortingEnabled = enable; horizontalHeader()->setSortIndicatorShown(enable); if (enable) { disconnect(d->horizontalHeader, SIGNAL(sectionEntered(int)), this, SLOT(_q_selectColumn(int))); disconnect(horizontalHeader(), SIGNAL(sectionPressed(int)), this, SLOT(selectColumn(int))); - connect(horizontalHeader(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), - this, SLOT(sortByColumn(int)), Qt::UniqueConnection); + //sortByColumn has to be called before we connect or set the sortingEnabled flag + // because otherwise it will not call sort on the model. sortByColumn(horizontalHeader()->sortIndicatorSection(), horizontalHeader()->sortIndicatorOrder()); + connect(horizontalHeader(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), + this, SLOT(_q_sortIndicatorChanged(int,Qt::SortOrder)), Qt::UniqueConnection); } else { connect(d->horizontalHeader, SIGNAL(sectionEntered(int)), this, SLOT(_q_selectColumn(int)), Qt::UniqueConnection); connect(horizontalHeader(), SIGNAL(sectionPressed(int)), this, SLOT(selectColumn(int)), Qt::UniqueConnection); disconnect(horizontalHeader(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), - this, SLOT(sortByColumn(int))); + this, SLOT(_q_sortIndicatorChanged(int,Qt::SortOrder))); } + d->sortingEnabled = enable; } bool QTableView::isSortingEnabled() const @@ -3181,19 +3191,21 @@ void QTableView::resizeColumnsToContents() d->horizontalHeader->resizeSections(QHeaderView::ResizeToContents); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete \overload + This function is deprecated. Use + sortByColumn(int column, Qt::SortOrder order) instead. Sorts the model by the values in the given \a column. */ void QTableView::sortByColumn(int column) { Q_D(QTableView); - if (column == -1) - return; - d->model->sort(column, d->horizontalHeader->sortIndicatorOrder()); + sortByColumn(column, d->horizontalHeader->sortIndicatorOrder()); } +#endif /*! \since 4.2 @@ -3205,8 +3217,14 @@ void QTableView::sortByColumn(int column) void QTableView::sortByColumn(int column, Qt::SortOrder order) { Q_D(QTableView); + if (column < 0) + return; + // If sorting is enabled it will emit a signal connected to + // _q_sortIndicatorChanged, which then actually sorts d->horizontalHeader->setSortIndicator(column, order); - sortByColumn(column); + // If sorting is not enabled, force to sort now + if (!d->sortingEnabled) + d->model->sort(column, order); } /*! diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index 60c2f34103..3275c09f88 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -118,7 +118,6 @@ public: int columnSpan(int row, int column) const; void clearSpans(); - void sortByColumn(int column, Qt::SortOrder order); public Q_SLOTS: void selectRow(int row); @@ -131,7 +130,11 @@ public Q_SLOTS: void resizeRowsToContents(); void resizeColumnToContents(int column); void resizeColumnsToContents(); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTableView::sortByColumn(int column, Qt::SortOrder order) instead") void sortByColumn(int column); +#endif + void sortByColumn(int column, Qt::SortOrder order); void setShowGrid(bool show); protected Q_SLOTS: @@ -188,6 +191,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_updateSpanInsertedColumns(QModelIndex,int,int)) Q_PRIVATE_SLOT(d_func(), void _q_updateSpanRemovedRows(QModelIndex,int,int)) Q_PRIVATE_SLOT(d_func(), void _q_updateSpanRemovedColumns(QModelIndex,int,int)) + Q_PRIVATE_SLOT(d_func(), void _q_sortIndicatorChanged(int column, Qt::SortOrder order)) }; QT_END_NAMESPACE diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h index a50e6b6410..d55462c28b 100644 --- a/src/widgets/itemviews/qtableview_p.h +++ b/src/widgets/itemviews/qtableview_p.h @@ -257,6 +257,7 @@ public: void _q_updateSpanInsertedColumns(const QModelIndex &parent, int start, int end); void _q_updateSpanRemovedRows(const QModelIndex &parent, int start, int end); void _q_updateSpanRemovedColumns(const QModelIndex &parent, int start, int end); + void _q_sortIndicatorChanged(int column, Qt::SortOrder order); }; QT_END_NAMESPACE diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp index eee3e91ac3..f99d69d37c 100644 --- a/src/widgets/itemviews/qtablewidget.cpp +++ b/src/widgets/itemviews/qtablewidget.cpp @@ -189,7 +189,7 @@ void QTableModel::setItem(int row, int column, QTableWidgetItem *item) sortedRow = qMax((int)(it - colItems.begin()), 0); } if (sortedRow != row) { - emit layoutAboutToBeChanged(); + emit layoutAboutToBeChanged({}, QAbstractItemModel::VerticalSortHint); // move the items @ row to sortedRow int cc = columnCount(); QVector<QTableWidgetItem*> rowItems(cc); @@ -209,7 +209,7 @@ void QTableModel::setItem(int row, int column, QTableWidgetItem *item) changePersistentIndexList(oldPersistentIndexes, newPersistentIndexes); - emit layoutChanged(); + emit layoutChanged({}, QAbstractItemModel::VerticalSortHint); return; } } @@ -480,6 +480,24 @@ bool QTableModel::setItemData(const QModelIndex &index, const QMap<int, QVariant return true; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QTableModel::clearItemData(const QModelIndex &index) +{ + if (!checkIndex(index, CheckIndexOption::IndexIsValid)) + return false; + QTableWidgetItem *itm = item(index); + if (!itm) + return false; + const auto beginIter = itm->values.cbegin(); + const auto endIter = itm->values.cend(); + if (std::all_of(beginIter, endIter, [](const QWidgetItemData& data) -> bool { return !data.value.isValid(); })) + return true; //it's already cleared + itm->values.clear(); + emit dataChanged(index, index, QVector<int>{}); + return true; +} +#endif + Qt::ItemFlags QTableModel::flags(const QModelIndex &index) const { if (!index.isValid()) @@ -530,12 +548,12 @@ void QTableModel::sort(int column, Qt::SortOrder order) } } - emit layoutAboutToBeChanged(); + emit layoutAboutToBeChanged({}, QAbstractItemModel::VerticalSortHint); tableItems = sorted_table; changePersistentIndexList(from, to); // ### slow - emit layoutChanged(); + emit layoutChanged({}, QAbstractItemModel::VerticalSortHint); } /* @@ -580,7 +598,7 @@ void QTableModel::ensureSorted(int column, Qt::SortOrder order, vit = colItems.insert(vit, item); if (newRow != oldRow) { if (!changed) { - emit layoutAboutToBeChanged(); + emit layoutAboutToBeChanged({}, QAbstractItemModel::VerticalSortHint); oldPersistentIndexes = persistentIndexList(); newPersistentIndexes = oldPersistentIndexes; changed = true; @@ -615,7 +633,7 @@ void QTableModel::ensureSorted(int column, Qt::SortOrder order, verticalHeaderItems = newVertical; changePersistentIndexList(oldPersistentIndexes, newPersistentIndexes); - emit layoutChanged(); + emit layoutChanged({}, QAbstractItemModel::VerticalSortHint); } } @@ -1037,24 +1055,6 @@ QTableWidgetSelectionRange::~QTableWidgetSelectionRange() */ /*! - \fn void QTableWidgetItem::setSelected(bool select) - \since 4.2 - - Sets the selected state of the item to \a select. - - \sa isSelected() -*/ - -/*! - \fn bool QTableWidgetItem::isSelected() const - \since 4.2 - - Returns \c true if the item is selected, otherwise returns \c false. - - \sa setSelected() -*/ - -/*! \fn QSize QTableWidgetItem::sizeHint() const \since 4.1 @@ -1091,6 +1091,44 @@ QTableWidgetSelectionRange::~QTableWidgetSelectionRange() */ /*! + \fn bool QTableWidgetItem::isSelected() const + \since 4.2 + + Returns \c true if the item is selected, otherwise returns \c false. + + \sa setSelected() +*/ +bool QTableWidgetItem::isSelected() const +{ + if (!view || !view->selectionModel()) + return false; + const QTableModel *model = qobject_cast<const QTableModel*>(view->model()); + if (!model) + return false; + const QModelIndex index = model->index(this); + return view->selectionModel()->isSelected(index); +} + +/*! + \fn void QTableWidgetItem::setSelected(bool select) + \since 4.2 + + Sets the selected state of the item to \a select. + + \sa isSelected() +*/ +void QTableWidgetItem::setSelected(bool select) +{ + if (!view || !view->selectionModel()) + return; + const QTableModel *model = qobject_cast<const QTableModel*>(view->model()); + if (!model) + return; + const QModelIndex index = model->index(this); + view->selectionModel()->select(index, select ? QItemSelectionModel::Select : QItemSelectionModel::Deselect); +} + +/*! \fn Qt::ItemFlags QTableWidgetItem::flags() const Returns the flags used to describe the item. These determine whether @@ -1110,7 +1148,7 @@ QTableWidgetSelectionRange::~QTableWidgetSelectionRange() void QTableWidgetItem::setFlags(Qt::ItemFlags aflags) { itemFlags = aflags; - if (QTableModel *model = (view ? qobject_cast<QTableModel*>(view->model()) : 0)) + if (QTableModel *model = tableModel()) model->itemChanged(this); } @@ -1301,7 +1339,7 @@ void QTableWidgetItem::setFlags(Qt::ItemFlags aflags) \sa type() */ QTableWidgetItem::QTableWidgetItem(int type) - : rtti(type), view(0), d(new QTableWidgetItemPrivate(this)), + : rtti(type), view(nullptr), d(new QTableWidgetItemPrivate(this)), itemFlags(Qt::ItemIsEditable |Qt::ItemIsSelectable |Qt::ItemIsUserCheckable @@ -1317,7 +1355,7 @@ QTableWidgetItem::QTableWidgetItem(int type) \sa type() */ QTableWidgetItem::QTableWidgetItem(const QString &text, int type) - : rtti(type), view(0), d(new QTableWidgetItemPrivate(this)), + : rtti(type), view(nullptr), d(new QTableWidgetItemPrivate(this)), itemFlags(Qt::ItemIsEditable |Qt::ItemIsSelectable |Qt::ItemIsUserCheckable @@ -1334,7 +1372,7 @@ QTableWidgetItem::QTableWidgetItem(const QString &text, int type) \sa type() */ QTableWidgetItem::QTableWidgetItem(const QIcon &icon, const QString &text, int type) - : rtti(type), view(0), d(new QTableWidgetItemPrivate(this)), + : rtti(type), view(nullptr), d(new QTableWidgetItemPrivate(this)), itemFlags(Qt::ItemIsEditable |Qt::ItemIsSelectable |Qt::ItemIsUserCheckable @@ -1351,9 +1389,8 @@ QTableWidgetItem::QTableWidgetItem(const QIcon &icon, const QString &text, int t */ QTableWidgetItem::~QTableWidgetItem() { - if (QTableModel *model = (view ? qobject_cast<QTableModel*>(view->model()) : 0)) + if (QTableModel *model = tableModel()) model->removeItem(this); - view = 0; delete d; } @@ -1389,7 +1426,7 @@ void QTableWidgetItem::setData(int role, const QVariant &value) } if (!found) values.append(QWidgetItemData(role, value)); - if (QTableModel *model = (view ? qobject_cast<QTableModel*>(view->model()) : nullptr)) + if (QTableModel *model = tableModel()) { const QVector<int> roles((role == Qt::DisplayRole) ? QVector<int>({Qt::DisplayRole, Qt::EditRole}) : @@ -1444,6 +1481,16 @@ void QTableWidgetItem::write(QDataStream &out) const } /*! + \internal + returns the QTableModel if a view is set +*/ +QTableModel *QTableWidgetItem::tableModel() const +{ + return (view ? qobject_cast<QTableModel*>(view->model()) : nullptr); +} + + +/*! \relates QTableWidgetItem Reads a table widget item from stream \a in into \a item. @@ -1486,7 +1533,7 @@ QDataStream &operator<<(QDataStream &out, const QTableWidgetItem &item) \sa data(), flags() */ QTableWidgetItem::QTableWidgetItem(const QTableWidgetItem &other) - : rtti(Type), values(other.values), view(0), + : rtti(Type), values(other.values), view(nullptr), d(new QTableWidgetItemPrivate(this)), itemFlags(other.itemFlags) { @@ -2305,6 +2352,7 @@ void QTableWidget::setCellWidget(int row, int column, QWidget *widget) QAbstractItemView::setIndexWidget(index, widget); } +#if QT_DEPRECATED_SINCE(5, 13) /*! Returns \c true if the \a item is selected, otherwise returns \c false. @@ -2315,9 +2363,7 @@ void QTableWidget::setCellWidget(int row, int column, QWidget *widget) bool QTableWidget::isItemSelected(const QTableWidgetItem *item) const { - Q_D(const QTableWidget); - QModelIndex index = d->tableModel()->index(item); - return selectionModel()->isSelected(index); + return ((item && item->tableWidget() == this) ? item->isSelected() : false); } /*! @@ -2329,10 +2375,10 @@ bool QTableWidget::isItemSelected(const QTableWidgetItem *item) const */ void QTableWidget::setItemSelected(const QTableWidgetItem *item, bool select) { - Q_D(QTableWidget); - QModelIndex index = d->tableModel()->index(item); - selectionModel()->select(index, select ? QItemSelectionModel::Select : QItemSelectionModel::Deselect); + if (item && item->tableWidget() == this) + const_cast<QTableWidgetItem*>(item)->setSelected(select); } +#endif /*! Selects or deselects the \a range depending on \a select. diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index 9de27d164f..d93032f3f0 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -92,8 +92,8 @@ public: inline int row() const; inline int column() const; - inline void setSelected(bool select); - inline bool isSelected() const; + void setSelected(bool select); + bool isSelected() const; inline Qt::ItemFlags flags() const { return itemFlags; } void setFlags(Qt::ItemFlags flags); @@ -131,20 +131,28 @@ public: inline void setTextAlignment(int alignment) { setData(Qt::TextAlignmentRole, alignment); } +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTableWidgetItem::background() instead") inline QColor backgroundColor() const - { return qvariant_cast<QColor>(data(Qt::BackgroundColorRole)); } + { return qvariant_cast<QColor>(data(Qt::BackgroundRole)); } + QT_DEPRECATED_X ("Use QTableWidgetItem::setBackground() instead") inline void setBackgroundColor(const QColor &color) - { setData(Qt::BackgroundColorRole, color); } + { setData(Qt::BackgroundRole, color); } +#endif inline QBrush background() const { return qvariant_cast<QBrush>(data(Qt::BackgroundRole)); } inline void setBackground(const QBrush &brush) { setData(Qt::BackgroundRole, brush); } +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTableWidgetItem::foreground() instead") inline QColor textColor() const - { return qvariant_cast<QColor>(data(Qt::TextColorRole)); } + { return qvariant_cast<QColor>(data(Qt::ForegroundRole)); } + QT_DEPRECATED_X ("Use QTableWidgetItem::setForeground() instead") inline void setTextColor(const QColor &color) - { setData(Qt::TextColorRole, color); } + { setData(Qt::ForegroundRole, color); } +#endif inline QBrush foreground() const { return qvariant_cast<QBrush>(data(Qt::ForegroundRole)); } @@ -175,6 +183,9 @@ public: inline int type() const { return rtti; } private: + QTableModel *tableModel() const; + +private: int rtti; QVector<QWidgetItemData> values; QTableWidget *view; @@ -268,8 +279,12 @@ public: void setCellWidget(int row, int column, QWidget *widget); inline void removeCellWidget(int row, int column); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTableWidgetItem::isSelected() instead") bool isItemSelected(const QTableWidgetItem *item) const; + QT_DEPRECATED_X ("Use QTableWidgetItem::setSelected() instead") void setItemSelected(const QTableWidgetItem *item, bool select); +#endif void setRangeSelected(const QTableWidgetSelectionRange &range, bool select); QList<QTableWidgetSelectionRange> selectedRanges() const; @@ -375,12 +390,6 @@ inline int QTableWidgetItem::row() const inline int QTableWidgetItem::column() const { return (view ? view->column(this) : -1); } -inline void QTableWidgetItem::setSelected(bool aselect) -{ if (view) view->setItemSelected(this, aselect); } - -inline bool QTableWidgetItem::isSelected() const -{ return (view ? view->isItemSelected(this) : false); } - QT_END_NAMESPACE #endif // QTABLEWIDGET_H diff --git a/src/widgets/itemviews/qtablewidget_p.h b/src/widgets/itemviews/qtablewidget_p.h index 9899272fce..d88326f129 100644 --- a/src/widgets/itemviews/qtablewidget_p.h +++ b/src/widgets/itemviews/qtablewidget_p.h @@ -129,6 +129,9 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool clearItemData(const QModelIndex &index) override; +#endif QMap<int, QVariant> itemData(const QModelIndex &index) const override; diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index f3647f656a..3fad6ca3df 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -1089,15 +1089,8 @@ void QTreeView::keyboardSearch(const QString &search) if (start.column() > 0) index = index.sibling(index.row(), start.column()); - if (index.isValid()) { - QItemSelectionModel::SelectionFlags flags = (d->selectionMode == SingleSelection - ? QItemSelectionModel::SelectionFlags( - QItemSelectionModel::ClearAndSelect - |d->selectionBehaviorFlags()) - : QItemSelectionModel::SelectionFlags( - QItemSelectionModel::NoUpdate)); - selectionModel()->setCurrentIndex(index, flags); - } + if (index.isValid()) + setCurrentIndex(index); } /*! @@ -1773,7 +1766,7 @@ void QTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option, QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled) ? QPalette::Normal : QPalette::Disabled; o.backgroundColor = option.palette.color(cg, d->selectionModel->isSelected(index) - ? QPalette::Highlight : QPalette::Background); + ? QPalette::Highlight : QPalette::Window); int x = 0; if (!option.showDecorationSelected) x = header->sectionPosition(0) + d->indentationForItem(d->current); @@ -1992,21 +1985,7 @@ void QTreeView::keyPressEvent(QKeyEvent *event) if (d->isIndexValid(current) && d->model && d->itemsExpandable) { switch (event->key()) { case Qt::Key_Asterisk: { - // do layouting only once after expanding is done - d->doDelayedItemsLayout(); - QStack<QModelIndex> parents; - parents.push(current); - while (!parents.isEmpty()) { - QModelIndex parent = parents.pop(); - for (int row = 0; row < d->model->rowCount(parent); ++row) { - QModelIndex child = d->model->index(row, 0, parent); - if (!d->isIndexValid(child)) - break; - parents.push(child); - expand(child); - } - } - expand(current); + expandRecursively(current); break; } case Qt::Key_Plus: expand(current); @@ -2160,12 +2139,10 @@ int QTreeView::verticalOffset() const // ### find a faster way to do this d->executePostedLayout(); int offset = 0; - for (int i = 0; i < d->viewItems.count(); ++i) { - if (i == verticalScrollBar()->value()) - return offset; + const int cnt = std::min(d->viewItems.count(), verticalScrollBar()->value()); + for (int i = 0; i < cnt; ++i) offset += d->itemHeight(i); - } - return 0; + return offset; } // scroll per pixel return verticalScrollBar()->value(); @@ -2324,9 +2301,9 @@ QModelIndex QTreeView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie case MovePageDown: return d->modelIndex(d->pageDown(vi), current.column()); case MoveHome: - return d->model->index(0, current.column(), d->root); + return d->modelIndex(d->itemForKeyHome(), current.column()); case MoveEnd: - return d->modelIndex(d->viewItems.count() - 1, current.column()); + return d->modelIndex(d->itemForKeyEnd(), current.column()); } return current; } @@ -2621,10 +2598,13 @@ void QTreeView::resizeColumnToContents(int column) d->header->resizeSection(column, qMax(contents, header)); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete \overload + This function is deprecated. Use + sortByColumn(int column, Qt::SortOrder order) instead. Sorts the model by the values in the given \a column. */ void QTreeView::sortByColumn(int column) @@ -2632,6 +2612,7 @@ void QTreeView::sortByColumn(int column) Q_D(QTreeView); sortByColumn(column, d->header->sortIndicatorOrder()); } +#endif /*! \since 4.2 @@ -2647,10 +2628,12 @@ void QTreeView::sortByColumn(int column) void QTreeView::sortByColumn(int column, Qt::SortOrder order) { Q_D(QTreeView); - - //If sorting is enabled will emit a signal connected to _q_sortIndicatorChanged, which then actually sorts + if (column < 0) + return; + // If sorting is enabled it will emit a signal connected to + // _q_sortIndicatorChanged, which then actually sorts d->header->setSortIndicator(column, order); - //If sorting is not enabled, force to sort now. + // If sorting is not enabled, force to sort now if (!d->sortingEnabled) d->model->sort(column, order); } @@ -2694,11 +2677,7 @@ QSize QTreeView::viewportSizeHint() const QSize result = QSize(d->header->length(), deepestRect.bottom() + 1); // add size for header - result += QSize(0, d->header->isVisible() ? d->header->height() : 0); - - // add size for scrollbars - result += QSize(verticalScrollBar()->isVisible() ? verticalScrollBar()->width() : 0, - horizontalScrollBar()->isVisible() ? horizontalScrollBar()->height() : 0); + result += QSize(0, d->header->isHidden() ? 0 : d->header->height()); return result; } @@ -2707,7 +2686,7 @@ QSize QTreeView::viewportSizeHint() const \since 4.2 Expands all expandable items. - Warning: if the model contains a large number of items, + \warning: if the model contains a large number of items, this function will take some time to execute. \sa collapseAll(), expand(), collapse(), setExpanded() @@ -2723,6 +2702,50 @@ void QTreeView::expandAll() } /*! + \since 5.13 + Expands the item at the given \a index and all its children to the + given \a depth. The \a depth is relative to the given \a index. + A \a depth of -1 will expand all children, a \a depth of 0 will + only expand the given \a index. + + \warning: if the model contains a large number of items, + this function will take some time to execute. + + \sa expandAll() +*/ +void QTreeView::expandRecursively(const QModelIndex &index, int depth) +{ + Q_D(QTreeView); + + if (depth < -1) + return; + // do layouting only once after expanding is done + d->doDelayedItemsLayout(); + expand(index); + if (depth == 0) + return; + QStack<QPair<QModelIndex, int>> parents; + parents.push({index, 0}); + while (!parents.isEmpty()) { + const QPair<QModelIndex, int> elem = parents.pop(); + const QModelIndex &parent = elem.first; + const int curDepth = elem.second; + const int rowCount = d->model->rowCount(parent); + for (int row = 0; row < rowCount; ++row) { + const QModelIndex child = d->model->index(row, 0, parent); + if (!d->isIndexValid(child)) + break; + if (depth == -1 || curDepth + 1 < depth) + parents.push({child, curDepth + 1}); + if (d->isIndexExpanded(child)) + continue; + if (d->storeExpanded(child)) + emit expanded(child); + } + } +} + +/*! \since 4.2 Collapses all expanded items. @@ -3399,7 +3422,11 @@ int QTreeViewPrivate::pageUp(int i) const int index = itemAtCoordinate(coordinateForItem(i) - viewport->height()); while (isItemHiddenOrDisabled(index)) index--; - return index == -1 ? 0 : index; + if (index == -1) + index = 0; + while (isItemHiddenOrDisabled(index)) + index++; + return index >= viewItems.count() ? 0 : index; } int QTreeViewPrivate::pageDown(int i) const @@ -3407,6 +3434,26 @@ int QTreeViewPrivate::pageDown(int i) const int index = itemAtCoordinate(coordinateForItem(i) + viewport->height()); while (isItemHiddenOrDisabled(index)) index++; + if (index == -1 || index >= viewItems.count()) + index = viewItems.count() - 1; + while (isItemHiddenOrDisabled(index)) + index--; + return index == -1 ? viewItems.count() - 1 : index; +} + +int QTreeViewPrivate::itemForKeyHome() const +{ + int index = 0; + while (isItemHiddenOrDisabled(index)) + index++; + return index >= viewItems.count() ? 0 : index; +} + +int QTreeViewPrivate::itemForKeyEnd() const +{ + int index = viewItems.count() - 1; + while (isItemHiddenOrDisabled(index)) + index--; return index == -1 ? viewItems.count() - 1 : index; } diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index 33dbf1c1ce..e9cc1beedb 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -143,7 +143,6 @@ public: void doItemsLayout() override; void reset() override; - void sortByColumn(int column, Qt::SortOrder order); void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>()) override; void selectAll() override; @@ -158,8 +157,13 @@ public Q_SLOTS: void expand(const QModelIndex &index); void collapse(const QModelIndex &index); void resizeColumnToContents(int column); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTreeeView::sortByColumn(int column, Qt::SortOrder order) instead") void sortByColumn(int column); +#endif + void sortByColumn(int column, Qt::SortOrder order); void expandAll(); + void expandRecursively(const QModelIndex &index, int depth = -1); void collapseAll(); void expandToDepth(int depth); diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h index 0a0e7aae87..9666a9f8c2 100644 --- a/src/widgets/itemviews/qtreeview_p.h +++ b/src/widgets/itemviews/qtreeview_p.h @@ -140,6 +140,8 @@ public: int pageUp(int item) const; int pageDown(int item) const; + int itemForKeyHome() const; + int itemForKeyEnd() const; int itemHeight(int item) const; int indentationForItem(int item) const; diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp index 9fbfb50029..29cc199526 100644 --- a/src/widgets/itemviews/qtreewidget.cpp +++ b/src/widgets/itemviews/qtreewidget.cpp @@ -390,6 +390,27 @@ bool QTreeModel::setData(const QModelIndex &index, const QVariant &value, int ro return false; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QTreeModel::clearItemData(const QModelIndex &index) +{ + if (!checkIndex(index, CheckIndexOption::IndexIsValid)) + return false; + QTreeWidgetItem *itm = item(index); + if (!itm) + return false; + const auto beginIter = itm->values.at(index.column()).cbegin(); + const auto endIter = itm->values.at(index.column()).cend(); + if (std::all_of(beginIter, endIter, [](const QWidgetItemData& data) -> bool { return !data.value.isValid(); }) + && !itm->d->display.at(index.column()).isValid()) { + return true; //it's already cleared + } + itm->d->display[index.column()] = QVariant(); + itm->values[index.column()].clear(); + emit dataChanged(index, index, QVector<int>{}); + return true; +} +#endif + QMap<int, QVariant> QTreeModel::itemData(const QModelIndex &index) const { QMap<int, QVariant> roles; @@ -635,7 +656,7 @@ void QTreeModel::ensureSorted(int column, Qt::SortOrder order, // we are going to change the persistent indexes, so we need to prepare if (!changed) { // this will only happen once changed = true; - emit layoutAboutToBeChanged(); // the selection model needs to know + emit layoutAboutToBeChanged({parent}, QAbstractItemModel::VerticalSortHint); // the selection model needs to know oldPersistentIndexes = persistentIndexList(); newPersistentIndexes = oldPersistentIndexes; } @@ -668,7 +689,7 @@ void QTreeModel::ensureSorted(int column, Qt::SortOrder order, if (changed) { itm->children = lst; changePersistentIndexList(oldPersistentIndexes, newPersistentIndexes); - emit layoutChanged(); + emit layoutChanged({parent}, QAbstractItemModel::VerticalSortHint); } } @@ -988,8 +1009,18 @@ void QTreeModel::timerEvent(QTimerEvent *ev) Sets the selected state of the item to \a select. \sa isSelected() - */ +void QTreeWidgetItem::setSelected(bool select) +{ + const QTreeModel *model = treeModel(); + if (!model || !view->selectionModel()) + return; + const QModelIndex index = model->index(this, 0); + view->selectionModel()->select(index, (select ? QItemSelectionModel::Select + : QItemSelectionModel::Deselect) + | QItemSelectionModel::Rows); + d->selected = select; +} /*! \fn bool QTreeWidgetItem::isSelected() const @@ -999,6 +1030,10 @@ void QTreeModel::timerEvent(QTimerEvent *ev) \sa setSelected() */ +bool QTreeWidgetItem::isSelected() const +{ + return d->selected; +} /*! \fn void QTreeWidgetItem::setHidden(bool hide) @@ -1012,12 +1047,18 @@ void QTreeModel::timerEvent(QTimerEvent *ev) \sa isHidden() */ -void QTreeWidgetItem::setHidden(bool ahide) +void QTreeWidgetItem::setHidden(bool hide) { - if (view) { - view->setItemHidden(this, ahide); - d->hidden = ahide; + const QTreeModel *model = treeModel(); + if (!model) + return; + if (this == model->headerItem) { + view->header()->setHidden(hide); + } else { + const QModelIndex index = view->d_func()->index(this); + view->setRowHidden(index.row(), index.parent(), hide); } + d->hidden = hide; } /*! @@ -1031,7 +1072,15 @@ void QTreeWidgetItem::setHidden(bool ahide) bool QTreeWidgetItem::isHidden() const { - return (view ? d->hidden : false); + const QTreeModel *model = treeModel(); + if (!model) + return false; + if (this == model->headerItem) + return view->header()->isHidden(); + if (view->d_func()->hiddenIndexes.isEmpty()) + return false; + QTreeModel::SkipSorting skipSorting(model); + return view->d_func()->isRowHidden(view->d_func()->index(this)); } /*! @@ -1043,6 +1092,14 @@ bool QTreeWidgetItem::isHidden() const \sa isExpanded() */ +void QTreeWidgetItem::setExpanded(bool expand) +{ + const QTreeModel *model = treeModel(); + if (!model) + return; + QTreeModel::SkipSorting skipSorting(model); + view->setExpanded(view->d_func()->index(this), expand); +} /*! \fn bool QTreeWidgetItem::isExpanded() const @@ -1052,6 +1109,14 @@ bool QTreeWidgetItem::isHidden() const \sa setExpanded() */ +bool QTreeWidgetItem::isExpanded() const +{ + const QTreeModel *model = treeModel(); + if (!model) + return false; + QTreeModel::SkipSorting skipSorting(model); + return view->isExpanded(view->d_func()->index(this)); +} /*! \fn void QTreeWidgetItem::setFirstColumnSpanned(bool span) @@ -1062,6 +1127,14 @@ bool QTreeWidgetItem::isHidden() const \sa isFirstColumnSpanned() */ +void QTreeWidgetItem::setFirstColumnSpanned(bool span) +{ + const QTreeModel *model = treeModel(); + if (!model || this == model->headerItem) + return; // We can't set the header items to spanning + const QModelIndex index = model->index(this, 0); + view->setFirstColumnSpanned(index.row(), index.parent(), span); +} /*! \fn bool QTreeWidgetItem::isFirstColumnSpanned() const @@ -1071,6 +1144,14 @@ bool QTreeWidgetItem::isHidden() const \sa setFirstColumnSpanned() */ +bool QTreeWidgetItem::isFirstColumnSpanned() const +{ + const QTreeModel *model = treeModel(); + if (!model || this == model->headerItem) + return false; + const QModelIndex index = model->index(this, 0); + return view->isFirstColumnSpanned(index.row(), index.parent()); +} /*! \fn QString QTreeWidgetItem::text(int column) const @@ -1325,7 +1406,7 @@ bool QTreeWidgetItem::isHidden() const \sa type() */ QTreeWidgetItem::QTreeWidgetItem(int type) - : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0), + : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled @@ -1344,7 +1425,7 @@ QTreeWidgetItem::QTreeWidgetItem(int type) \sa type() */ QTreeWidgetItem::QTreeWidgetItem(const QStringList &strings, int type) - : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0), + : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled @@ -1364,16 +1445,16 @@ QTreeWidgetItem::QTreeWidgetItem(const QStringList &strings, int type) \sa type() */ -QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, int type) - : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0), +QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *treeview, int type) + : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled |Qt::ItemIsDragEnabled |Qt::ItemIsDropEnabled) { - if (view && view->model()) { - QTreeModel *model = qobject_cast<QTreeModel*>(view->model()); + // do not set this->view here otherwise insertChild() will fail + if (QTreeModel *model = treeModel(treeview)) { model->rootItem->addChild(this); values.reserve(model->headerItem->columnCount()); } @@ -1389,8 +1470,8 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, int type) \sa type() */ -QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, const QStringList &strings, int type) - : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0), +QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *treeview, const QStringList &strings, int type) + : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled @@ -1399,8 +1480,8 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, const QStringList &strings, { for (int i = 0; i < strings.count(); ++i) setText(i, strings.at(i)); - if (view && view->model()) { - QTreeModel *model = qobject_cast<QTreeModel*>(view->model()); + // do not set this->view here otherwise insertChild() will fail + if (QTreeModel *model = treeModel(treeview)) { model->rootItem->addChild(this); values.reserve(model->headerItem->columnCount()); } @@ -1414,21 +1495,19 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, const QStringList &strings, \sa type() */ -QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, QTreeWidgetItem *after, int type) - : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0), +QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *treeview, QTreeWidgetItem *after, int type) + : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled |Qt::ItemIsDragEnabled |Qt::ItemIsDropEnabled) { - if (view) { - QTreeModel *model = qobject_cast<QTreeModel*>(view->model()); - if (model) { - int i = model->rootItem->children.indexOf(after) + 1; - model->rootItem->insertChild(i, this); - values.reserve(model->headerItem->columnCount()); - } + // do not set this->view here otherwise insertChild() will fail + if (QTreeModel *model = treeModel(treeview)) { + int i = model->rootItem->children.indexOf(after) + 1; + model->rootItem->insertChild(i, this); + values.reserve(model->headerItem->columnCount()); } } @@ -1438,7 +1517,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidget *view, QTreeWidgetItem *after, int \sa type() */ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, int type) - : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0), + : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled @@ -1456,7 +1535,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, int type) \sa type() */ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, const QStringList &strings, int type) - : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0), + : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled @@ -1478,7 +1557,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, const QStringList &str \sa type() */ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, int type) - : rtti(type), view(0), d(new QTreeWidgetItemPrivate(this)), par(0), + : rtti(type), view(nullptr), d(new QTreeWidgetItemPrivate(this)), par(nullptr), itemFlags(Qt::ItemIsSelectable |Qt::ItemIsUserCheckable |Qt::ItemIsEnabled @@ -1501,7 +1580,7 @@ QTreeWidgetItem::QTreeWidgetItem(QTreeWidgetItem *parent, QTreeWidgetItem *after QTreeWidgetItem::~QTreeWidgetItem() { - QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0); + QTreeModel *model = treeModel(); bool wasSkipSort = false; if (model) { wasSkipSort = model->skipPendingSort; @@ -1663,16 +1742,17 @@ void QTreeWidgetItem::setFlags(Qt::ItemFlags flags) void QTreeWidgetItemPrivate::updateHiddenStatus(QTreeWidgetItem *item, bool inserting) { - QTreeModel *model = (item->view ? qobject_cast<QTreeModel*>(item->view->model()) : 0); + QTreeModel *model = item->treeModel(); if (!model) return; QStack<QTreeWidgetItem *> parents; parents.push(item); while (!parents.isEmpty()) { QTreeWidgetItem *parent = parents.pop(); - QModelIndex index = model->index(parent, 0); - if (parent->d->hidden) + if (parent->d->hidden) { + const QModelIndex index = model->index(parent, 0); item->view->setRowHidden(index.row(), index.parent(), inserting); + } for (int i = 0; i < parent->children.count(); ++i) { QTreeWidgetItem *child = parent->children.at(i); parents.push(child); @@ -1737,7 +1817,7 @@ void QTreeWidgetItem::setData(int column, int role, const QVariant &value) if (column < 0) return; - QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0); + QTreeModel *model = treeModel(); switch (role) { case Qt::EditRole: case Qt::DisplayRole: { @@ -1945,7 +2025,7 @@ void QTreeWidgetItem::insertChild(int index, QTreeWidgetItem *child) if (index < 0 || index > children.count() || child == 0 || child->view != 0 || child->par != 0) return; - if (QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0)) { + if (QTreeModel *model = treeModel()) { const bool wasSkipSort = model->skipPendingSort; model->skipPendingSort = true; if (model->rootItem == this) @@ -1996,7 +2076,7 @@ QTreeWidgetItem *QTreeWidgetItem::takeChild(int index) { // we move this outside the check of the index to allow executing // pending sorts from inline functions, using this function (hack) - QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0); + QTreeModel *model = treeModel(); if (model) { // This will trigger a layoutChanged signal, thus we might want to optimize // this function by not emitting the rowsRemoved signal etc to the view. @@ -2054,7 +2134,7 @@ void QTreeWidgetItem::insertChildren(int index, const QList<QTreeWidgetItem*> &c insertChild(index, children.at(n)); return; } - QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0); + QTreeModel *model = treeModel(); QStack<QTreeWidgetItem*> stack; QList<QTreeWidgetItem*> itemsToInsert; for (int n = 0; n < children.count(); ++n) { @@ -2101,7 +2181,7 @@ QList<QTreeWidgetItem*> QTreeWidgetItem::takeChildren() { QList<QTreeWidgetItem*> removed; if (children.count() > 0) { - QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0); + QTreeModel *model = treeModel(); if (model) { // This will trigger a layoutChanged signal, thus we might want to optimize // this function by not emitting the rowsRemoved signal etc to the view. @@ -2133,7 +2213,7 @@ QList<QTreeWidgetItem*> QTreeWidgetItem::takeChildren() void QTreeWidgetItemPrivate::sortChildren(int column, Qt::SortOrder order, bool climb) { - QTreeModel *model = (q->view ? qobject_cast<QTreeModel*>(q->view->model()) : 0); + QTreeModel *model = q->treeModel(); if (!model) return; model->sortItems(&q->children, column, order); @@ -2156,7 +2236,7 @@ void QTreeWidgetItemPrivate::sortChildren(int column, Qt::SortOrder order, bool */ void QTreeWidgetItem::sortChildren(int column, Qt::SortOrder order, bool climb) { - QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0); + QTreeModel *model = treeModel(); if (!model) return; if (model->isChanging()) @@ -2164,9 +2244,9 @@ void QTreeWidgetItem::sortChildren(int column, Qt::SortOrder order, bool climb) QTreeModel::SkipSorting skipSorting(model); int oldSortColumn = view->d_func()->explicitSortColumn; view->d_func()->explicitSortColumn = column; - emit model->layoutAboutToBeChanged(); + emit model->layoutAboutToBeChanged({}, QAbstractItemModel::VerticalSortHint); d->sortChildren(column, order, climb); - emit model->layoutChanged(); + emit model->layoutChanged({}, QAbstractItemModel::VerticalSortHint); view->d_func()->explicitSortColumn = oldSortColumn; } @@ -2236,7 +2316,7 @@ void QTreeWidgetItem::emitDataChanged() */ void QTreeWidgetItem::itemChanged() { - if (QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0)) + if (QTreeModel *model = treeModel()) model->itemChanged(this); } @@ -2245,10 +2325,21 @@ void QTreeWidgetItem::itemChanged() */ void QTreeWidgetItem::executePendingSort() const { - if (QTreeModel *model = (view ? qobject_cast<QTreeModel*>(view->model()) : 0)) + if (QTreeModel *model = treeModel()) model->executePendingSort(); } +/*! + \internal + returns the QTreeModel if a view is set +*/ +QTreeModel *QTreeWidgetItem::treeModel(QTreeWidget *v) const +{ + if (!v) + v = view; + return (v ? qobject_cast<QTreeModel*>(v->model()) : nullptr); +} + #ifndef QT_NO_DATASTREAM /*! @@ -2448,8 +2539,8 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, QStyle::SH_ItemView_ActivateItemOnSingleClick style hint) or pressing a special key (e.g., \uicontrol Enter). - The specified \a item is the item that was clicked, or 0 if no - item was clicked. The \a column is the item's column that was + The specified \a item is the item that was clicked, or \nullptr if + no item was clicked. The \a column is the item's column that was clicked, or -1 if no item was clicked. */ @@ -2459,8 +2550,8 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, This signal is emitted when the user presses a mouse button inside the widget. - The specified \a item is the item that was clicked, or 0 if no - item was clicked. The \a column is the item's column that was + The specified \a item is the item that was clicked, or \nullptr if + no item was clicked. The \a column is the item's column that was clicked, or -1 if no item was clicked. */ @@ -2480,8 +2571,8 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft, This signal is emitted when the user double clicks inside the widget. - The specified \a item is the item that was clicked, or 0 if no - item was clicked. The \a column is the item's column that was + The specified \a item is the item that was clicked, or \nullptr if + no item was clicked. The \a column is the item's column that was clicked. If no item was double clicked, no signal will be emitted. */ @@ -2633,8 +2724,8 @@ QTreeWidgetItem *QTreeWidget::invisibleRootItem() const } /*! - Returns the top level item at the given \a index, or 0 if the item does - not exist. + Returns the top level item at the given \a index, or \nullptr if the + item does not exist. \sa topLevelItemCount(), insertTopLevelItem() */ @@ -3010,7 +3101,7 @@ QWidget *QTreeWidget::itemWidget(QTreeWidgetItem *item, int column) const This function should only be used to display static content in the place of a tree widget item. If you want to display custom dynamic content or - implement a custom editor widget, use QTreeView and subclass QItemDelegate + implement a custom editor widget, use QTreeView and subclass QStyledItemDelegate instead. This function cannot be called before the item hierarchy has been set up, @@ -3027,6 +3118,7 @@ void QTreeWidget::setItemWidget(QTreeWidgetItem *item, int column, QWidget *widg QAbstractItemView::setIndexWidget(d->index(item, column), widget); } +#if QT_DEPRECATED_SINCE(5, 13) /*! Returns \c true if the \a item is selected; otherwise returns \c false. @@ -3038,9 +3130,7 @@ void QTreeWidget::setItemWidget(QTreeWidgetItem *item, int column, QWidget *widg */ bool QTreeWidget::isItemSelected(const QTreeWidgetItem *item) const { - if (!item) - return false; - return item->d->selected; + return ((item && item->treeWidget() == this) ? item->isSelected() : false); } /*! @@ -3055,16 +3145,10 @@ bool QTreeWidget::isItemSelected(const QTreeWidgetItem *item) const */ void QTreeWidget::setItemSelected(const QTreeWidgetItem *item, bool select) { - Q_D(QTreeWidget); - - if (!item) - return; - - selectionModel()->select(d->index(item), (select ? QItemSelectionModel::Select - : QItemSelectionModel::Deselect) - |QItemSelectionModel::Rows); - item->d->selected = select; + if (item && item->treeWidget() == this) + const_cast<QTreeWidgetItem*>(item)->setSelected(select); } +#endif /*! Returns a list of all selected non-hidden items. @@ -3081,7 +3165,7 @@ QList<QTreeWidgetItem*> QTreeWidget::selectedItems() const seen.reserve(indexes.count()); for (const auto &index : indexes) { QTreeWidgetItem *item = d->item(index); - if (isItemHidden(item) || seen.contains(item)) + if (item->isHidden() || seen.contains(item)) continue; seen.insert(item); items.append(item); @@ -3105,6 +3189,7 @@ QList<QTreeWidgetItem*> QTreeWidget::findItems(const QString &text, Qt::MatchFla return items; } +#if QT_DEPRECATED_SINCE(5, 13) /*! Returns \c true if the \a item is explicitly hidden, otherwise returns \c false. @@ -3114,13 +3199,7 @@ QList<QTreeWidgetItem*> QTreeWidget::findItems(const QString &text, Qt::MatchFla */ bool QTreeWidget::isItemHidden(const QTreeWidgetItem *item) const { - Q_D(const QTreeWidget); - if (item == d->treeModel()->headerItem) - return header()->isHidden(); - if (d->hiddenIndexes.isEmpty()) - return false; - QTreeModel::SkipSorting skipSorting(d->treeModel()); - return d->isRowHidden(d->index(item)); + return ((item && item->treeWidget() == this) ? item->isHidden() : false); } /*! @@ -3134,16 +3213,8 @@ bool QTreeWidget::isItemHidden(const QTreeWidgetItem *item) const */ void QTreeWidget::setItemHidden(const QTreeWidgetItem *item, bool hide) { - if (!item) - return; - Q_D(QTreeWidget); - if (item == d->treeModel()->headerItem) { - header()->setHidden(hide); - } else { - const QModelIndex index = d->index(item); - setRowHidden(index.row(), index.parent(), hide); - } - item->d->hidden = hide; + if (item && item->treeWidget() == this) + const_cast<QTreeWidgetItem*>(item)->setHidden(hide); } /*! @@ -3157,9 +3228,7 @@ void QTreeWidget::setItemHidden(const QTreeWidgetItem *item, bool hide) */ bool QTreeWidget::isItemExpanded(const QTreeWidgetItem *item) const { - Q_D(const QTreeWidget); - QTreeModel::SkipSorting skipSorting(d->treeModel()); - return isExpanded(d->index(item)); + return ((item && item->treeWidget() == this) ? item->isExpanded() : false); } /*! @@ -3174,9 +3243,8 @@ bool QTreeWidget::isItemExpanded(const QTreeWidgetItem *item) const */ void QTreeWidget::setItemExpanded(const QTreeWidgetItem *item, bool expand) { - Q_D(QTreeWidget); - QTreeModel::SkipSorting skipSorting(d->treeModel()); - setExpanded(d->index(item), expand); + if (item && item->treeWidget() == this) + const_cast<QTreeWidgetItem*>(item)->setExpanded(expand); } /*! @@ -3186,14 +3254,14 @@ void QTreeWidget::setItemExpanded(const QTreeWidgetItem *item, bool expand) otherwise returns \c false. \sa setFirstItemColumnSpanned() + + \obsolete + + This function is deprecated. Use \l{QTreeWidgetItem::isFirstColumnSpanned()} instead. */ bool QTreeWidget::isFirstItemColumnSpanned(const QTreeWidgetItem *item) const { - Q_D(const QTreeWidget); - if (item == d->treeModel()->headerItem) - return false; // We can't set the header items to spanning - const QModelIndex index = d->index(item); - return isFirstColumnSpanned(index.row(), index.parent()); + return ((item && item->treeWidget() == this) ? item->isFirstColumnSpanned() : false); } /*! @@ -3203,15 +3271,17 @@ bool QTreeWidget::isFirstItemColumnSpanned(const QTreeWidgetItem *item) const otherwise the item will show one section per column. \sa isFirstItemColumnSpanned() + + \obsolete + + This function is deprecated. Use \l{QTreeWidgetItem::setFirstColumnSpanned()} instead. */ void QTreeWidget::setFirstItemColumnSpanned(const QTreeWidgetItem *item, bool span) { - Q_D(QTreeWidget); - if (item == d->treeModel()->headerItem) - return; // We can't set header items to spanning - const QModelIndex index = d->index(item); - setFirstColumnSpanned(index.row(), index.parent(), span); + if (item && item->treeWidget() == this) + const_cast<QTreeWidgetItem*>(item)->setFirstColumnSpanned(span); } +#endif /*! \since 4.3 diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 975f208702..bed77b336d 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -66,9 +66,9 @@ public: enum ItemType { Type = 0, UserType = 1000 }; explicit QTreeWidgetItem(int type = Type); explicit QTreeWidgetItem(const QStringList &strings, int type = Type); - explicit QTreeWidgetItem(QTreeWidget *view, int type = Type); - QTreeWidgetItem(QTreeWidget *view, const QStringList &strings, int type = Type); - QTreeWidgetItem(QTreeWidget *view, QTreeWidgetItem *after, int type = Type); + explicit QTreeWidgetItem(QTreeWidget *treeview, int type = Type); + QTreeWidgetItem(QTreeWidget *treeview, const QStringList &strings, int type = Type); + QTreeWidgetItem(QTreeWidget *treeview, QTreeWidgetItem *after, int type = Type); explicit QTreeWidgetItem(QTreeWidgetItem *parent, int type = Type); QTreeWidgetItem(QTreeWidgetItem *parent, const QStringList &strings, int type = Type); QTreeWidgetItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, int type = Type); @@ -79,17 +79,17 @@ public: inline QTreeWidget *treeWidget() const { return view; } - inline void setSelected(bool select); - inline bool isSelected() const; + void setSelected(bool select); + bool isSelected() const; void setHidden(bool hide); bool isHidden() const; - inline void setExpanded(bool expand); - inline bool isExpanded() const; + void setExpanded(bool expand); + bool isExpanded() const; - inline void setFirstColumnSpanned(bool span); - inline bool isFirstColumnSpanned() const; + void setFirstColumnSpanned(bool span); + bool isFirstColumnSpanned() const; inline void setDisabled(bool disabled); inline bool isDisabled() const; @@ -134,20 +134,28 @@ public: inline void setTextAlignment(int column, int alignment) { setData(column, Qt::TextAlignmentRole, alignment); } +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTreeWidgetItem::background() instead") inline QColor backgroundColor(int column) const - { return qvariant_cast<QColor>(data(column, Qt::BackgroundColorRole)); } + { return qvariant_cast<QColor>(data(column, Qt::BackgroundRole)); } + QT_DEPRECATED_X ("Use QTreeWidgetItem::setBackground() instead") inline void setBackgroundColor(int column, const QColor &color) - { setData(column, Qt::BackgroundColorRole, color); } + { setData(column, Qt::BackgroundRole, color); } +#endif inline QBrush background(int column) const { return qvariant_cast<QBrush>(data(column, Qt::BackgroundRole)); } inline void setBackground(int column, const QBrush &brush) { setData(column, Qt::BackgroundRole, brush); } +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTreeWidgetItem::foreground() instead") inline QColor textColor(int column) const - { return qvariant_cast<QColor>(data(column, Qt::TextColorRole)); } + { return qvariant_cast<QColor>(data(column, Qt::ForegroundRole)); } + QT_DEPRECATED_X ("Use QTreeWidgetItem::setForeground() instead") inline void setTextColor(int column, const QColor &color) - { setData(column, Qt::TextColorRole, color); } + { setData(column, Qt::ForegroundRole, color); } +#endif inline QBrush foreground(int column) const { return qvariant_cast<QBrush>(data(column, Qt::ForegroundRole)); } @@ -207,6 +215,7 @@ private: QVariant childrenCheckState(int column) const; void itemChanged(); void executePendingSort() const; + QTreeModel *treeModel(QTreeWidget *v = nullptr) const; int rtti; // One item has a vector of column entries. Each column has a vector of (role, value) pairs. @@ -306,20 +315,32 @@ public: void setItemWidget(QTreeWidgetItem *item, int column, QWidget *widget); inline void removeItemWidget(QTreeWidgetItem *item, int column); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTreeWidgetItem::isSelected() instead") bool isItemSelected(const QTreeWidgetItem *item) const; + QT_DEPRECATED_X ("Use QTreeWidgetItem::setSelected() instead") void setItemSelected(const QTreeWidgetItem *item, bool select); +#endif QList<QTreeWidgetItem*> selectedItems() const; QList<QTreeWidgetItem*> findItems(const QString &text, Qt::MatchFlags flags, int column = 0) const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use QTreeWidgetItem::isHidden() instead") bool isItemHidden(const QTreeWidgetItem *item) const; + QT_DEPRECATED_X ("Use QTreeWidgetItem::setHidden() instead") void setItemHidden(const QTreeWidgetItem *item, bool hide); + QT_DEPRECATED_X ("Use QTreeWidgetItem::isExpanded() instead") bool isItemExpanded(const QTreeWidgetItem *item) const; + QT_DEPRECATED_X ("Use QTreeWidgetItem::setExpanded() instead") void setItemExpanded(const QTreeWidgetItem *item, bool expand); + QT_DEPRECATED_X ("Use QTreeWidgetItem::isFirstColumnSpanned() instead") bool isFirstItemColumnSpanned(const QTreeWidgetItem *item) const; + QT_DEPRECATED_X ("Use QTreeWidgetItem::setFirstColumnSpanned() instead") void setFirstItemColumnSpanned(const QTreeWidgetItem *item, bool span); +#endif QTreeWidgetItem *itemAbove(const QTreeWidgetItem *item) const; QTreeWidgetItem *itemBelow(const QTreeWidgetItem *item) const; @@ -404,24 +425,6 @@ inline QTreeWidgetItem *QTreeWidget::itemAt(int ax, int ay) const inline void QTreeWidget::setHeaderLabel(const QString &alabel) { setHeaderLabels(QStringList(alabel)); } -inline void QTreeWidgetItem::setSelected(bool aselect) -{ if (view) view->setItemSelected(this, aselect); } - -inline bool QTreeWidgetItem::isSelected() const -{ return (view ? view->isItemSelected(this) : false); } - -inline void QTreeWidgetItem::setExpanded(bool aexpand) -{ if (view) view->setItemExpanded(this, aexpand); } - -inline bool QTreeWidgetItem::isExpanded() const -{ return (view ? view->isItemExpanded(this) : false); } - -inline void QTreeWidgetItem::setFirstColumnSpanned(bool aspan) -{ if (view) view->setFirstItemColumnSpanned(this, aspan); } - -inline bool QTreeWidgetItem::isFirstColumnSpanned() const -{ return (view ? view->isFirstItemColumnSpanned(this) : false); } - inline void QTreeWidgetItem::setDisabled(bool disabled) { setFlags(disabled ? (flags() & ~Qt::ItemIsEnabled) : flags() | Qt::ItemIsEnabled); } diff --git a/src/widgets/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h index adc2c2c421..ee4a633468 100644 --- a/src/widgets/itemviews/qtreewidget_p.h +++ b/src/widgets/itemviews/qtreewidget_p.h @@ -99,7 +99,9 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; - +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool clearItemData(const QModelIndex &index) override; +#endif QMap<int, QVariant> itemData(const QModelIndex &index) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override; diff --git a/src/widgets/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp index 7934ae1d90..4786437d7e 100644 --- a/src/widgets/kernel/qactiongroup.cpp +++ b/src/widgets/kernel/qactiongroup.cpp @@ -316,8 +316,8 @@ bool QActionGroup::isEnabled() const } /*! - Returns the currently checked action in the group, or 0 if none - are checked. + Returns the currently checked action in the group, or \nullptr if + none are checked. */ QAction *QActionGroup::checkedAction() const { diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index ebab87b193..3594b5c902 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -784,7 +784,7 @@ QWidget *QApplication::activeModalWidget() /*! Cleans up any window system resources that were allocated by this - application. Sets the global variable \c qApp to 0. + application. Sets the global variable \c qApp to \nullptr. */ QApplication::~QApplication() @@ -893,8 +893,8 @@ void qt_cleanup() /*! \fn QWidget *QApplication::widgetAt(const QPoint &point) - Returns the widget at global screen position \a point, or 0 if there is no - Qt widget there. + Returns the widget at global screen position \a point, or \nullptr + if there is no Qt widget there. This function can be slow. @@ -904,9 +904,9 @@ QWidget *QApplication::widgetAt(const QPoint &p) { QWidget *window = QApplication::topLevelAt(p); if (!window) - return 0; + return nullptr; - QWidget *child = 0; + QWidget *child = nullptr; if (!window->testAttribute(Qt::WA_TransparentForMouseEvents)) child = window->childAt(window->mapFromGlobal(p)); @@ -942,8 +942,8 @@ QWidget *QApplication::widgetAt(const QPoint &p) \overload - Returns the widget at global screen position (\a x, \a y), or 0 if there is - no Qt widget there. + Returns the widget at global screen position (\a x, \a y), or + \nullptr if there is no Qt widget there. */ /*! @@ -1428,6 +1428,7 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char* else *QApplicationPrivate::set_pal = palette; QCoreApplication::setAttribute(Qt::AA_SetPalette); + emit qGuiApp->paletteChanged(*QGuiApplicationPrivate::app_pal); } } @@ -1727,8 +1728,8 @@ QWidgetList QApplication::allWidgets() } /*! - Returns the application widget that has the keyboard input focus, or 0 if - no widget in this application has the focus. + Returns the application widget that has the keyboard input focus, + or \nullptr if no widget in this application has the focus. \sa QWidget::setFocus(), QWidget::hasFocus(), activeWindow(), focusChanged() */ @@ -1796,7 +1797,7 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason) /*! Returns the application top-level window that has the keyboard input focus, - or 0 if no application window has the focus. There might be an + or \nullptr if no application window has the focus. There might be an activeWindow() even if there is no focusWidget(), for example if no widget in that window accepts key events. @@ -3891,6 +3892,7 @@ Qt::NavigationMode QApplication::navigationMode() return QApplicationPrivate::navigationMode; } +# if QT_DEPRECATED_SINCE(5, 13) /*! Sets whether Qt should use focus navigation suitable for use with a minimal keypad. @@ -3933,6 +3935,7 @@ bool QApplication::keypadNavigationEnabled() return QApplicationPrivate::navigationMode == Qt::NavigationModeKeypadTabOrder || QApplicationPrivate::navigationMode == Qt::NavigationModeKeypadDirectional; } +# endif #endif /*! diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 7a5d7ba1a9..27e743a28d 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -180,8 +180,12 @@ public: bool notify(QObject *, QEvent *) override; #ifdef QT_KEYPAD_NAVIGATION - static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool); - static bool keypadNavigationEnabled(); +# if QT_DEPRECATED_SINCE(5, 13) + static QT_DEPRECATED_X ("Use QApplication::setNavigationMode() instead") + void setKeypadNavigationEnabled(bool); + static QT_DEPRECATED_X ("Use QApplication::navigationMode() instead") + bool keypadNavigationEnabled(); +# endif static void setNavigationMode(Qt::NavigationMode mode); static Qt::NavigationMode navigationMode(); #endif diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp index 600934b8a1..bd0ea2598a 100644 --- a/src/widgets/kernel/qformlayout.cpp +++ b/src/widgets/kernel/qformlayout.cpp @@ -419,13 +419,15 @@ void QFormLayoutPrivate::updateSizes() if (label) { maxMinLblWidth = qMax(maxMinLblWidth, label->minSize.width()); maxShLblWidth = qMax(maxShLblWidth, label->sizeHint.width()); - if (field) { + } + if (field) { + if (field->fullRow) { + maxMinIfldWidth = qMax(maxMinIfldWidth, field->minSize.width()); + maxShIfldWidth = qMax(maxShIfldWidth, field->sizeHint.width()); + } else { maxMinFldWidth = qMax(maxMinFldWidth, field->minSize.width() + field->sbsHSpace); maxShFldWidth = qMax(maxShFldWidth, field->sizeHint.width() + field->sbsHSpace); } - } else if (field) { - maxMinIfldWidth = qMax(maxMinIfldWidth, field->minSize.width()); - maxShIfldWidth = qMax(maxShIfldWidth, field->sizeHint.width()); } prevLbl = label; @@ -2207,8 +2209,11 @@ void QFormLayoutPrivate::arrangeWidgets(const QVector<QLayoutStruct>& layouts, Q QSize sz(qMin(label->layoutWidth, label->sizeHint.width()), height); int x = leftOffset + rect.x() + label->layoutPos; - if (fixedAlignment(q->labelAlignment(), layoutDirection) & Qt::AlignRight) + const auto fAlign = fixedAlignment(q->labelAlignment(), layoutDirection); + if (fAlign & Qt::AlignRight) x += label->layoutWidth - sz.width(); + else if (fAlign & Qt::AlignHCenter) + x += label->layoutWidth / 2 - sz.width() / 2; QPoint p(x, layouts.at(label->vLayoutIndex).pos); // ### expansion & sizepolicy stuff diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index c4188044cf..57d6994c88 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -136,7 +136,7 @@ Qt::GestureType QGestureManager::registerGestureRecognizer(QGestureRecognizer *r ++m_lastCustomGestureId; type = Qt::GestureType(m_lastCustomGestureId); } - m_recognizers.insertMulti(type, recognizer); + m_recognizers.insert(type, recognizer); return type; } @@ -522,7 +522,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event) for(ContextIterator it = w->d_func()->gestureContext.constBegin(), e = w->d_func()->gestureContext.constEnd(); it != e; ++it) { types.insert(it.key(), 0); - contexts.insertMulti(w, it.key()); + contexts.insert(w, it.key()); } } // find all gesture contexts for the widget tree @@ -534,7 +534,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event) if (!(it.value() & Qt::DontStartGestureOnChildren)) { if (!types.contains(it.key())) { types.insert(it.key(), 0); - contexts.insertMulti(w, it.key()); + contexts.insert(w, it.key()); } } } @@ -556,7 +556,7 @@ bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event) for(ContextIterator it = item->QGraphicsItem::d_func()->gestureContext.constBegin(), e = item->QGraphicsItem::d_func()->gestureContext.constEnd(); it != e; ++it) { types.insert(it.key(), 0); - contexts.insertMulti(item, it.key()); + contexts.insert(item, it.key()); } } // find all gesture contexts for the graphics object tree @@ -569,7 +569,7 @@ bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event) if (!(it.value() & Qt::DontStartGestureOnChildren)) { if (!types.contains(it.key())) { types.insert(it.key(), 0); - contexts.insertMulti(item, it.key()); + contexts.insert(item, it.key()); } } } diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index f1c6c96a6d..4f2b505e32 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -1330,8 +1330,8 @@ QLayoutItem *QGridLayout::itemAt(int index) const /*! \since 4.4 - Returns the layout item that occupies cell (\a row, \a column), or 0 if - the cell is empty. + Returns the layout item that occupies cell (\a row, \a column), or + \nullptr if the cell is empty. \sa getItemPosition(), indexOf() */ @@ -1346,7 +1346,7 @@ QLayoutItem *QGridLayout::itemAtPosition(int row, int column) const return box->item(); } } - return 0; + return nullptr; } /*! diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp index eac5674161..f27851c7bb 100644 --- a/src/widgets/kernel/qlayout.cpp +++ b/src/widgets/kernel/qlayout.cpp @@ -282,6 +282,7 @@ bool QLayout::setAlignment(QLayout *l, Qt::Alignment alignment) return false; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \property QLayout::margin \brief the width of the outside border of the layout @@ -307,6 +308,15 @@ int QLayout::margin() const } /*! + \obsolete +*/ +void QLayout::setMargin(int margin) +{ + setContentsMargins(margin, margin, margin, margin); +} + +#endif +/*! \property QLayout::spacing \brief the spacing between widgets inside the layout @@ -344,14 +354,6 @@ int QLayout::spacing() const } } -/*! - \obsolete -*/ -void QLayout::setMargin(int margin) -{ - setContentsMargins(margin, margin, margin, margin); -} - void QLayout::setSpacing(int spacing) { if (QBoxLayout* boxlayout = qobject_cast<QBoxLayout*>(this)) { @@ -474,8 +476,8 @@ QRect QLayout::contentsRect() const /*! - Returns the parent widget of this layout, or 0 if this layout is - not installed on any widget. + Returns the parent widget of this layout, or \nullptr if this + layout is not installed on any widget. If the layout is a sub-layout, this function returns the parent widget of the parent layout. @@ -490,11 +492,11 @@ QWidget *QLayout::parentWidget() const QLayout *parentLayout = qobject_cast<QLayout*>(parent()); if (Q_UNLIKELY(!parentLayout)) { qWarning("QLayout::parentWidget: A layout can only have another layout as a parent."); - return 0; + return nullptr; } return parentLayout->parentWidget(); } else { - return 0; + return nullptr; } } else { Q_ASSERT(parent() && parent()->isWidgetType()); @@ -950,8 +952,8 @@ void QLayout::setMenuBar(QWidget *widget) } /*! - Returns the menu bar set for this layout, or 0 if no menu bar is - set. + Returns the menu bar set for this layout, or \nullptr if no + menu bar is set. */ QWidget *QLayout::menuBar() const @@ -1130,8 +1132,9 @@ bool QLayout::activate() Searches for widget \a from and replaces it with widget \a to if found. Returns the layout item that contains the widget \a from on success. - Otherwise \c 0 is returned. If \a options contains \c Qt::FindChildrenRecursively - (the default), sub-layouts are searched for doing the replacement. + Otherwise \nullptr is returned. + If \a options contains \c Qt::FindChildrenRecursively (the default), + sub-layouts are searched for doing the replacement. Any other flag in \a options is ignored. Notice that the returned item therefore might not belong to this layout, diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 616f4e7164..35a04a35b2 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -63,7 +63,9 @@ class Q_WIDGETS_EXPORT QLayout : public QObject, public QLayoutItem Q_OBJECT Q_DECLARE_PRIVATE(QLayout) +#if QT_DEPRECATED_SINCE(5, 13) Q_PROPERTY(int margin READ margin WRITE setMargin) +#endif Q_PROPERTY(int spacing READ spacing WRITE setSpacing) Q_PROPERTY(SizeConstraint sizeConstraint READ sizeConstraint WRITE setSizeConstraint) public: @@ -81,10 +83,12 @@ public: QLayout(); ~QLayout(); +#if QT_DEPRECATED_SINCE(5, 13) int margin() const; - int spacing() const; - void setMargin(int); +#endif + + int spacing() const; void setSpacing(int); void setContentsMargins(int left, int top, int right, int bottom); diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp index 25890e888b..9e6d1c5eac 100644 --- a/src/widgets/kernel/qlayoutitem.cpp +++ b/src/widgets/kernel/qlayoutitem.cpp @@ -309,24 +309,24 @@ void QLayoutItem::invalidate() /*! If this item is a QLayout, it is returned as a QLayout; otherwise - 0 is returned. This function provides type-safe casting. + \nullptr is returned. This function provides type-safe casting. \sa spacerItem(), widget() */ -QLayout * QLayoutItem::layout() +QLayout *QLayoutItem::layout() { - return 0; + return nullptr; } /*! If this item is a QSpacerItem, it is returned as a QSpacerItem; - otherwise 0 is returned. This function provides type-safe casting. + otherwise \nullptr is returned. This function provides type-safe casting. \sa layout(), widget() */ -QSpacerItem * QLayoutItem::spacerItem() +QSpacerItem *QLayoutItem::spacerItem() { - return 0; + return nullptr; } /*! @@ -354,7 +354,7 @@ QSpacerItem * QSpacerItem::spacerItem() /*! If this item manages a QWidget, returns that widget. Otherwise, - \c nullptr is returned. + \nullptr is returned. \note While the functions layout() and spacerItem() perform casts, this function returns another object: QLayout and QSpacerItem inherit QLayoutItem, @@ -362,9 +362,9 @@ QSpacerItem * QSpacerItem::spacerItem() \sa layout(), spacerItem() */ -QWidget * QLayoutItem::widget() +QWidget *QLayoutItem::widget() { - return 0; + return nullptr; } /*! diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index 89f860150f..cf15614680 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -1118,8 +1118,8 @@ void QOpenGLWidget::setTextureFormat(GLenum texFormat) /*! \return the active internal texture format if the widget has already initialized, the requested format if one was set but the widget has not yet - been made visible, or 0 if setTextureFormat() was not called and the widget - has not yet been made visible. + been made visible, or \nullptr if setTextureFormat() was not called and the + widget has not yet been made visible. \since 5.10 */ diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp index 7430d833db..0412dc188d 100644 --- a/src/widgets/kernel/qstackedlayout.cpp +++ b/src/widgets/kernel/qstackedlayout.cpp @@ -378,20 +378,20 @@ void QStackedLayout::setCurrentWidget(QWidget *widget) /*! - Returns the current widget, or 0 if there are no widgets in this - layout. + Returns the current widget, or \nullptr if there are no widgets + in this layout. \sa currentIndex(), setCurrentWidget() */ QWidget *QStackedLayout::currentWidget() const { Q_D(const QStackedLayout); - return d->index >= 0 ? d->list.at(d->index)->widget() : 0; + return d->index >= 0 ? d->list.at(d->index)->widget() : nullptr; } /*! - Returns the widget at the given \a index, or 0 if there is no - widget at the given position. + Returns the widget at the given \a index, or \nullptr if there is + no widget at the given position. \sa currentWidget(), indexOf() */ @@ -399,7 +399,7 @@ QWidget *QStackedLayout::widget(int index) const { Q_D(const QStackedLayout); if (index < 0 || index >= d->list.size()) - return 0; + return nullptr; return d->list.at(index)->widget(); } diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 1fa83d3238..4a798a7490 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -398,10 +398,10 @@ QWhatsThisPrivate::QWhatsThisPrivate() #ifdef QT_NO_CURSOR Q_UNUSED(sentEvent); #else - QApplication::setOverrideCursor((!sentEvent || !e.isAccepted())? + QGuiApplication::setOverrideCursor((!sentEvent || !e.isAccepted())? Qt::ForbiddenCursor:Qt::WhatsThisCursor); } else { - QApplication::setOverrideCursor(Qt::WhatsThisCursor); + QGuiApplication::setOverrideCursor(Qt::WhatsThisCursor); #endif } #ifndef QT_NO_ACCESSIBILITY @@ -417,7 +417,7 @@ QWhatsThisPrivate::~QWhatsThisPrivate() action->setChecked(false); #endif // QT_CONFIG(action) #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif #ifndef QT_NO_ACCESSIBILITY QAccessibleEvent event(this, QAccessible::ContextHelpEnd); diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 19599cc008..b4ae994375 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -511,10 +511,10 @@ void QWidget::setAutoFillBackground(bool enabled) Every widget's constructor accepts one or two standard arguments: \list 1 - \li \c{QWidget *parent = 0} is the parent of the new widget. If it is 0 - (the default), the new widget will be a window. If not, it will be - a child of \e parent, and be constrained by \e parent's geometry - (unless you specify Qt::Window as window flag). + \li \c{QWidget *parent = \nullptr} is the parent of the new widget. + If it is \nullptr (the default), the new widget will be a window. + If not, it will be a child of \e parent, and be constrained by + \e parent's geometry (unless you specify Qt::Window as window flag). \li \c{Qt::WindowFlags f = 0} (where available) sets the window flags; the default is suitable for almost all widgets, but to get, for example, a window without a window system frame, you must use @@ -1003,7 +1003,7 @@ struct QWidgetExceptionCleaner Constructs a widget which is a child of \a parent, with widget flags set to \a f. - If \a parent is 0, the new widget becomes a window. If + If \a parent is \nullptr, the new widget becomes a window. If \a parent is another widget, this widget becomes a child window inside \a parent. The new widget is deleted when its \a parent is deleted. @@ -2413,29 +2413,34 @@ static inline void fillRegion(QPainter *painter, const QRegion &rgn, const QBrus } } -void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int flags) const +bool QWidgetPrivate::updateBrushOrigin(QPainter *painter, const QBrush &brush) const { - Q_Q(const QWidget); - #if QT_CONFIG(scrollarea) - bool resetBrushOrigin = false; - QPointF oldBrushOrigin; + Q_Q(const QWidget); //If we are painting the viewport of a scrollarea, we must apply an offset to the brush in case we are drawing a texture + if (brush.style() == Qt::NoBrush || brush.style() == Qt::SolidPattern) + return false; QAbstractScrollArea *scrollArea = qobject_cast<QAbstractScrollArea *>(parent); if (scrollArea && scrollArea->viewport() == q) { QObjectData *scrollPrivate = static_cast<QWidget *>(scrollArea)->d_ptr.data(); QAbstractScrollAreaPrivate *priv = static_cast<QAbstractScrollAreaPrivate *>(scrollPrivate); - oldBrushOrigin = painter->brushOrigin(); - resetBrushOrigin = true; painter->setBrushOrigin(-priv->contentsOffset()); - } #endif // QT_CONFIG(scrollarea) + return true; +} + +void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int flags) const +{ + Q_Q(const QWidget); + bool brushOriginSet = false; const QBrush autoFillBrush = q->palette().brush(q->backgroundRole()); if ((flags & DrawAsRoot) && !(q->autoFillBackground() && autoFillBrush.isOpaque())) { const QBrush bg = q->palette().brush(QPalette::Window); + if (!brushOriginSet) + brushOriginSet = updateBrushOrigin(painter, bg); if (!(flags & DontSetCompositionMode)) { //copy alpha straight in QPainter::CompositionMode oldMode = painter->compositionMode(); @@ -2447,8 +2452,11 @@ void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int } } - if (q->autoFillBackground()) + if (q->autoFillBackground()) { + if (!brushOriginSet) + brushOriginSet = updateBrushOrigin(painter, autoFillBrush); fillRegion(painter, rgn, autoFillBrush); + } if (q->testAttribute(Qt::WA_StyledBackground)) { painter->setClipRegion(rgn); @@ -2456,11 +2464,6 @@ void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int opt.initFrom(q); q->style()->drawPrimitive(QStyle::PE_Widget, &opt, painter, q); } - -#if QT_CONFIG(scrollarea) - if (resetBrushOrigin) - painter->setBrushOrigin(oldBrushOrigin); -#endif // QT_CONFIG(scrollarea) } /* @@ -2494,12 +2497,12 @@ void QWidgetPrivate::deactivateWidgetCleanup() The window identifier type depends on the underlying window system, see \c qwindowdefs.h for the actual definition. If there - is no widget with this identifier, 0 is returned. + is no widget with this identifier, \nullptr is returned. */ QWidget *QWidget::find(WId id) { - return QWidgetPrivate::mapper ? QWidgetPrivate::mapper->value(id, 0) : 0; + return QWidgetPrivate::mapper ? QWidgetPrivate::mapper->value(id, 0) : nullptr; } @@ -3276,7 +3279,7 @@ void QWidget::addActions(QList<QAction*> actions) /*! Inserts the action \a action to this widget's list of actions, - before the action \a before. It appends the action if \a before is 0 or + before the action \a before. It appends the action if \a before is \nullptr or \a before is not a valid action for this widget. A QWidget should only have one of each action. @@ -3310,7 +3313,7 @@ void QWidget::insertAction(QAction *before, QAction *action) /*! Inserts the actions \a actions to this widget's list of actions, - before the action \a before. It appends the action if \a before is 0 or + before the action \a before. It appends the action if \a before is \nullptr or \a before is not a valid action for this widget. A QWidget can have at most one of each action. @@ -4333,7 +4336,8 @@ QWidget *QWidget::window() const \since 4.4 Returns the native parent for this widget, i.e. the next ancestor widget - that has a system identifier, or 0 if it does not have any native parent. + that has a system identifier, or \nullptr if it does not have any native + parent. \sa effectiveWinId() */ @@ -4954,9 +4958,9 @@ void QWidget::unsetLayoutDirection() Some underlying window implementations will reset the cursor if it leaves a widget even if the mouse is grabbed. If you want to have a cursor set for all widgets, even when outside the window, consider - QApplication::setOverrideCursor(). + QGuiApplication::setOverrideCursor(). - \sa QApplication::setOverrideCursor() + \sa QGuiApplication::setOverrideCursor() */ #ifndef QT_NO_CURSOR @@ -5269,7 +5273,7 @@ QPixmap QWidget::grab(const QRect &rectangle) \brief The graphicsEffect function returns a pointer to the widget's graphics effect. - If the widget has no graphics effect, 0 is returned. + If the widget has no graphics effect, \nullptr is returned. \since 4.6 @@ -5733,12 +5737,10 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset, QPoint offset = targetOffset; offset -= paintRegion.boundingRect().topLeft(); QPoint redirectionOffset; - QPaintDevice *redirected = 0; + QPaintDevice *redirected = nullptr; if (target->devType() == QInternal::Widget) redirected = static_cast<QWidget *>(target)->d_func()->redirected(&redirectionOffset); - if (!redirected) - redirected = QPainter::redirected(target, &redirectionOffset); if (redirected) { target = redirected; @@ -5915,10 +5917,10 @@ QPixmap QWidgetEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QPoint * Finds the nearest widget embedded in a graphics proxy widget along the chain formed by this widget and its ancestors. The search starts at \a origin (inclusive). - If successful, the function returns the proxy that embeds the widget, or 0 if no embedded - widget was found. + If successful, the function returns the proxy that embeds the widget, or \nullptr if no + embedded widget was found. */ -QGraphicsProxyWidget * QWidgetPrivate::nearestGraphicsProxyWidget(const QWidget *origin) +QGraphicsProxyWidget *QWidgetPrivate::nearestGraphicsProxyWidget(const QWidget *origin) { if (origin) { QWExtra *extra = origin->d_func()->extra; @@ -5926,7 +5928,7 @@ QGraphicsProxyWidget * QWidgetPrivate::nearestGraphicsProxyWidget(const QWidget return extra->proxyWidget; return nearestGraphicsProxyWidget(origin->parentWidget()); } - return 0; + return nullptr; } #endif @@ -6398,7 +6400,7 @@ void QWidget::setWindowRole(const QString &role) /*! - Sets the widget's focus proxy to widget \a w. If \a w is 0, the + Sets the widget's focus proxy to widget \a w. If \a w is \nullptr, the function resets this widget to have no focus proxy. Some widgets can "have focus", but create a child widget, such as @@ -6431,15 +6433,15 @@ void QWidget::setFocusProxy(QWidget * w) /*! - Returns the focus proxy, or 0 if there is no focus proxy. + Returns the focus proxy, or \nullptr if there is no focus proxy. \sa setFocusProxy() */ -QWidget * QWidget::focusProxy() const +QWidget *QWidget::focusProxy() const { Q_D(const QWidget); - return d->extra ? (QWidget *)d->extra->focus_proxy : 0; + return d->extra ? (QWidget *)d->extra->focus_proxy : nullptr; } @@ -8817,7 +8819,7 @@ QSize QWidget::minimumSizeHint() const /*! \fn QWidget *QWidget::parentWidget() const - Returns the parent of this widget, or 0 if it does not have any + Returns the parent of this widget, or \nullptr if it does not have any parent widget. */ @@ -10227,7 +10229,7 @@ QRegion QWidget::mask() const } /*! - Returns the layout manager that is installed on this widget, or 0 + Returns the layout manager that is installed on this widget, or \nullptr if no layout manager is installed. The layout manager sets the geometry of the widget's children @@ -12115,14 +12117,14 @@ bool QWidgetPrivate::navigateToDirection(Direction direction) Searches for a widget that is positioned in the \a direction, starting from the current focusWidget. - Returns the pointer to a found widget or 0, if there was no widget in - that direction. + Returns the pointer to a found widget or \nullptr, if there was no widget + in that direction. */ QWidget *QWidgetPrivate::widgetInNavigationDirection(Direction direction) { const QWidget *sourceWidget = QApplication::focusWidget(); if (!sourceWidget) - return 0; + return nullptr; const QRect sourceRect = sourceWidget->rect().translated(sourceWidget->mapToGlobal(QPoint())); const int sourceX = (direction == DirectionNorth || direction == DirectionSouth) ? @@ -12136,7 +12138,7 @@ QWidget *QWidgetPrivate::widgetInNavigationDirection(Direction direction) const QPoint sourceCenter = sourceRect.center(); const QWidget *sourceWindow = sourceWidget->window(); - QWidget *targetWidget = 0; + QWidget *targetWidget = nullptr; int shortestDistance = INT_MAX; const auto targetCandidates = QApplication::allWidgets(); @@ -12803,7 +12805,7 @@ void QWidget::releaseKeyboard() Returns the widget that is currently grabbing the mouse input. If no widget in this application is currently grabbing the mouse, - 0 is returned. + \nullptr is returned. \sa grabMouse(), keyboardGrabber() */ @@ -12820,7 +12822,7 @@ QWidget *QWidget::mouseGrabber() Returns the widget that is currently grabbing the keyboard input. If no widget in this application is currently grabbing the - keyboard, 0 is returned. + keyboard, \nullptr is returned. \sa grabMouse(), mouseGrabber() */ diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 9d5fe89c70..4e5ef5a111 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -235,7 +235,10 @@ public: bool isEnabled() const; bool isEnabledTo(const QWidget *) const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X ("Use isEnabled() instead") bool isEnabledToTLW() const; +#endif public Q_SLOTS: void setEnabled(bool); @@ -769,8 +772,10 @@ inline bool QWidget::isEnabled() const inline bool QWidget::isModal() const { return data->window_modality != Qt::NonModal; } +#if QT_DEPRECATED_SINCE(5, 13) inline bool QWidget::isEnabledToTLW() const { return isEnabled(); } +#endif inline int QWidget::minimumWidth() const { return minimumSize().width(); } diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 0d7e9e26ba..ab5dc6bfba 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -150,7 +150,7 @@ public: } private: - Q_DISABLE_COPY(QWidgetBackingStoreTracker) + Q_DISABLE_COPY_MOVE(QWidgetBackingStoreTracker) private: QWidgetBackingStore* m_ptr; @@ -402,6 +402,7 @@ public: void setUpdatesEnabled_helper(bool ); + bool updateBrushOrigin(QPainter *, const QBrush &brush) const; void paintBackground(QPainter *, const QRegion &, int flags = DrawAsRoot) const; bool isAboutToShow() const; QRegion prepareToRender(const QRegion ®ion, QWidget::RenderFlags renderFlags); diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h index 53ccda850a..41469a04bb 100644 --- a/src/widgets/kernel/qwidgetbackingstore_p.h +++ b/src/widgets/kernel/qwidgetbackingstore_p.h @@ -305,7 +305,7 @@ private: friend class QWidget; friend class QBackingStore; - Q_DISABLE_COPY(QWidgetBackingStore) + Q_DISABLE_COPY_MOVE(QWidgetBackingStore) }; QT_END_NAMESPACE diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h index 5007b79739..7e1b978bba 100644 --- a/src/widgets/statemachine/qbasickeyeventtransition_p.h +++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h @@ -84,7 +84,7 @@ protected: void onTransition(QEvent *) override; private: - Q_DISABLE_COPY(QBasicKeyEventTransition) + Q_DISABLE_COPY_MOVE(QBasicKeyEventTransition) Q_DECLARE_PRIVATE(QBasicKeyEventTransition) }; diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h index 93d2a5ec61..132e223535 100644 --- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h +++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h @@ -87,7 +87,7 @@ protected: void onTransition(QEvent *) override; private: - Q_DISABLE_COPY(QBasicMouseEventTransition) + Q_DISABLE_COPY_MOVE(QBasicMouseEventTransition) Q_DECLARE_PRIVATE(QBasicMouseEventTransition) }; diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 79e338a6e7..01c400c5da 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -100,6 +100,9 @@ #if QT_CONFIG(wizard) #include <qwizard.h> #endif +#if QT_CONFIG(filedialog) +#include <qsidebar_p.h> +#endif #include <qfileinfo.h> #include <qdir.h> #if QT_CONFIG(settings) @@ -196,7 +199,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q break; case PE_IndicatorCheckBox: if (opt->state & State_NoChange) { - p->setPen(opt->palette.foreground().color()); + p->setPen(opt->palette.windowText().color()); p->fillRect(opt->rect, opt->palette.brush(QPalette::Button)); p->drawRect(opt->rect); p->drawLine(opt->rect.topLeft(), opt->rect.bottomRight()); @@ -212,7 +215,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q p->drawArc(opt->rect, 0, 5760); if (opt->state & (State_Sunken | State_On)) { ir.adjust(2, 2, -2, -2); - p->setBrush(opt->palette.foreground()); + p->setBrush(opt->palette.windowText()); bool oldQt4CompatiblePainting = p->testRenderHint(QPainter::Qt4CompatiblePainting); p->setRenderHint(QPainter::Qt4CompatiblePainting); p->drawEllipse(ir); @@ -231,7 +234,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q else p->setPen(Qt::white); } else { - p->setPen(opt->palette.foreground().color()); + p->setPen(opt->palette.windowText().color()); } QRect focusRect = opt->rect.adjusted(1, 1, -1, -1); p->drawRect(focusRect.adjusted(0, 0, -1, -1)); //draw pen inclusive @@ -278,7 +281,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q qDrawShadePanel(p, frame->rect, frame->palette, frame->state & State_Sunken, frame->lineWidth); } else { - qDrawPlainRect(p, frame->rect, frame->palette.foreground().color(), frame->lineWidth); + qDrawPlainRect(p, frame->rect, frame->palette.windowText().color(), frame->lineWidth); } } break; @@ -615,7 +618,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q } p->setPen(QPen(tab->palette.dark(), qreal(.8))); - p->setBrush(tab->palette.background()); + p->setBrush(tab->palette.window()); p->setRenderHint(QPainter::Antialiasing); p->drawPath(path); } @@ -748,7 +751,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q QString pixmapName = QStyleHelper::uniqueName(QLatin1String("$qt_ia-") % QLatin1String(metaObject()->className()), opt, QSize(size, size)) % HexString<uint>(pe); - if (!QPixmapCache::find(pixmapName, pixmap)) { + if (!QPixmapCache::find(pixmapName, &pixmap)) { qreal pixelRatio = p->device()->devicePixelRatioF(); int border = qRound(pixelRatio*(size/5)); int sqsize = qRound(pixelRatio*(2*(size/2))); @@ -1232,8 +1235,9 @@ void QCommonStylePrivate::tabLayout(const QStyleOptionTab *opt, const QWidget *w // High-dpi icons do not need adjustment; make sure tabIconSize is not larger than iconSize tabIconSize = QSize(qMin(tabIconSize.width(), iconSize.width()), qMin(tabIconSize.height(), iconSize.height())); - *iconRect = QRect(tr.left(), tr.center().y() - tabIconSize.height() / 2, - tabIconSize.width(), tabIconSize.height()); + const int offsetX = (iconSize.width() - tabIconSize.width()) / 2; + *iconRect = QRect(tr.left() + offsetX, tr.center().y() - tabIconSize.height() / 2, + tabIconSize.width(), tabIconSize.height()); if (!verticalTabs) *iconRect = proxyStyle->visualRect(opt->direction, opt->rect, *iconRect); tr.setLeft(tr.left() + tabIconSize.width() + 4); @@ -1548,7 +1552,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, QPalette pal2 = pb->palette; // Correct the highlight color if it is the same as the background - if (pal2.highlight() == pal2.background()) + if (pal2.highlight() == pal2.window()) pal2.setColor(QPalette::Highlight, pb->palette.color(QPalette::Active, QPalette::Highlight)); bool reverse = ((!vertical && (pb->direction == Qt::RightToLeft)) || vertical); @@ -1836,14 +1840,14 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, } } - p->setPen(QPen(tab->palette.foreground(), 0)); + p->setPen(QPen(tab->palette.windowText(), 0)); if (selected) { p->setBrush(tab->palette.base()); } else { if (widget && widget->parentWidget()) - p->setBrush(widget->parentWidget()->palette().background()); + p->setBrush(widget->parentWidget()->palette().window()); else - p->setBrush(tab->palette.background()); + p->setBrush(tab->palette.window()); } int y; @@ -2140,7 +2144,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, const int indent = p->fontMetrics().descent(); proxy()->drawItemText(p, r.adjusted(indent + 1, 1, -indent - 1, -1), - Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, dwOpt->palette, + Qt::AlignLeft | Qt::AlignVCenter, dwOpt->palette, dwOpt->state & State_Enabled, dwOpt->title, QPalette::WindowText); @@ -2167,7 +2171,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, } break; case CE_FocusFrame: - p->fillRect(opt->rect, opt->palette.foreground()); + p->fillRect(opt->rect, opt->palette.windowText()); break; case CE_HeaderSection: qDrawShadePanel(p, opt->rect, opt->palette, @@ -2175,7 +2179,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, &opt->palette.brush(QPalette::Button)); break; case CE_HeaderEmptyArea: - p->fillRect(opt->rect, opt->palette.background()); + p->fillRect(opt->rect, opt->palette.window()); break; #if QT_CONFIG(combobox) case CE_ComboBoxLabel: @@ -3120,7 +3124,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, } d->cachedOption = new QStyleOptionViewItem(*vopt); } - if (sr == SE_ViewItemCheckIndicator) + if (sr == SE_ItemViewItemCheckIndicator) r = d->checkRect; else if (sr == SE_ItemViewItemDecoration) r = d->decorationRect; @@ -3239,7 +3243,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl // Since there is no subrect for tickmarks do a translation here. p->save(); p->translate(slider->rect.x(), slider->rect.y()); - p->setPen(slider->palette.foreground().color()); + p->setPen(slider->palette.windowText().color()); int v = slider->minimum; while (v <= slider->maximum + 1) { if (v == slider->maximum + 1 && interval == 1) @@ -3685,7 +3689,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl QPalette pal = opt->palette; // draw notches if (dial->subControls & QStyle::SC_DialTickmarks) { - p->setPen(pal.foreground().color()); + p->setPen(pal.windowText().color()); p->drawLines(QStyleHelper::calcLines(dial)); } @@ -4342,8 +4346,10 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex int topMargin = 0; int topHeight = 0; int verticalAlignment = proxy()->styleHint(SH_GroupBox_TextLabelVerticalAlignment, groupBox, widget); - if (groupBox->text.size() || (groupBox->subControls & QStyle::SC_GroupBoxCheckBox)) { - topHeight = groupBox->fontMetrics.height(); + bool hasCheckBox = groupBox->subControls & QStyle::SC_GroupBoxCheckBox; + if (groupBox->text.size() || hasCheckBox) { + int checkBoxHeight = hasCheckBox ? proxy()->pixelMetric(PM_IndicatorHeight, groupBox, widget) : 0; + topHeight = qMax(groupBox->fontMetrics.height(), checkBoxHeight); if (verticalAlignment & Qt::AlignVCenter) topMargin = topHeight / 2; else if (verticalAlignment & Qt::AlignTop) @@ -4368,20 +4374,24 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex case SC_GroupBoxCheckBox: case SC_GroupBoxLabel: { QFontMetrics fontMetrics = groupBox->fontMetrics; - int h = fontMetrics.height(); + int th = fontMetrics.height(); int tw = fontMetrics.size(Qt::TextShowMnemonic, groupBox->text + QLatin1Char(' ')).width(); int marg = (groupBox->features & QStyleOptionFrame::Flat) ? 0 : 8; ret = groupBox->rect.adjusted(marg, 0, -marg, 0); - ret.setHeight(h); int indicatorWidth = proxy()->pixelMetric(PM_IndicatorWidth, opt, widget); + int indicatorHeight = proxy()->pixelMetric(PM_IndicatorHeight, opt, widget); int indicatorSpace = proxy()->pixelMetric(PM_CheckBoxLabelSpacing, opt, widget) - 1; bool hasCheckBox = groupBox->subControls & QStyle::SC_GroupBoxCheckBox; - int checkBoxSize = hasCheckBox ? (indicatorWidth + indicatorSpace) : 0; + int checkBoxWidth = hasCheckBox ? (indicatorWidth + indicatorSpace) : 0; + int checkBoxHeight = hasCheckBox ? indicatorHeight : 0; + + int h = qMax(th, checkBoxHeight); + ret.setHeight(h); // Adjusted rect for label + indicatorWidth + indicatorSpace QRect totalRect = alignedRect(groupBox->direction, groupBox->textAlignment, - QSize(tw + checkBoxSize, h), ret); + QSize(tw + checkBoxWidth, h), ret); // Adjust totalRect if checkbox is set if (hasCheckBox) { @@ -4389,15 +4399,14 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex int left = 0; // Adjust for check box if (sc == SC_GroupBoxCheckBox) { - int indicatorHeight = proxy()->pixelMetric(PM_IndicatorHeight, opt, widget); left = ltr ? totalRect.left() : (totalRect.right() - indicatorWidth); - int top = totalRect.top() + qMax(0, fontMetrics.height() - indicatorHeight) / 2; + int top = totalRect.top() + (h - checkBoxHeight) / 2; totalRect.setRect(left, top, indicatorWidth, indicatorHeight); // Adjust for label } else { - left = ltr ? (totalRect.left() + checkBoxSize - 2) : totalRect.left(); - totalRect.setRect(left, totalRect.top(), - totalRect.width() - checkBoxSize, totalRect.height()); + left = ltr ? (totalRect.left() + checkBoxWidth - 2) : totalRect.left(); + int top = totalRect.top() + (h - th) / 2; + totalRect.setRect(left, top, totalRect.width() - checkBoxWidth, th); } } ret = totalRect; @@ -4773,9 +4782,16 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid break; case PM_TabBarIconSize: - case PM_ListViewIconSize: ret = proxy()->pixelMetric(PM_SmallIconSize, opt, widget); break; + case PM_ListViewIconSize: +#if QT_CONFIG(filedialog) + if (qobject_cast<const QSidebar *>(widget)) + ret = int(QStyleHelper::dpiScaled(24.)); + else +#endif + ret = proxy()->pixelMetric(PM_SmallIconSize, opt, widget); + break; case PM_ButtonIconSize: case PM_SmallIconSize: @@ -4955,8 +4971,8 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, break; #if QT_CONFIG(groupbox) case CT_GroupBox: - if (const QGroupBox *grb = static_cast<const QGroupBox *>(widget)) - sz += QSize(!grb->isFlat() ? 16 : 0, 0); + if (const QStyleOptionGroupBox *styleOpt = qstyleoption_cast<const QStyleOptionGroupBox *>(opt)) + sz += QSize(styleOpt->features.testFlag(QStyleOptionFrame::Flat) ? 0 : 16, 0); break; #endif // QT_CONFIG(groupbox) case CT_MdiControls: diff --git a/src/widgets/styles/qdrawutil.cpp b/src/widgets/styles/qdrawutil.cpp index 299dbb9f82..d30b43a679 100644 --- a/src/widgets/styles/qdrawutil.cpp +++ b/src/widgets/styles/qdrawutil.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE namespace { class PainterStateGuard { - Q_DISABLE_COPY(PainterStateGuard) + Q_DISABLE_COPY_MOVE(PainterStateGuard) public: explicit PainterStateGuard(QPainter *p) : m_painter(p) {} ~PainterStateGuard() diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index c565932889..0e95d6efa4 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -261,7 +261,7 @@ static void qt_fusion_draw_arrow(Qt::ArrowType type, QPainter *painter, const QS QString cacheKey = QStyleHelper::uniqueName(QLatin1String("fusion-arrow"), option, rect.size()) % HexString<uint>(type) % HexString<uint>(color.rgba()); - if (!QPixmapCache::find(cacheKey, cachePixmap)) { + if (!QPixmapCache::find(cacheKey, &cachePixmap)) { cachePixmap = styleCachePixmap(rect.size()); cachePixmap.fill(Qt::transparent); QPainter cachePainter(&cachePixmap); @@ -539,7 +539,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, { if (option->rect.width() <= 1 || option->rect.height() <= 1) break; - QColor arrowColor = option->palette.foreground().color(); + QColor arrowColor = option->palette.windowText().color(); arrowColor.setAlpha(160); Qt::ArrowType arrow = Qt::UpArrow; switch (elem) { @@ -569,7 +569,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, case PE_IndicatorHeaderArrow: if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) { QRect r = header->rect; - QColor arrowColor = header->palette.foreground().color(); + QColor arrowColor = header->palette.windowText().color(); arrowColor.setAlpha(180); QPoint offset = QPoint(0, -2); @@ -598,24 +598,24 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, const int margin = 6; if (option->state & State_Horizontal) { const int offset = rect.width()/2; - painter->setPen(QPen(option->palette.background().color().darker(110))); + painter->setPen(QPen(option->palette.window().color().darker(110))); painter->drawLine(rect.bottomLeft().x() + offset, rect.bottomLeft().y() - margin, rect.topLeft().x() + offset, rect.topLeft().y() + margin); - painter->setPen(QPen(option->palette.background().color().lighter(110))); + painter->setPen(QPen(option->palette.window().color().lighter(110))); painter->drawLine(rect.bottomLeft().x() + offset + 1, rect.bottomLeft().y() - margin, rect.topLeft().x() + offset + 1, rect.topLeft().y() + margin); } else { //Draw vertical separator const int offset = rect.height()/2; - painter->setPen(QPen(option->palette.background().color().darker(110))); + painter->setPen(QPen(option->palette.window().color().darker(110))); painter->drawLine(rect.topLeft().x() + margin , rect.topLeft().y() + offset, rect.topRight().x() - margin, rect.topRight().y() + offset); - painter->setPen(QPen(option->palette.background().color().lighter(110))); + painter->setPen(QPen(option->palette.window().color().lighter(110))); painter->drawLine(rect.topLeft().x() + margin , rect.topLeft().y() + offset + 1, rect.topRight().x() - margin, @@ -642,8 +642,8 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, { painter->setPen(QPen(outline)); painter->drawRect(option->rect.adjusted(0, 0, -1, -1)); - QColor frameLight = option->palette.background().color().lighter(160); - QColor frameShadow = option->palette.background().color().darker(110); + QColor frameLight = option->palette.window().color().lighter(160); + QColor frameShadow = option->palette.window().color().darker(110); //paint beveleffect QRect frame = option->rect.adjusted(1, 1, -1, -1); @@ -661,14 +661,14 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, painter->save(); { - QColor softshadow = option->palette.background().color().darker(120); + QColor softshadow = option->palette.window().color().darker(120); QRect rect= option->rect; painter->setPen(softshadow); painter->drawRect(option->rect.adjusted(0, 0, -1, -1)); painter->setPen(QPen(option->palette.light(), 1)); painter->drawLine(QPoint(rect.left() + 1, rect.top() + 1), QPoint(rect.left() + 1, rect.bottom() - 1)); - painter->setPen(QPen(option->palette.background().color().darker(120))); + painter->setPen(QPen(option->palette.window().color().darker(120))); painter->drawLine(QPoint(rect.left() + 1, rect.bottom() - 1), QPoint(rect.right() - 2, rect.bottom() - 1)); painter->drawLine(QPoint(rect.right() - 1, rect.top() + 1), QPoint(rect.right() - 1, rect.bottom() - 1)); @@ -704,7 +704,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, painter->setPen(QPen(option->palette.light(), 1)); painter->drawLine(QPoint(rect.left() + 1, rect.top() + 1), QPoint(rect.left() + 1, rect.bottom() - 1)); - painter->setPen(QPen(option->palette.background().color().darker(120))); + painter->setPen(QPen(option->palette.window().color().darker(120))); painter->drawLine(QPoint(rect.left() + 1, rect.bottom() - 1), QPoint(rect.right() - 2, rect.bottom() - 1)); painter->drawLine(QPoint(rect.right() - 1, rect.top() + 1), @@ -748,7 +748,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, painter->translate(0.5, 0.5); rect = rect.adjusted(0, 0, -1, -1); - QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.foreground().color(), 85); + QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.windowText().color(), 85); painter->setBrush(Qt::NoBrush); // Gradient fill @@ -802,14 +802,14 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, case PE_IndicatorRadioButton: painter->save(); { - QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.foreground().color(), 85); + QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.windowText().color(), 85); painter->setBrush((state & State_Sunken) ? pressedColor : option->palette.base().color()); painter->setRenderHint(QPainter::Antialiasing, true); QPainterPath circle; const QPointF circleCenter = rect.center() + QPoint(1, 1); const qreal outlineRadius = (rect.width() + (rect.width() + 1) % 2) / 2.0 - 1; circle.addEllipse(circleCenter, outlineRadius, outlineRadius); - painter->setPen(QPen(option->palette.background().color().darker(150))); + painter->setPen(QPen(option->palette.window().color().darker(150))); if (option->state & State_HasFocus && option->state & State_KeyboardFocusChange) painter->setPen(QPen(highlightedOutline)); painter->drawPath(circle); @@ -991,7 +991,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, case PE_PanelMenu: { painter->save(); const QBrush menuBackground = option->palette.base().color().lighter(108); - QColor borderColor = option->palette.background().color().darker(160); + QColor borderColor = option->palette.window().color().darker(160); qDrawPlainRect(painter, option->rect, borderColor, 1, &menuBackground); painter->restore(); } @@ -1256,7 +1256,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio Qt::ElideRight, titleRect.width()); proxy()->drawItemText(painter, titleRect, - Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, dwOpt->palette, + Qt::AlignLeft | Qt::AlignVCenter, dwOpt->palette, dwOpt->state & State_Enabled, titleText, QPalette::WindowText); } @@ -1272,7 +1272,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio pixmapName += QString::number(- int(header->orientation)); QPixmap cache; - if (!QPixmapCache::find(pixmapName, cache)) { + if (!QPixmapCache::find(pixmapName, &cache)) { cache = styleCachePixmap(rect.size()); cache.fill(Qt::transparent); QRect pixmapRect(0, 0, rect.width(), rect.height()); @@ -1283,8 +1283,8 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio gradientStopColor = buttonColor.darker(102); QLinearGradient gradient(pixmapRect.topLeft(), pixmapRect.bottomLeft()); - if (option->palette.background().gradient()) { - gradient.setStops(option->palette.background().gradient()->stops()); + if (option->palette.window().gradient()) { + gradient.setStops(option->palette.window().gradient()->stops()); } else { QColor midColor1 = mergedColors(gradientStartColor, gradientStopColor, 60); QColor midColor2 = mergedColors(gradientStartColor, gradientStopColor, 40); @@ -1519,7 +1519,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio proxy()->drawItemText(painter, item.rect, alignment, mbi->palette, mbi->state & State_Enabled, mbi->text, textRole); } else { - QColor shadow = mergedColors(option->palette.background().color().darker(120), + QColor shadow = mergedColors(option->palette.window().color().darker(120), outline.lighter(140), 60); painter->setPen(QPen(shadow)); painter->drawLine(option->rect.bottomLeft(), option->rect.bottomRight()); @@ -1649,7 +1649,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio if (!ignoreCheckMark && checkable && checked) { QStyleOption opt = *option; if (act) { - QColor activeColor = mergedColors(option->palette.background().color(), + QColor activeColor = mergedColors(option->palette.window().color(), option->palette.highlight().color()); opt.palette.setBrush(QPalette::Button, activeColor); } @@ -1731,7 +1731,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio newMI.rect = vSubMenuRect; newMI.state = !enabled ? State_None : State_Enabled; if (selected) - newMI.palette.setColor(QPalette::Foreground, + newMI.palette.setColor(QPalette::WindowText, newMI.palette.highlightedText().color()); proxy()->drawPrimitive(arrow, &newMI, painter, widget); } @@ -1812,7 +1812,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio painter->save(); { painter->fillRect(rect, option->palette.window()); - QColor shadow = mergedColors(option->palette.background().color().darker(120), + QColor shadow = mergedColors(option->palette.window().color().darker(120), outline.lighter(140), 60); painter->setPen(QPen(shadow)); painter->drawLine(option->rect.bottomLeft(), option->rect.bottomRight()); @@ -1975,7 +1975,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption // ### backgroundrole/foregroundrole should be part of the style option alphaCornerColor = mergedColors(option->palette.color(widget->backgroundRole()), outline); } else { - alphaCornerColor = mergedColors(option->palette.background().color(), outline); + alphaCornerColor = mergedColors(option->palette.window().color(), outline); } switch (control) { @@ -2030,7 +2030,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) { QPixmap cache; QString pixmapName = QStyleHelper::uniqueName(QLatin1String("spinbox"), spinBox, spinBox->rect.size()); - if (!QPixmapCache::find(pixmapName, cache)) { + if (!QPixmapCache::find(pixmapName, &cache)) { cache = styleCachePixmap(spinBox->rect.size()); cache.fill(Qt::transparent); @@ -2039,7 +2039,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption QRect rect = pixmapRect; QRect r = rect.adjusted(0, 1, 0, -1); QPainter cachePainter(&cache); - QColor arrowColor = spinBox->palette.foreground().color(); + QColor arrowColor = spinBox->palette.windowText().color(); arrowColor.setAlpha(160); bool isEnabled = (spinBox->state & State_Enabled); @@ -2174,13 +2174,13 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption QColor highlight = option->palette.highlight().color(); QColor titleBarFrameBorder(active ? highlight.darker(180): outline.darker(110)); - QColor titleBarHighlight(active ? highlight.lighter(120): palette.background().color().lighter(120)); + QColor titleBarHighlight(active ? highlight.lighter(120): palette.window().color().lighter(120)); QColor textColor(active ? 0xffffff : 0xff000000); QColor textAlphaColor(active ? 0xffffff : 0xff000000 ); { // Fill title bar gradient - QColor titlebarColor = QColor(active ? highlight: palette.background().color()); + QColor titlebarColor = QColor(active ? highlight: palette.window().color()); QLinearGradient gradient(option->rect.center().x(), option->rect.top(), option->rect.center().x(), option->rect.bottom()); @@ -2531,7 +2531,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption QColor alphaOutline = outline; alphaOutline.setAlpha(180); - QColor arrowColor = option->palette.foreground().color(); + QColor arrowColor = option->palette.windowText().color(); arrowColor.setAlpha(160); const QColor bgColor = QStyleHelper::backgroundColor(option->palette, widget); @@ -2745,7 +2745,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption if (!comboBox->frame) pixmapName += QLatin1String("-frameless"); - if (!QPixmapCache::find(pixmapName, cache)) { + if (!QPixmapCache::find(pixmapName, &cache)) { cache = styleCachePixmap(comboBox->rect.size()); cache.fill(Qt::transparent); QPainter cachePainter(&cache); @@ -2852,7 +2852,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption QRect pixmapRect(0, 0, groove.width(), groove.height()); // draw background groove - if (!QPixmapCache::find(groovePixmapName, cache)) { + if (!QPixmapCache::find(groovePixmapName, &cache)) { cache = styleCachePixmap(pixmapRect.size()); cache.fill(Qt::transparent); QPainter groovePainter(&cache); @@ -2880,7 +2880,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption // draw blue groove highlight QRect clipRect; groovePixmapName += QLatin1String("_blue"); - if (!QPixmapCache::find(groovePixmapName, cache)) { + if (!QPixmapCache::find(groovePixmapName, &cache)) { cache = styleCachePixmap(pixmapRect.size()); cache.fill(Qt::transparent); QPainter groovePainter(&cache); @@ -2987,7 +2987,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption // draw handle if ((option->subControls & SC_SliderHandle) ) { QString handlePixmapName = QStyleHelper::uniqueName(QLatin1String("slider_handle"), option, handle.size()); - if (!QPixmapCache::find(handlePixmapName, cache)) { + if (!QPixmapCache::find(handlePixmapName, &cache)) { cache = styleCachePixmap(handle.size()); cache.fill(Qt::transparent); QRect pixmapRect(0, 0, handle.width(), handle.height()); @@ -3225,7 +3225,7 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti QFont fontBold = menuItem->font; fontBold.setBold(true); QFontMetrics fmBold(fontBold); - w += fmBold.width(menuItem->text) - fm.horizontalAdvance(menuItem->text); + w += fmBold.horizontalAdvance(menuItem->text) - fm.horizontalAdvance(menuItem->text); } const int checkcol = qMax<int>(maxpmw, QStyleHelper::dpiScaled(QFusionStylePrivate::menuCheckMarkWidth)); // Windows always shows a check column w += checkcol; @@ -3705,7 +3705,7 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW return 0; case SH_Table_GridLineColor: - return option ? option->palette.background().color().darker(120).rgb() : 0; + return option ? option->palette.window().color().darker(120).rgb() : 0; case SH_MessageBox_TextInteractionFlags: return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse; diff --git a/src/widgets/styles/qfusionstyle_p_p.h b/src/widgets/styles/qfusionstyle_p_p.h index 169fd9a407..a92041fcfe 100644 --- a/src/widgets/styles/qfusionstyle_p_p.h +++ b/src/widgets/styles/qfusionstyle_p_p.h @@ -113,7 +113,7 @@ public: QColor outline(const QPalette &pal) const { if (pal.window().style() == Qt::TexturePattern) return QColor(0, 0, 0, 160); - return pal.background().color().darker(140); + return pal.window().color().darker(140); } QColor highlightedOutline(const QPalette &pal) const { diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index 9192dae864..8256f908db 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -308,8 +308,8 @@ public: SE_TabWidgetLeftCorner, SE_TabWidgetRightCorner, - SE_ViewItemCheckIndicator, // ### Qt 6: remove - SE_ItemViewItemCheckIndicator = SE_ViewItemCheckIndicator, + SE_ItemViewItemCheckIndicator, + SE_ViewItemCheckIndicator = SE_ItemViewItemCheckIndicator, // ### Qt 6: remove SE_TabBarTearIndicator, SE_TabBarTearIndicatorLeft = SE_TabBarTearIndicator, diff --git a/src/widgets/styles/qstyle_p.h b/src/widgets/styles/qstyle_p.h index 94e4540d0b..cdea29f944 100644 --- a/src/widgets/styles/qstyle_p.h +++ b/src/widgets/styles/qstyle_p.h @@ -96,7 +96,7 @@ inline QPixmap styleCachePixmap(const QSize &size) int txType = painter->deviceTransform().type() | painter->worldTransform().type(); \ bool doPixmapCache = (!option->rect.isEmpty()) \ && ((txType <= QTransform::TxTranslate) || (painter->deviceTransform().type() == QTransform::TxScale)); \ - if (doPixmapCache && QPixmapCache::find(unique, internalPixmapCache)) { \ + if (doPixmapCache && QPixmapCache::find(unique, &internalPixmapCache)) { \ painter->drawPixmap(option->rect.topLeft(), internalPixmapCache); \ } else { \ if (doPixmapCache) { \ diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index 97631a5841..88031a9f1e 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -3270,7 +3270,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version) \fn template <typename T> T qstyleoption_cast<T>(const QStyleOption *option) \relates QStyleOption - Returns a T or 0 depending on the \l{QStyleOption::type}{type} and + Returns a T or \nullptr depending on the \l{QStyleOption::type}{type} and \l{QStyleOption::version}{version} of the given \a option. Example: @@ -3285,7 +3285,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version) \overload \relates QStyleOption - Returns a T or 0 depending on the type of the given \a option. + Returns a T or \nullptr depending on the type of the given \a option. */ #if QT_CONFIG(tabwidget) @@ -4006,7 +4006,7 @@ QStyleHintReturnVariant::~QStyleHintReturnVariant() \fn template <typename T> T qstyleoption_cast<T>(const QStyleHintReturn *hint) \relates QStyleHintReturn - Returns a T or 0 depending on the \l{QStyleHintReturn::type}{type} + Returns a T or \nullptr depending on the \l{QStyleHintReturn::type}{type} and \l{QStyleHintReturn::version}{version} of \a hint. Example: @@ -4021,7 +4021,7 @@ QStyleHintReturnVariant::~QStyleHintReturnVariant() \overload \relates QStyleHintReturn - Returns a T or 0 depending on the type of \a hint. + Returns a T or \nullptr depending on the type of \a hint. */ #if !defined(QT_NO_DEBUG_STREAM) diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 79fa20851f..b058d4c557 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -44,6 +44,7 @@ #include "private/qcssutil_p.h" #include <qdebug.h> +#include <qdir.h> #include <qapplication.h> #if QT_CONFIG(menu) #include <qmenu.h> @@ -957,8 +958,10 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QObject origin = Origin_Padding; Origin clip = Origin_Border; if (v.extractBackground(&brush, &uri, &repeat, &alignment, &origin, &attachment, &clip)) { - bg = new QStyleSheetBackgroundData(brush, QStyleSheetStyle::loadPixmap(uri, object), - repeat, alignment, origin, attachment, clip); + QPixmap pixmap = QStyleSheetStyle::loadPixmap(uri, object); + if (!uri.isEmpty() && pixmap.isNull()) + qWarning("Could not create pixmap from %s", qPrintable(QDir::toNativeSeparators(uri))); + bg = new QStyleSheetBackgroundData(brush, pixmap, repeat, alignment, origin, attachment, clip); } QBrush sfg, fg; @@ -3243,8 +3246,8 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC #if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { - QStyleOptionSlider sbOpt(*sb); if (!rule.hasDrawable()) { + QStyleOptionSlider sbOpt(*sb); sbOpt.rect = rule.borderRect(opt->rect); rule.drawBackgroundImage(p, opt->rect); baseStyle()->drawComplexControl(cc, &sbOpt, p, w); @@ -4222,7 +4225,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q QString titleText = p->fontMetrics().elidedText(dwOpt->title, Qt::ElideRight, r.width()); drawItemText(p, r, - alignment | Qt::TextShowMnemonic, dwOpt->palette, + alignment, dwOpt->palette, dwOpt->state & State_Enabled, titleText, QPalette::WindowText); @@ -5080,10 +5083,11 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op QRenderRule subRule = renderRule(w, opt, pe); if ((pe == PseudoElement_MenuSeparator) && subRule.hasContentsSize()) { return QSize(sz.width(), subRule.size().height()); - } else if ((pe == PseudoElement_Item) && (subRule.hasBox() || subRule.hasBorder())) { - int width = csz.width(); + } + if ((pe == PseudoElement_Item) && (subRule.hasBox() || subRule.hasBorder() || subRule.hasFont)) { + QSize sz(csz); if (mi->text.contains(QLatin1Char('\t'))) - width += 12; //as in QCommonStyle + sz.rwidth() += 12; //as in QCommonStyle bool checkable = mi->checkType != QStyleOptionMenuItem::NotCheckable; int checkableWidth = 0; if (checkable) { @@ -5093,15 +5097,20 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op } if (!mi->icon.isNull()) { QPixmap pixmap = mi->icon.pixmap(pixelMetric(PM_SmallIconSize)); - width += pixmap.width(); + sz.rwidth() += pixmap.width(); + } + if (subRule.hasFont) { + QFontMetrics fm(subRule.font); + const QRect r = fm.boundingRect(QRect(), Qt::TextSingleLine | Qt::TextShowMnemonic, mi->text); + sz = sz.expandedTo(r.size()); } // padding overrules it all if (!subRule.hasBox() || subRule.box()->paddings[LeftEdge] == 0) { - width += checkableWidth; + sz.rwidth() += checkableWidth; if (!mi->icon.isNull() || !checkable) - width += mi->maxIconWidth; + sz.rwidth() += mi->maxIconWidth; } - return subRule.boxSize(subRule.adjustSize(QSize(width, csz.height()))); + return subRule.boxSize(subRule.adjustSize(sz)); } } break; @@ -5772,11 +5781,10 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c case SE_PushButtonContents: case SE_PushButtonFocusRect: if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt)) { - QStyleOptionButton btnOpt(*btn); if (rule.hasBox() || !rule.hasNativeBorder()) return visualRect(opt->direction, opt->rect, rule.contentsRect(opt->rect)); - return rule.baseStyleCanDraw() ? baseStyle()->subElementRect(se, &btnOpt, w) - : QWindowsStyle::subElementRect(se, &btnOpt, w); + return rule.baseStyleCanDraw() ? baseStyle()->subElementRect(se, btn, w) + : QWindowsStyle::subElementRect(se, btn, w); } break; @@ -5831,7 +5839,7 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c return ParentStyle::subElementRect(se, opt, w); #if QT_CONFIG(itemviews) - case SE_ViewItemCheckIndicator: + case SE_ItemViewItemCheckIndicator: if (!qstyleoption_cast<const QStyleOptionViewItem *>(opt)) { return subElementRect(SE_CheckBoxIndicator, opt, w); } diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h index d4edb83525..9c4b87fc32 100644 --- a/src/widgets/styles/qstylesheetstyle_p.h +++ b/src/widgets/styles/qstylesheetstyle_p.h @@ -173,7 +173,7 @@ public: static int numinstances; private: - Q_DISABLE_COPY(QStyleSheetStyle) + Q_DISABLE_COPY_MOVE(QStyleSheetStyle) Q_DECLARE_PRIVATE(QStyleSheetStyle) }; diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 12ca5201c1..c0a8228e42 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -248,7 +248,7 @@ void QWindowsStyle::polish(QApplication *app) d->activeGradientCaptionColor = app->palette().highlight() .color(); d->inactiveCaptionColor = app->palette().dark().color(); d->inactiveGradientCaptionColor = app->palette().dark().color(); - d->inactiveCaptionText = app->palette().background().color(); + d->inactiveCaptionText = app->palette().window().color(); #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) //fetch native title bar colors if(app->desktopSettingsAware()){ @@ -817,7 +817,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, else if (opt->state & State_Enabled) fill = opt->palette.base(); else - fill = opt->palette.background(); + fill = opt->palette.window(); p->save(); doRestore = true; qDrawWinPanel(p, opt->rect, opt->palette, true, &fill); @@ -951,14 +951,14 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, if (frame->lineWidth == 2 || pe == PE_Frame) { QPalette popupPal = frame->palette; if (pe == PE_FrameMenu) { - popupPal.setColor(QPalette::Light, frame->palette.background().color()); + popupPal.setColor(QPalette::Light, frame->palette.window().color()); popupPal.setColor(QPalette::Midlight, frame->palette.light().color()); } if (pe == PE_Frame && (frame->state & State_Raised)) qDrawWinButton(p, frame->rect, popupPal, frame->state & State_Sunken); else if (pe == PE_Frame && (frame->state & State_Sunken)) { - popupPal.setColor(QPalette::Midlight, frame->palette.background().color()); + popupPal.setColor(QPalette::Midlight, frame->palette.window().color()); qDrawWinPanel(p, frame->rect, popupPal, frame->state & State_Sunken); } else @@ -968,7 +968,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, } } else { QPalette popupPal = opt->palette; - popupPal.setColor(QPalette::Light, opt->palette.background().color()); + popupPal.setColor(QPalette::Light, opt->palette.window().color()); popupPal.setColor(QPalette::Midlight, opt->palette.light().color()); qDrawWinPanel(p, opt->rect, popupPal, opt->state & State_Sunken); } @@ -996,7 +996,7 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, break; } case PE_FrameWindow: { QPalette popupPal = opt->palette; - popupPal.setColor(QPalette::Light, opt->palette.background().color()); + popupPal.setColor(QPalette::Light, opt->palette.window().color()); popupPal.setColor(QPalette::Midlight, opt->palette.light().color()); qDrawWinPanel(p, opt->rect, popupPal, opt->state & State_Sunken); break; } @@ -1315,12 +1315,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai x2 -= onlyOne || lastTab ? borderThinkness : 0; } - p->fillRect(QRect(x1 + 1, y1 + 1, (x2 - x1) - 1, (y2 - y1) - 2), tab->palette.background()); + p->fillRect(QRect(x1 + 1, y1 + 1, (x2 - x1) - 1, (y2 - y1) - 2), tab->palette.window()); // Delete border if (selected) { - p->fillRect(QRect(x1,y2-1,x2-x1,1), tab->palette.background()); - p->fillRect(QRect(x1,y2,x2-x1,1), tab->palette.background()); + p->fillRect(QRect(x1,y2-1,x2-x1,1), tab->palette.window()); + p->fillRect(QRect(x1,y2,x2-x1,1), tab->palette.window()); } // Left if (firstTab || selected || onlyOne || !previousSelected) { @@ -1351,12 +1351,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai x2 -= lastTab ? borderThinkness : 0; } - p->fillRect(QRect(x1 + 1, y1 + 2, (x2 - x1) - 1, (y2 - y1) - 1), tab->palette.background()); + p->fillRect(QRect(x1 + 1, y1 + 2, (x2 - x1) - 1, (y2 - y1) - 1), tab->palette.window()); // Delete border if (selected) { - p->fillRect(QRect(x1, y1 + 1, (x2 - 1)-x1, 1), tab->palette.background()); - p->fillRect(QRect(x1, y1, (x2 - 1)-x1, 1), tab->palette.background()); + p->fillRect(QRect(x1, y1 + 1, (x2 - 1)-x1, 1), tab->palette.window()); + p->fillRect(QRect(x1, y1, (x2 - 1)-x1, 1), tab->palette.window()); } // Left if (firstTab || selected || onlyOne || !previousSelected) { @@ -1389,12 +1389,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai y2 -= lastTab ? borderThinkness : 0; } - p->fillRect(QRect(x1 + 1, y1 + 1, (x2 - x1) - 2, (y2 - y1) - 1), tab->palette.background()); + p->fillRect(QRect(x1 + 1, y1 + 1, (x2 - x1) - 2, (y2 - y1) - 1), tab->palette.window()); // Delete border if (selected) { - p->fillRect(QRect(x2 - 1, y1, 1, y2-y1), tab->palette.background()); - p->fillRect(QRect(x2, y1, 1, y2-y1), tab->palette.background()); + p->fillRect(QRect(x2 - 1, y1, 1, y2-y1), tab->palette.window()); + p->fillRect(QRect(x2, y1, 1, y2-y1), tab->palette.window()); } // Top if (firstTab || selected || onlyOne || !previousSelected) { @@ -1427,12 +1427,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai y2 -= lastTab ? borderThinkness : 0; } - p->fillRect(QRect(x1 + 2, y1 + 1, (x2 - x1) - 1, (y2 - y1) - 1), tab->palette.background()); + p->fillRect(QRect(x1 + 2, y1 + 1, (x2 - x1) - 1, (y2 - y1) - 1), tab->palette.window()); // Delete border if (selected) { - p->fillRect(QRect(x1 + 1, y1, 1, (y2 - 1)-y1),tab->palette.background()); - p->fillRect(QRect(x1, y1, 1, (y2-1)-y1), tab->palette.background()); + p->fillRect(QRect(x1 + 1, y1, 1, (y2 - 1)-y1),tab->palette.window()); + p->fillRect(QRect(x1, y1, 1, (y2-1)-y1), tab->palette.window()); } // Top if (firstTab || selected || onlyOne || !previousSelected) { @@ -1526,7 +1526,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai br = QBrush(paletteBrush.textureImage()); } else br = QBrush(opt->palette.light().color(), Qt::Dense4Pattern); - p->setBackground(opt->palette.background().color()); + p->setBackground(opt->palette.window().color()); p->setBrush(br); } p->drawRect(opt->rect); @@ -1693,7 +1693,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai } QPalette pal2 = pb->palette; // Correct the highlight color if it is the same as the background - if (pal2.highlight() == pal2.background()) + if (pal2.highlight() == pal2.window()) pal2.setColor(QPalette::Highlight, pb->palette.color(QPalette::Active, QPalette::Highlight)); bool reverse = ((!vertical && (pb->direction == Qt::RightToLeft)) || vertical); @@ -1825,7 +1825,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai titleRect.height(), titleRect.width()); } proxy()->drawItemText(p, titleRect, - Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, palette, + Qt::AlignLeft | Qt::AlignVCenter, palette, dwOpt->state & State_Enabled, dwOpt->title, floating ? (active ? QPalette::BrightText : QPalette::Window) : QPalette::WindowText); p->setFont(oldFont); @@ -1843,7 +1843,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai p->setBackground(cb->palette.highlight()); } else { p->setPen(cb->palette.text().color()); - p->setBackground(cb->palette.background()); + p->setBackground(cb->palette.window()); } } QCommonStyle::drawControl(ce, opt, p, widget); @@ -2185,7 +2185,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp } else { p->setPen(cmb->palette.text().color()); - p->setBackground(cmb->palette.background()); + p->setBackground(cmb->palette.window()); } if (cmb->state & State_HasFocus && !cmb->editable) { diff --git a/src/widgets/styles/qwindowsstyle_p.h b/src/widgets/styles/qwindowsstyle_p.h index 7993b9f1c6..47816ff651 100644 --- a/src/widgets/styles/qwindowsstyle_p.h +++ b/src/widgets/styles/qwindowsstyle_p.h @@ -102,7 +102,7 @@ protected: QWindowsStyle(QWindowsStylePrivate &dd); private: - Q_DISABLE_COPY(QWindowsStyle) + Q_DISABLE_COPY_MOVE(QWindowsStyle) Q_DECLARE_PRIVATE(QWindowsStyle) }; diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index 765363744b..21dddf446e 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -194,6 +194,7 @@ private: const QIndexMapper& iv, QMatchData* m); }; +// ### Qt6: QStyledItemDelegate class QCompleterItemDelegate : public QItemDelegate { public: diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp index b59fe0d504..a8b2a00a80 100644 --- a/src/widgets/util/qflickgesture.cpp +++ b/src/widgets/util/qflickgesture.cpp @@ -130,8 +130,6 @@ private: , mouseEventSource(Qt::MouseEventNotSynthesized) { } - static PressDelayHandler *inst; - public: enum { UngrabMouseBefore = 1, diff --git a/src/widgets/util/qflickgesture_p.h b/src/widgets/util/qflickgesture_p.h index 74a0f2a0f3..d5ace887ae 100644 --- a/src/widgets/util/qflickgesture_p.h +++ b/src/widgets/util/qflickgesture_p.h @@ -77,8 +77,6 @@ public: friend class QFlickGestureRecognizer; }; -class PressDelayHandler; - class QFlickGesturePrivate : public QGesturePrivate { Q_DECLARE_PUBLIC(QFlickGesture) @@ -89,7 +87,6 @@ public: QScroller *receiverScroller; Qt::MouseButton button; // NoButton == Touch bool macIgnoreWheel; - static PressDelayHandler *pressDelayHandler; }; class QFlickGestureRecognizer : public QGestureRecognizer diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 598d173144..b378884275 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -820,7 +820,7 @@ QWidget *QAbstractScrollArea::cornerWidget() const All widgets set here will be deleted by the scroll area when it is destroyed unless you separately reparent the widget after setting - some other corner widget (or 0). + some other corner widget (or \nullptr). Any \e newly set widget should have no current parent. @@ -1604,8 +1604,10 @@ QSize QAbstractScrollArea::sizeHint() const if (!d->sizeHint.isValid() || d->sizeAdjustPolicy == QAbstractScrollArea::AdjustToContents) { const int f = 2 * d->frameWidth; const QSize frame( f, f ); - const QSize scrollbars(d->vbarpolicy == Qt::ScrollBarAlwaysOn ? d->vbar->sizeHint().width() : 0, - d->hbarpolicy == Qt::ScrollBarAlwaysOn ? d->hbar->sizeHint().height() : 0); + const bool vbarHidden = d->vbar->isHidden() || d->vbarpolicy == Qt::ScrollBarAlwaysOff; + const bool hbarHidden = d->hbar->isHidden() || d->hbarpolicy == Qt::ScrollBarAlwaysOff; + const QSize scrollbars(vbarHidden ? 0 : d->vbar->sizeHint().width(), + hbarHidden ? 0 : d->hbar->sizeHint().height()); d->sizeHint = frame + scrollbars + viewportSizeHint(); } return d->sizeHint; diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp index fa1ccd347f..669faa92c7 100644 --- a/src/widgets/widgets/qbuttongroup.cpp +++ b/src/widgets/widgets/qbuttongroup.cpp @@ -291,8 +291,8 @@ QList<QAbstractButton*> QButtonGroup::buttons() const } /*! - Returns the button group's checked button, or 0 if no buttons are - checked. + Returns the button group's checked button, or \nullptr if no + buttons are checked. \sa buttonClicked() */ @@ -305,8 +305,8 @@ QAbstractButton *QButtonGroup::checkedButton() const /*! \since 4.1 - Returns the button with the specified \a id, or 0 if no such button - exists. + Returns the button with the specified \a id, or \nullptr if no + such button exists. */ QAbstractButton *QButtonGroup::button(int id) const { diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 4946969360..5649243d1d 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -1178,9 +1178,9 @@ QVariant QCalendarModel::data(const QModelIndex &index, int role) const } QTextCharFormat fmt = formatForCell(row, column); - if (role == Qt::BackgroundColorRole) + if (role == Qt::BackgroundRole) return fmt.background().color(); - if (role == Qt::TextColorRole) + if (role == Qt::ForegroundRole) return fmt.foreground().color(); if (role == Qt::FontRole) return fmt.font(); @@ -1555,6 +1555,7 @@ void QCalendarView::mouseReleaseEvent(QMouseEvent *event) } } +// ### Qt6: QStyledItemDelegate class QCalendarDelegate : public QItemDelegate { Q_OBJECT diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index e20a0892b4..2c478f364d 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -166,7 +166,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt break; } if (index.data(Qt::BackgroundRole).canConvert<QBrush>()) { - menuOption.palette.setBrush(QPalette::All, QPalette::Background, + menuOption.palette.setBrush(QPalette::All, QPalette::Window, qvariant_cast<QBrush>(index.data(Qt::BackgroundRole))); } menuOption.text = index.model()->data(index, Qt::DisplayRole).toString() @@ -1483,6 +1483,7 @@ int QComboBox::maxCount() const } #if QT_CONFIG(completer) +#if QT_DEPRECATED_SINCE(5, 13) /*! \property QComboBox::autoCompletion @@ -1576,6 +1577,7 @@ void QComboBox::setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity if (d->lineEdit && d->lineEdit->completer()) d->lineEdit->completer()->setCaseSensitivity(sensitivity); } +#endif // QT_DEPRECATED_SINCE(5, 13) #endif // QT_CONFIG(completer) @@ -1888,8 +1890,8 @@ void QComboBox::setLineEdit(QLineEdit *edit) } /*! - Returns the line edit used to edit items in the combobox, or 0 if there - is no line edit. + Returns the line edit used to edit items in the combobox, or + \nullptr if there is no line edit. Only editable combo boxes have a line edit. */ @@ -1941,12 +1943,15 @@ const QValidator *QComboBox::validator() const performs case insensitive inline completion is automatically created. \note The completer is removed when the \l editable property becomes \c false. + Setting a completer on a QComboBox that is not editable will be ignored. */ void QComboBox::setCompleter(QCompleter *c) { Q_D(QComboBox); - if (!d->lineEdit) + if (!d->lineEdit) { + qWarning("Setting a QCompleter on non-editable QComboBox is not allowed."); return; + } d->lineEdit->setCompleter(c); if (c) { connect(c, SIGNAL(activated(QModelIndex)), this, SLOT(_q_completerActivated(QModelIndex))); diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 671c883584..542a3bd3b9 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -73,8 +73,10 @@ class Q_WIDGETS_EXPORT QComboBox : public QWidget Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize) #if QT_CONFIG(completer) +#if QT_DEPRECATED_SINCE(5, 13) Q_PROPERTY(bool autoCompletion READ autoCompletion WRITE setAutoCompletion DESIGNABLE false) Q_PROPERTY(Qt::CaseSensitivity autoCompletionCaseSensitivity READ autoCompletionCaseSensitivity WRITE setAutoCompletionCaseSensitivity DESIGNABLE false) +#endif #endif // QT_CONFIG(completer) Q_PROPERTY(bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled) @@ -93,12 +95,14 @@ public: int maxCount() const; #if QT_CONFIG(completer) +#if QT_DEPRECATED_SINCE(5, 13) bool autoCompletion() const; void setAutoCompletion(bool enable); Qt::CaseSensitivity autoCompletionCaseSensitivity() const; void setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity); #endif +#endif bool duplicatesEnabled() const; void setDuplicatesEnabled(bool enable); diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 3f75a357e4..71404964da 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -277,7 +277,7 @@ protected: const QStyleOptionViewItem &option, const QModelIndex &index) const override { QStyleOptionMenuItem opt = getStyleOption(option, index); - painter->fillRect(option.rect, opt.palette.background()); + painter->fillRect(option.rect, opt.palette.window()); mCombo->style()->drawControl(QStyle::CE_MenuItem, &opt, painter, mCombo); } QSize sizeHint(const QStyleOptionViewItem &option, @@ -293,6 +293,7 @@ private: QComboBox *mCombo; }; +// ### Qt6: QStyledItemDelegate ? // Note that this class is intentionally not using QStyledItemDelegate // Vista does not use the new theme for combo boxes and there might // be other side effects from using the new class diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index 2d01d63df8..3d2dd5784d 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -66,10 +66,16 @@ public: QString description() const; void setDescription(const QString &description); + // QTBUG-68722 +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) protected: +#else +public: +#endif QSize sizeHint() const override; int heightForWidth(int) const override; QSize minimumSizeHint() const override; +protected: bool event(QEvent *e) override; void paintEvent(QPaintEvent *) override; diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index d93e71e32f..26b86f80be 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -820,7 +820,7 @@ QDialogButtonBox::StandardButtons QDialogButtonBox::standardButtons() const /*! Returns the QPushButton corresponding to the standard button \a which, - or 0 if the standard button doesn't exist in this button box. + or \nullptr if the standard button doesn't exist in this button box. \sa standardButton(), standardButtons(), buttons() */ diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 6c871aae2c..ba8bd90da6 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -55,6 +55,7 @@ #include <private/qwidgetresizehandler_p.h> #include <private/qstylesheetstyle_p.h> +#include <qpa/qplatformtheme.h> #include "qdockwidget_p.h" #include "qmainwindowlayout_p.h" @@ -922,7 +923,8 @@ bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event) initDrag(event->pos(), false); if (state) - state->ctrlDrag = hasFeature(this, QDockWidget::DockWidgetFloatable) && event->modifiers() & Qt::ControlModifier; + state->ctrlDrag = (hasFeature(this, QDockWidget::DockWidgetFloatable) && event->modifiers() & Qt::ControlModifier) || + (!hasFeature(this, QDockWidget::DockWidgetMovable) && q->isFloating()); return true; } @@ -1044,7 +1046,8 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event) initDrag(event->pos(), true); if (state == 0) break; - state->ctrlDrag = event->modifiers() & Qt::ControlModifier; + state->ctrlDrag = (event->modifiers() & Qt::ControlModifier) || + (!hasFeature(this, QDockWidget::DockWidgetMovable) && q->isFloating()); startDrag(); break; case QEvent::NonClientAreaMouseMove: @@ -1729,8 +1732,8 @@ void QDockWidget::setTitleBarWidget(QWidget *widget) /*! \since 4.3 - Returns the custom title bar widget set on the QDockWidget, or 0 if no - custom title bar has been set. + Returns the custom title bar widget set on the QDockWidget, or + \nullptr if no custom title bar has been set. \sa setTitleBarWidget() */ diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index 766e4ed161..14d73e815f 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -108,6 +108,7 @@ public: // QMainWindow *findMainWindow(QWidget *widget) const; QRect undockedGeometry; QString fixedWindowTitle; + QString dockedWindowTitle; bool mousePressEvent(QMouseEvent *event); bool mouseDoubleClickEvent(QMouseEvent *event); diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 60f88df9af..a840bf4ee6 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -1098,7 +1098,7 @@ void QLabel::paintEvent(QPaintEvent *) QImage scaledImage = d->cachedimage->scaled(scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - d->scaledpixmap = new QPixmap(QPixmap::fromImage(scaledImage)); + d->scaledpixmap = new QPixmap(QPixmap::fromImage(std::move(scaledImage))); d->scaledpixmap->setDevicePixelRatio(devicePixelRatioF()); } pix = *d->scaledpixmap; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 4301a3a2e7..ad3d372bd3 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -586,7 +586,7 @@ void QLineEdit::setEchoMode(EchoMode mode) #ifndef QT_NO_VALIDATOR /*! - Returns a pointer to the current input validator, or 0 if no + Returns a pointer to the current input validator, or \nullptr if no validator has been set. \sa setValidator() diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 6dcb2dd693..2a5a0c34dc 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -324,7 +324,7 @@ void QLineEditPrivate::drag() data->setText(control->selectedText()); QDrag *drag = new QDrag(q); drag->setMimeData(data); - Qt::DropAction action = drag->start(); + Qt::DropAction action = drag->exec(Qt::CopyAction); if (action == Qt::MoveAction && !control->isReadOnly() && drag->target() != q) control->removeSelection(); } diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 411b482c11..fae3aebba4 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -851,7 +851,11 @@ void QMainWindow::removeToolBar(QToolBar *toolbar) \sa addToolBar(), addToolBarBreak(), Qt::ToolBarArea */ -Qt::ToolBarArea QMainWindow::toolBarArea(QToolBar *toolbar) const +Qt::ToolBarArea QMainWindow::toolBarArea( +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + const +#endif + QToolBar *toolbar) const { return d_func()->layout->toolBarArea(toolbar); } /*! diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 8f2a192446..85e3f87d77 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -158,7 +158,11 @@ public: bool unifiedTitleAndToolBarOnMac() const; - Qt::ToolBarArea toolBarArea(QToolBar *toolbar) const; + Qt::ToolBarArea toolBarArea( +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + const +#endif + QToolBar *toolbar) const; bool toolBarBreak(QToolBar *toolbar) const; #endif #if QT_CONFIG(dockwidget) diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 053bfbf024..ed054c7e9a 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -1388,7 +1388,7 @@ void QMainWindowLayout::insertToolBar(QToolBar *before, QToolBar *toolbar) invalidate(); } -Qt::ToolBarArea QMainWindowLayout::toolBarArea(QToolBar *toolbar) const +Qt::ToolBarArea QMainWindowLayout::toolBarArea(const QToolBar *toolbar) const { QInternal::DockPosition pos = layoutState.toolBarAreaLayout.findToolBar(toolbar); switch (pos) { diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 72cbec2350..a375d856bb 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -475,7 +475,7 @@ public: void addToolBar(Qt::ToolBarArea area, QToolBar *toolbar, bool needAddChildWidget = true); void insertToolBar(QToolBar *before, QToolBar *toolbar); - Qt::ToolBarArea toolBarArea(QToolBar *toolbar) const; + Qt::ToolBarArea toolBarArea(const QToolBar *toolbar) const; bool toolBarBreak(QToolBar *toolBar) const; void getStyleOptionInfo(QStyleOptionToolBar *option, QToolBar *toolBar) const; void removeToolBar(QToolBar *toolbar); diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index f32cd26478..feea7cd050 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -954,14 +954,6 @@ void QMdiAreaPrivate::rearrange(Rearranger *rearranger) } } - if (active && rearranger->type() == Rearranger::RegularTiler && !tileCalledFromResizeEvent) { - // Move active window in front if necessary. That's the case if we - // have any windows with staysOnTopHint set. - int indexToActive = widgets.indexOf((QWidget *)active); - if (indexToActive > 0) - widgets.move(indexToActive, 0); - } - QRect domain = viewport->rect(); if (rearranger->type() == Rearranger::RegularTiler && !widgets.isEmpty()) domain = resizeToMinimumTileSize(minSubWindowSize, widgets.count()); @@ -1296,7 +1288,11 @@ QRect QMdiAreaPrivate::resizeToMinimumTileSize(const QSize &minSubWindowSize, in minAreaHeight += 2 * frame; } const QSize diff = QSize(minAreaWidth, minAreaHeight).expandedTo(q->size()) - q->size(); - topLevel->resize(topLevel->size() + diff); + // Only resize topLevel widget if scroll bars are disabled. + if (hbarpolicy == Qt::ScrollBarAlwaysOff) + topLevel->resize(topLevel->size().width() + diff.width(), topLevel->size().height()); + if (vbarpolicy == Qt::ScrollBarAlwaysOff) + topLevel->resize(topLevel->size().width(), topLevel->size().height() + diff.height()); } QRect domain = viewport->rect(); @@ -1778,7 +1774,7 @@ QSize QMdiArea::minimumSizeHint() const } /*! - Returns a pointer to the current subwindow, or 0 if there is + Returns a pointer to the current subwindow, or \nullptr if there is no current subwindow. This function will return the same as activeSubWindow() if @@ -1790,13 +1786,13 @@ QMdiSubWindow *QMdiArea::currentSubWindow() const { Q_D(const QMdiArea); if (d->childWindows.isEmpty()) - return 0; + return nullptr; if (d->active) return d->active; if (d->isActivated && !window()->isMinimized()) - return 0; + return nullptr; Q_ASSERT(d->indicesToActivatedChildren.count() > 0); int index = d->indicesToActivatedChildren.at(0); @@ -1808,7 +1804,7 @@ QMdiSubWindow *QMdiArea::currentSubWindow() const /*! Returns a pointer to the current active subwindow. If no - window is currently active, 0 is returned. + window is currently active, \nullptr is returned. Subwindows are treated as top-level windows with respect to window state, i.e., if a widget outside the MDI area is the active @@ -1825,7 +1821,7 @@ QMdiSubWindow *QMdiArea::activeSubWindow() const } /*! - Activates the subwindow \a window. If \a window is 0, any + Activates the subwindow \a window. If \a window is \nullptr, any current active window is deactivated. \sa activeSubWindow() @@ -1834,7 +1830,7 @@ void QMdiArea::setActiveSubWindow(QMdiSubWindow *window) { Q_D(QMdiArea); if (!window) { - d->activateWindow(0); + d->activateWindow(nullptr); return; } @@ -2640,7 +2636,11 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event) #endif // QT_CONFIG(tabbar) Q_FALLTHROUGH(); case QEvent::Hide: - d->isSubWindowsTiled = false; + // Do not reset the isSubWindowsTiled flag if the event is a spontaneous system window event. + // This ensures that tiling will be performed during the resizeEvent after an application + // window minimize (hide) and then restore (show). + if (!event->spontaneous()) + d->isSubWindowsTiled = false; break; #if QT_CONFIG(rubberband) case QEvent::Close: diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index 794674c427..c7e0603309 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -2576,7 +2576,8 @@ void QMdiSubWindow::showSystemMenu() /*! \since 4.4 - Returns the area containing this sub-window, or 0 if there is none. + Returns the area containing this sub-window, or \nullptr if there + is none. \sa QMdiArea::addSubWindow() */ @@ -2590,7 +2591,7 @@ QMdiArea *QMdiSubWindow::mdiArea() const } parent = parent->parentWidget(); } - return 0; + return nullptr; } /*! @@ -3341,8 +3342,11 @@ void QMdiSubWindow::mouseMoveEvent(QMouseEvent *mouseEvent) } if ((mouseEvent->buttons() & Qt::LeftButton) || d->isInInteractiveMode) { - if ((d->isResizeOperation() && d->resizeEnabled) || (d->isMoveOperation() && d->moveEnabled)) - d->setNewGeometry(mapToParent(mouseEvent->pos())); + if ((d->isResizeOperation() && d->resizeEnabled) || (d->isMoveOperation() && d->moveEnabled)) { + // As setNewGeometry moves the window, it invalidates the pos() value of any mouse move events that are + // currently queued in the event loop. Map to parent using globalPos() instead. + d->setNewGeometry(parentWidget()->mapFromGlobal(mouseEvent->globalPos())); + } return; } diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 48253b52b0..7dc67c8efe 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1783,21 +1783,6 @@ QAction *QMenu::addAction(const QString &text, const QObject *receiver, const ch return action; } -/*!\fn template<typename PointerToMemberFunction> QAction *QMenu::addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = 0) - - \since 5.6 - - \overload - - This convenience function creates a new action with the text \a - text and an optional shortcut \a shortcut. The action's - \l{QAction::triggered()}{triggered()} signal is connected to the - \a method of the \a receiver. The function adds the newly created - action to the menu's list of actions and returns it. - - QMenu takes ownership of the returned QAction. -*/ - /*!\fn template<typename Functor> QAction *QMenu::addAction(const QString &text, Functor functor, const QKeySequence &shortcut = 0) \since 5.6 @@ -1822,25 +1807,11 @@ QAction *QMenu::addAction(const QString &text, const QObject *receiver, const ch This convenience function creates a new action with the text \a text and an optional shortcut \a shortcut. The action's \l{QAction::triggered()}{triggered()} signal is connected to the - \a functor. The function adds the newly created - action to the menu's list of actions and returns it. + \a functor. The functor can be a pointer to a member function of + the \a context object. The newly created action is added to the + menu's list of actions and a pointer to it is returned. - If \a context is destroyed, the functor will not be called. - - QMenu takes ownership of the returned QAction. -*/ - -/*!\fn template<typename PointerToMemberFunction> QAction *QMenu::addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = 0) - - \since 5.6 - - \overload - - This convenience function creates a new action with an \a icon - and some \a text and an optional shortcut \a shortcut. The action's - \l{QAction::triggered()}{triggered()} signal is connected to the - \a method of the \a receiver. The function adds the newly created - action to the menu's list of actions and returns it. + If the \a context object is destroyed, the functor will not be called. QMenu takes ownership of the returned QAction. */ @@ -1869,8 +1840,9 @@ QAction *QMenu::addAction(const QString &text, const QObject *receiver, const ch This convenience function creates a new action with an \a icon and some \a text and an optional shortcut \a shortcut. The action's \l{QAction::triggered()}{triggered()} signal is connected to the - \a functor. The function adds the newly created - action to the menu's list of actions and returns it. + \a functor. The \a functor can be a pointer to a member function + of the \a context object. The newly created action is added to the + menu's list of actions and a pointer to it is returned. If \a context is destroyed, the functor will not be called. @@ -2224,7 +2196,7 @@ void QMenu::setActiveAction(QAction *act) /*! - Returns the currently highlighted action, or 0 if no + Returns the currently highlighted action, or \nullptr if no action is currently highlighted. */ QAction *QMenu::activeAction() const @@ -2592,8 +2564,8 @@ void QMenu::popup(const QPoint &p, QAction *atAction) This is equivalent to \c{exec(pos())}. This returns the triggered QAction in either the popup menu or one - of its submenus, or 0 if no item was triggered (normally because - the user pressed Esc). + of its submenus, or \nullptr if no item was triggered (normally + because the user pressed Esc). In most situations you'll want to specify the position yourself, for example, the current mouse position: @@ -2619,8 +2591,8 @@ QAction *QMenu::exec() coordinates into global coordinates, use QWidget::mapToGlobal(). This returns the triggered QAction in either the popup menu or one - of its submenus, or 0 if no item was triggered (normally because - the user pressed Esc). + of its submenus, or \nullptr if no item was triggered (normally + because the user pressed Esc). Note that all signals are emitted as usual. If you connect a QAction to a slot and call the menu's exec(), you get the result @@ -2656,11 +2628,11 @@ QAction *QMenu::exec(const QPoint &p, QAction *action) QPointer<QObject> guard = this; (void) eventLoop.exec(); if (guard.isNull()) - return 0; + return nullptr; action = d->syncAction; - d->syncAction = 0; - d->eventLoop = 0; + d->syncAction = nullptr; + d->eventLoop = nullptr; return action; } @@ -2678,7 +2650,7 @@ QAction *QMenu::exec(const QPoint &p, QAction *action) QGraphicsView). The function returns the triggered QAction in either the popup - menu or one of its submenus, or 0 if no item was triggered + menu or one of its submenus, or \nullptr if no item was triggered (normally because the user pressed Esc). This is equivalent to: diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 628f818b5e..84ab9e027a 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -82,14 +82,10 @@ public: QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member, const QKeySequence &shortcut = 0); #ifdef Q_CLANG_QDOC - template<typename PointerToMemberFunction> - QAction *addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = 0); template<typename Functor> QAction *addAction(const QString &text, Functor functor, const QKeySequence &shortcut = 0); template<typename Functor> QAction *addAction(const QString &text, const QObject *context, Functor functor, const QKeySequence &shortcut = 0); - template<typename PointerToMemberFunction> - QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = 0); template<typename Functor> QAction *addAction(const QIcon &icon, const QString &text, Functor functor, const QKeySequence &shortcut = 0); template<typename Functor> diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index f740919dc7..3e1aa2f738 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -115,7 +115,7 @@ private: class QMenuSloppyState { - Q_DISABLE_COPY(QMenuSloppyState) + Q_DISABLE_COPY_MOVE(QMenuSloppyState) public: QMenuSloppyState() : m_enabled(false) diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 57f2dec8f7..363422ac74 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -1615,7 +1615,7 @@ void QPlainTextEdit::timerEvent(QTimerEvent *e) const QPoint globalPos = QCursor::pos(); pos = d->viewport->mapFromGlobal(globalPos); QMouseEvent ev(QEvent::MouseMove, pos, d->viewport->mapTo(d->viewport->topLevelWidget(), pos), globalPos, - Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); + Qt::LeftButton, Qt::LeftButton, QGuiApplication::keyboardModifiers()); mouseMoveEvent(&ev); } int deltaY = qMax(pos.y() - visible.top(), visible.bottom() - pos.y()) - visible.height(); @@ -2039,7 +2039,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e) if (backgroundVisible() && !block.isValid() && offset.y() <= er.bottom() && (centerOnScroll() || verticalScrollBar()->maximum() == verticalScrollBar()->minimum())) { - painter.fillRect(QRect(QPoint((int)er.left(), (int)offset.y()), er.bottomRight()), palette().background()); + painter.fillRect(QRect(QPoint((int)er.left(), (int)offset.y()), er.bottomRight()), palette().window()); } } @@ -2892,6 +2892,7 @@ void QPlainTextEdit::setCenterOnScroll(bool enabled) if (enabled == d->centerOnScroll) return; d->centerOnScroll = enabled; + d->_q_adjustScrollbars(); } @@ -2929,6 +2930,27 @@ bool QPlainTextEdit::find(const QRegExp &exp, QTextDocument::FindFlags options) #endif /*! + \fn bool QTextEdit::find(const QRegularExpression &exp, QTextDocument::FindFlags options) + + \since 5.13 + \overload + + Finds the next occurrence, matching the regular expression, \a exp, using the given + \a options. The QTextDocument::FindCaseSensitively option is ignored for this overload, + use QRegularExpression::CaseInsensitiveOption instead. + + Returns \c true if a match was found and changes the cursor to select the match; + otherwise returns \c false. +*/ +#if QT_CONFIG(regularexpression) +bool QPlainTextEdit::find(const QRegularExpression &exp, QTextDocument::FindFlags options) +{ + Q_D(QPlainTextEdit); + return d->control->find(exp, options); +} +#endif + +/*! \fn void QPlainTextEdit::copyAvailable(bool yes) This signal is emitted when text is selected or de-selected in the diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index e5ac4c82b8..a5945d649a 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -60,6 +60,7 @@ class QMenu; class QPlainTextEditPrivate; class QMimeData; class QPagedPaintDevice; +class QRegularExpression; class Q_WIDGETS_EXPORT QPlainTextEdit : public QAbstractScrollArea { @@ -149,6 +150,9 @@ public: #ifndef QT_NO_REGEXP bool find(const QRegExp &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); #endif +#if QT_CONFIG(regularexpression) + bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); +#endif inline QString toPlainText() const { return document()->toPlainText(); } diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp index 8f7271c2dc..b578aa0b18 100644 --- a/src/widgets/widgets/qpushbutton.cpp +++ b/src/widgets/widgets/qpushbutton.cpp @@ -545,8 +545,8 @@ void QPushButton::setMenu(QMenu* menu) } /*! - Returns the button's associated popup menu or 0 if no popup menu - has been set. + Returns the button's associated popup menu or \nullptr if no popup + menu has been set. \sa setMenu() */ diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp index 0bfc56f7fa..9994344d79 100644 --- a/src/widgets/widgets/qscrollarea.cpp +++ b/src/widgets/widgets/qscrollarea.cpp @@ -217,7 +217,7 @@ void QScrollAreaPrivate::updateScrollBars() } /*! - Returns the scroll area's widget, or 0 if there is none. + Returns the scroll area's widget, or \nullptr if there is none. \sa setWidget() */ diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 9e38c8f18a..0b90714363 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1783,6 +1783,7 @@ void QSplitter::setStretchFactor(int index, int stretch) } +#if QT_DEPRECATED_SINCE(5, 13) /*! \relates QSplitter \obsolete @@ -1813,6 +1814,7 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter) splitter.restoreState(std::move(line).toLatin1()); return ts; } +#endif QT_END_NAMESPACE diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index 16fac48d1c..ec980d9ee3 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -129,8 +129,12 @@ private: friend class QSplitterHandle; }; +#if QT_DEPRECATED_SINCE(5, 13) +QT_DEPRECATED_X("Use QSplitter::saveState() instead") Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&); +QT_DEPRECATED_X("Use QSplitter::restoreState() instead") Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&); +#endif class QSplitterHandlePrivate; class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget diff --git a/src/widgets/widgets/qstackedwidget.cpp b/src/widgets/widgets/qstackedwidget.cpp index 2217dab870..f863964c58 100644 --- a/src/widgets/widgets/qstackedwidget.cpp +++ b/src/widgets/widgets/qstackedwidget.cpp @@ -220,7 +220,7 @@ int QStackedWidget::currentIndex() const } /*! - Returns the current widget, or 0 if there are no child widgets. + Returns the current widget, or \nullptr if there are no child widgets. \sa currentIndex(), setCurrentWidget() */ @@ -260,8 +260,8 @@ int QStackedWidget::indexOf(QWidget *widget) const } /*! - Returns the widget at the given \a index, or 0 if there is no such - widget. + Returns the widget at the given \a index, or \nullptr if there is + no such widget. \sa currentWidget(), indexOf() */ diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index ef98bb6950..ae67cbd890 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -689,7 +689,7 @@ void QStatusBar::paintEvent(QPaintEvent *event) } } if (haveMessage) { - p.setPen(palette().foreground().color()); + p.setPen(palette().windowText().color()); p.drawText(d->messageRect(), Qt::AlignLeading | Qt::AlignVCenter | Qt::TextSingleLine, d->tempItem); } } diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 68453e1842..05a98fc1a5 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -2567,7 +2567,7 @@ void QTabBar::setChangeCurrentOnDrag(bool change) The tab bar will take ownership of the widget and so all widgets set here will be deleted by the tab bar when it is destroyed unless you separately - reparent the widget after setting some other widget (or 0). + reparent the widget after setting some other widget (or \nullptr). \sa tabsClosable() */ @@ -2597,14 +2597,14 @@ void QTabBar::setTabButton(int index, ButtonPosition position, QWidget *widget) } /*! - Returns the widget set a tab \a index and \a position or 0 if - one is not set. + Returns the widget set a tab \a index and \a position or \nullptr + if one is not set. */ QWidget *QTabBar::tabButton(int index, ButtonPosition position) const { Q_D(const QTabBar); if (index < 0 || index >= d->tabList.count()) - return 0; + return nullptr; if (position == LeftSide) return d->tabList.at(index).leftWidget; else diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index 8a848554e3..547b8a82f9 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -579,7 +579,7 @@ void QTabWidget::setTabEnabled(int index, bool enable) All widgets set here will be deleted by the tab widget when it is destroyed unless you separately reparent the widget after setting - some other corner widget (or 0). + some other corner widget (or \nullptr). Note: Corner widgets are designed for \l North and \l South tab positions; other orientations are known to not work properly. @@ -605,7 +605,7 @@ void QTabWidget::setCornerWidget(QWidget * widget, Qt::Corner corner) } /*! - Returns the widget shown in the \a corner of the tab widget or 0. + Returns the widget shown in the \a corner of the tab widget or \nullptr. */ QWidget * QTabWidget::cornerWidget(Qt::Corner corner) const { @@ -1146,8 +1146,8 @@ void QTabWidget::keyPressEvent(QKeyEvent *e) } /*! - Returns the tab page at index position \a index or 0 if the \a - index is out of range. + Returns the tab page at index position \a index or \nullptr if the + \a index is out of range. */ QWidget *QTabWidget::widget(int index) const { diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index 09541bb53b..bb9a4fed91 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -276,7 +276,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url) Q_Q(QTextBrowser); #ifndef QT_NO_CURSOR if (q->isVisible()) - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); #endif textOrSourceChanged = true; @@ -310,7 +310,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url) const QStringRef firstTag = txt.leftRef(txt.indexOf(QLatin1Char('>')) + 1); if (firstTag.startsWith(QLatin1String("<qt")) && firstTag.contains(QLatin1String("type")) && firstTag.contains(QLatin1String("detail"))) { #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif #if QT_CONFIG(whatsthis) QWhatsThis::showText(QCursor::pos(), txt, q); @@ -355,7 +355,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url) #ifndef QT_NO_CURSOR if (q->isVisible()) - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif emit q->sourceChanged(url); } diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index e3a45680ef..920133d493 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -105,6 +105,14 @@ public: else ed->insertFromMimeData(source); } + QVariant loadResource(int type, const QUrl &name) override { + auto *ed = qobject_cast<QTextEdit *>(parent()); + if (!ed) + return QWidgetTextControl::loadResource(type, name); + + QUrl resolvedName = ed->d_func()->resolveUrl(name); + return ed->loadResource(type, resolvedName); + } }; QTextEditPrivate::QTextEditPrivate() @@ -2534,6 +2542,27 @@ bool QTextEdit::find(const QRegExp &exp, QTextDocument::FindFlags options) #endif /*! + \fn bool QTextEdit::find(const QRegularExpression &exp, QTextDocument::FindFlags options) + + \since 5.13 + \overload + + Finds the next occurrence, matching the regular expression, \a exp, using the given + \a options. The QTextDocument::FindCaseSensitively option is ignored for this overload, + use QRegularExpression::CaseInsensitiveOption instead. + + Returns \c true if a match was found and changes the cursor to select the match; + otherwise returns \c false. +*/ +#if QT_CONFIG(regularexpression) +bool QTextEdit::find(const QRegularExpression &exp, QTextDocument::FindFlags options) +{ + Q_D(QTextEdit); + return d->control->find(exp, options); +} +#endif + +/*! \fn void QTextEdit::copyAvailable(bool yes) This signal is emitted when text is selected or de-selected in the diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 51d6c2ccba..3aa23aaace 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -57,6 +57,7 @@ class QMenu; class QTextEditPrivate; class QMimeData; class QPagedPaintDevice; +class QRegularExpression; class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea { @@ -165,6 +166,9 @@ public: #ifndef QT_NO_REGEXP bool find(const QRegExp &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); #endif +#if QT_CONFIG(regularexpression) + bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); +#endif QString toPlainText() const; #ifndef QT_NO_TEXTHTMLPARSER diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 4af71c126e..bcf5a40ae3 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -799,18 +799,6 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, return action; } -/*!\fn template<typename PointerToMemberFunction> QAction *QToolBar::addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method) - - \since 5.6 - - \overload - - Creates a new action with the given \a text. This action is added to - the end of the toolbar. The action's - \l{QAction::triggered()}{triggered()} signal is connected to the - \a method of the \a receiver. -*/ - /*!\fn template<typename Functor> QAction *QToolBar::addAction(const QString &text, Functor functor) \since 5.6 @@ -829,24 +817,13 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, \overload - Creates a new action with the given \a text. This action is added to - the end of the toolbar. The action's + Creates a new action with the given \a text. This action is added + to the end of the toolbar. The action's \l{QAction::triggered()}{triggered()} signal is connected to the - \a functor. - - If \a context is destroyed, the functor will not be called. -*/ - -/*!\fn template<typename PointerToMemberFunction> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method) - - \since 5.6 + \a functor. The \a functor can be a pointer to a member function + in the \a context object. - \overload - - Creates a new action with the given \a icon and \a text. This - action is added to the end of the toolbar. The action's - \l{QAction::triggered()}{triggered()} signal is connected to the - \a method of the \a receiver. + If the \a context object is destroyed, the \a functor will not be called. */ /*!\fn template<typename Functor> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, Functor functor) @@ -870,9 +847,10 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, Creates a new action with the given \a icon and \a text. This action is added to the end of the toolbar. The action's \l{QAction::triggered()}{triggered()} signal is connected to the - \a functor. + \a functor. The \a functor can be a pointer to a member function + of the \a context object. - If \a context is destroyed, the functor will not be called. + If the \a context object is destroyed, the \a functor will not be called. */ /*! @@ -1067,7 +1045,7 @@ void QToolBar::paintEvent(QPaintEvent *) if (d->layout->expanded || d->layout->animating || isWindow()) { //if the toolbar is expended, we need to fill the background with the window color //because some styles may expects that. - p.fillRect(opt.rect, palette().background()); + p.fillRect(opt.rect, palette().window()); style->drawControl(QStyle::CE_ToolBar, &opt, &p, this); style->drawPrimitive(QStyle::PE_FrameMenu, &opt, &p, this); } else { diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index 4ae83190d1..0c434e8d1d 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -99,15 +99,11 @@ public: QAction *addAction(const QString &text, const QObject *receiver, const char* member); QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, const char* member); -#ifdef Q_QDOC - template<typename PointerToMemberFunction> - QAction *addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method); +#ifdef Q_CLANG_QDOC template<typename Functor> QAction *addAction(const QString &text, Functor functor); template<typename Functor> QAction *addAction(const QString &text, const QObject *context, Functor functor); - template<typename PointerToMemberFunction> - QAction *addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method); template<typename Functor> QAction *addAction(const QIcon &icon, const QString &text, Functor functor); template<typename Functor> @@ -149,7 +145,7 @@ public: connect(result, &QAction::triggered, slot); return result; } -#endif // !Q_QDOC +#endif // !Q_CLANG_QDOC QAction *addSeparator(); QAction *insertSeparator(QAction *before); diff --git a/src/widgets/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp index edf497111b..884eface3c 100644 --- a/src/widgets/widgets/qtoolbararealayout.cpp +++ b/src/widgets/widgets/qtoolbararealayout.cpp @@ -789,7 +789,7 @@ void QToolBarAreaLayout::deleteAllLayoutItems() } } -QInternal::DockPosition QToolBarAreaLayout::findToolBar(QToolBar *toolBar) const +QInternal::DockPosition QToolBarAreaLayout::findToolBar(const QToolBar *toolBar) const { for (int i = 0; i < QInternal::DockCount; ++i) { const QToolBarAreaLayoutInfo &dock = docks[i]; diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h index dffbab1f21..17747ef29b 100644 --- a/src/widgets/widgets/qtoolbararealayout_p.h +++ b/src/widgets/widgets/qtoolbararealayout_p.h @@ -196,7 +196,7 @@ public: void insertItem(QInternal::DockPosition pos, QLayoutItem *item); void insertItem(QToolBar *before, QLayoutItem *item); - QInternal::DockPosition findToolBar(QToolBar *toolBar) const; + QInternal::DockPosition findToolBar(const QToolBar *toolBar) const; bool toolBarBreak(QToolBar *toolBar) const; void getStyleOptionInfo(QStyleOptionToolBar *option, QToolBar *toolBar) const; diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index 46ade0277c..eee112f02f 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -504,7 +504,8 @@ int QToolBox::currentIndex() const } /*! - Returns a pointer to the current widget, or 0 if there is no such item. + Returns a pointer to the current widget, or \nullptr if there is + no such item. \sa currentIndex(), setCurrentWidget() */ @@ -512,7 +513,7 @@ int QToolBox::currentIndex() const QWidget * QToolBox::currentWidget() const { Q_D(const QToolBox); - return d->currentPage ? d->currentPage->widget : 0; + return d->currentPage ? d->currentPage->widget : nullptr; } /*! @@ -530,15 +531,15 @@ void QToolBox::setCurrentWidget(QWidget *widget) } /*! - Returns the widget at position \a index, or 0 if there is no such - item. + Returns the widget at position \a index, or \nullptr if there is + no such item. */ QWidget *QToolBox::widget(int index) const { Q_D(const QToolBox); if (index < 0 || index >= (int) d->pageList.size()) - return 0; + return nullptr; return d->pageList.at(index).widget; } diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 6a24712319..b00b219386 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -669,7 +669,8 @@ void QToolButton::setMenu(QMenu* menu) } /*! - Returns the associated menu, or 0 if no menu has been defined. + Returns the associated menu, or \nullptr if no menu has been + defined. \sa setMenu() */ @@ -678,7 +679,7 @@ QMenu* QToolButton::menu() const Q_D(const QToolButton); if (d->menuAction) return d->menuAction->menu(); - return 0; + return nullptr; } /*! diff --git a/src/widgets/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h index b87bbd6229..89bc759cc2 100644 --- a/src/widgets/widgets/qwidgetresizehandler_p.h +++ b/src/widgets/widgets/qwidgetresizehandler_p.h @@ -100,7 +100,7 @@ protected: void keyPressEvent(QKeyEvent *e); private: - Q_DISABLE_COPY(QWidgetResizeHandler) + Q_DISABLE_COPY_MOVE(QWidgetResizeHandler) enum MousePosition { Nowhere, diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index e179ea3b40..711c4bfd2a 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -57,9 +57,6 @@ #include <qtimer.h> #include "private/qtextdocumentlayout_p.h" #include "private/qabstracttextdocumentlayout_p.h" -#if QT_CONFIG(textedit) -#include "private/qtextedit_p.h" -#endif #include "qtextdocument.h" #include "private/qtextdocument_p.h" #include "qtextlist.h" @@ -218,6 +215,14 @@ bool QWidgetTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e) else if (e == QKeySequence::SelectPreviousLine) { op = QTextCursor::Up; mode = QTextCursor::KeepAnchor; + { + QTextBlock block = cursor.block(); + QTextLine line = currentTextLine(cursor); + if (!block.previous().isValid() + && line.isValid() + && line.lineNumber() == 0) + op = QTextCursor::Start; + } } else if (e == QKeySequence::SelectNextLine) { op = QTextCursor::Down; @@ -1357,15 +1362,8 @@ process: QVariant QWidgetTextControl::loadResource(int type, const QUrl &name) { -#if !QT_CONFIG(textedit) Q_UNUSED(type); Q_UNUSED(name); -#else - if (QTextEdit *textEdit = qobject_cast<QTextEdit *>(parent())) { - QUrl resolvedName = textEdit->d_func()->resolveUrl(name); - return textEdit->loadResource(type, resolvedName); - } -#endif return QVariant(); } @@ -3094,6 +3092,19 @@ bool QWidgetTextControl::find(const QRegExp &exp, QTextDocument::FindFlags optio } #endif +#if QT_CONFIG(regularexpression) +bool QWidgetTextControl::find(const QRegularExpression &exp, QTextDocument::FindFlags options) +{ + Q_D(QWidgetTextControl); + QTextCursor search = d->doc->find(exp, d->cursor, options); + if (search.isNull()) + return false; + + setTextCursor(search); + return true; +} +#endif + QString QWidgetTextControl::toPlainText() const { return document()->toPlainText(); diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h index 4b2acbd934..202ba36454 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p.h @@ -80,6 +80,7 @@ class QMenu; class QWidgetTextControlPrivate; class QAbstractScrollArea; class QEvent; +class QRegularExpression; class QTimerEvent; class Q_WIDGETS_EXPORT QWidgetTextControl : public QInputControl @@ -119,6 +120,9 @@ public: #ifndef QT_NO_REGEXP bool find(const QRegExp &exp, QTextDocument::FindFlags options = 0); #endif +#if QT_CONFIG(regularexpression) + bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = 0); +#endif QString toPlainText() const; #ifndef QT_NO_TEXTHTMLPARSER @@ -263,7 +267,7 @@ protected: virtual bool event(QEvent *e) override; private: - Q_DISABLE_COPY(QWidgetTextControl) + Q_DISABLE_COPY_MOVE(QWidgetTextControl) Q_PRIVATE_SLOT(d_func(), void _q_updateCurrentCharFormatAndSelection()) Q_PRIVATE_SLOT(d_func(), void _q_emitCursorPosChanged(const QTextCursor &)) Q_PRIVATE_SLOT(d_func(), void _q_deleteSelected()) diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 5893d8448e..a1f4d57da6 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -48,7 +48,9 @@ #include <qhash.h> #include <qiodevice.h> #include <qlist.h> -#include <qregexp.h> +#if QT_CONFIG(regularexpression) +#include <qregularexpression.h> +#endif #if QT_CONFIG(textcodec) #include <qtextcodec.h> #endif @@ -6430,7 +6432,7 @@ void QDomDocumentPrivate::saveDocument(QTextStream& s, const int indent, QDomNod const QDomNodePrivate* n = first; if(encUsed == QDomNode::EncodingFromDocument) { -#if QT_CONFIG(textcodec) +#if QT_CONFIG(textcodec) && QT_CONFIG(regularexpression) const QDomNodePrivate* n = first; QTextCodec *codec = 0; @@ -6438,11 +6440,11 @@ void QDomDocumentPrivate::saveDocument(QTextStream& s, const int indent, QDomNod if (n && n->isProcessingInstruction() && n->nodeName() == QLatin1String("xml")) { // we have an XML declaration QString data = n->nodeValue(); - QRegExp encoding(QString::fromLatin1("encoding\\s*=\\s*((\"([^\"]*)\")|('([^']*)'))")); - encoding.indexIn(data); - QString enc = encoding.cap(3); + QRegularExpression encoding(QString::fromLatin1("encoding\\s*=\\s*((\"([^\"]*)\")|('([^']*)'))")); + auto match = encoding.match(data); + QString enc = match.captured(3); if (enc.isEmpty()) - enc = encoding.cap(5); + enc = match.captured(5); if (!enc.isEmpty()) codec = QTextCodec::codecForName(std::move(enc).toLatin1()); } diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 7b6669b057..f4e6937146 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -43,7 +43,9 @@ #include "qtextcodec.h" #endif #include "qbuffer.h" -#include "qregexp.h" +#if QT_CONFIG(regularexpression) +#include "qregularexpression.h" +#endif #include "qmap.h" #include "qhash.h" #include "qstack.h" @@ -193,19 +195,23 @@ static const signed char charLookupTable[256]={ */ static bool stripTextDecl(QString& str) { - QString textDeclStart(QLatin1String("<?xml")); + QLatin1String textDeclStart("<?xml"); if (str.startsWith(textDeclStart)) { - QRegExp textDecl(QString::fromLatin1( +#if QT_CONFIG(regularexpression) + QRegularExpression textDecl(QString::fromLatin1( "^<\\?xml\\s+" "(version\\s*=\\s*((['\"])[-a-zA-Z0-9_.:]+\\3))?" "\\s*" "(encoding\\s*=\\s*((['\"])[A-Za-z][-a-zA-Z0-9_.]*\\6))?" "\\s*\\?>" - )); + )); QString strTmp = str.replace(textDecl, QLatin1String("")); if (strTmp.length() != str.length()) return false; // external entity has wrong TextDecl str = strTmp; +#else + return false; +#endif } return true; } @@ -2670,9 +2676,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlEntityResolver* QXmlReader::entityResolver() const + \fn QXmlEntityResolver *QXmlReader::entityResolver() const - Returns the entity resolver or 0 if none was set. + Returns the entity resolver or \nullptr if none was set. \sa setEntityResolver() */ @@ -2686,9 +2692,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlDTDHandler* QXmlReader::DTDHandler() const + \fn QXmlDTDHandler *QXmlReader::DTDHandler() const - Returns the DTD handler or 0 if none was set. + Returns the DTD handler or \nullptr if none was set. \sa setDTDHandler() */ @@ -2702,9 +2708,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlContentHandler* QXmlReader::contentHandler() const + \fn QXmlContentHandler *QXmlReader::contentHandler() const - Returns the content handler or 0 if none was set. + Returns the content handler or \nullptr if none was set. \sa setContentHandler() */ @@ -2719,9 +2725,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlErrorHandler* QXmlReader::errorHandler() const + \fn QXmlErrorHandler *QXmlReader::errorHandler() const - Returns the error handler or 0 if none is set. + Returns the error handler or \nullptr if none is set. \sa setErrorHandler() */ @@ -2735,9 +2741,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlLexicalHandler* QXmlReader::lexicalHandler() const + \fn QXmlLexicalHandler *QXmlReader::lexicalHandler() const - Returns the lexical handler or 0 if none was set. + Returns the lexical handler or \nullptr if none was set. \sa setLexicalHandler() */ @@ -2751,9 +2757,9 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() */ /*! - \fn QXmlDeclHandler* QXmlReader::declHandler() const + \fn QXmlDeclHandler *QXmlReader::declHandler() const - Returns the declaration handler or 0 if none was set. + Returns the declaration handler or \nullptr if none was set. \sa setDeclHandler() */ |