| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: João Abecasis
|
|
|
|
| |
Reviewed-by: Joao
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Moved it into QFileSystemEntry, instead.
For the time being, QFileSystemEntry may look like an unnecessary extra
layer of indirection. For the time being, this allows us to do some code
cleanup and de-duplication. It is also a stepping stone to becoming
completely independent of the current file engine abstraction.
Changes to QFileSystemEntry:
- native file path on Windows is now a QString, instead of a
QByteArray. Accordingly, constructors taking a QByteArray were
removed for these platforms.
- Encoding/decoding of file names uses QFile::encode/decodeName API,
instead of assuming local 8 bit. On Windows, UTF-16 is used for
native, as was being done in QFSFileEngine.
- new functions isRoot(), isDriveRoot() [Windows/Symbian], and path()
- convenience functions clear() and isEmpty() added to facilitate
porting.
Changes to QFSFileEngine (Windows):
- removed QFSFileEnginePrivate::sizeFdFh(): the function was broken
and never used, so might as well not get compiled in.
- repeated pattern for use of FindFirstFile/FindClose hidden away in a
static inline function.
- repeated and inconsistent conversions from QString to native file
paths reduced through the use of QFileSystemEntry.
Done-with: Prasanth Ullattil
Done-with: Thomas Zander
|
|
|
|
|
|
|
|
|
|
| |
* Added default constructor.
* Made single-argument constructors explicit
* Converted bit-field data to "proper" variables - the bit-fields may
have been premature optimization and it may even turn out to not
relevant to keep this cache.
Reviewed-by: Thomas Zander
|
|
|
|
| |
to implementation files in new QFileSystem* API.
|
|
|
|
|
|
|
|
| |
Since we're refactoring code out of QFSFileEngine the new internal
classes have to be compiled in together with the old engines.
For the time being, we'll assume Mac uses the unix version of the
engine. We'll fork those only if and as needed.
|
|
|
|
|
|
|
| |
Copy constructing a QDir instance from this and then detaching it in
setPath doesn't get us anything so we might as well do it all in one go.
Reviewed-by: Prasanth Ullattil
|
|
|
|
|
|
|
|
|
|
|
| |
makeAbsolute would return false if the newly constructed file engine
reported it wasn't referencing a directory. At this point, the private
data has already been updated, rendering the instance unusable.
Instead, we now create a separate QDir instance and reset our private
data only on success. Similarly to what's done in QDir::cd.
Reviewed-by: Prasanth Ullattil
|
|
|
|
|
|
|
|
| |
With the recent changes to QDirPrivate and how d_ptr is now a
QSharedDataPointer, we no longer need to worry about self-assignment, as
that is already handled by the d_ptr. Simplifying code here.
Reviewed-by: Prasanth Ullattil
|
|
|
|
|
|
|
|
|
|
| |
Move the code for determining the absolute path on unix from the
qfsfileengine_unix.cpp to the new qfilesystemengine_unix.cpp which
is a static, stateless class.
Made sure that the old qfsfileengine_unix.cpp keeps on working by
calling into the new one.
Reviewed-by: João Abecasis
|
| |
|
|
|
|
|
|
|
|
|
|
| |
New file engine API is meant to be a thin layer of abstraction over
native file system APIs. Stateless and static for the time being.
Platform-specific implementations will follow.
Reviewed-by: Thomas Zander
Reviewed-by: Prasanth Ullattil
|
|
|
|
|
|
|
|
|
|
|
|
| |
While refactoring, a bug was introduced where shared data would be
updated before detaching in setNameFilter. Further refactoring turned
this into a double-detach, instead.
Now the issue is fixed by adding the appropriate initFileEngine and
nameFilters assignment, instead of calling setNameFilters to finish the
job.
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some renaming to make intent clearer and improve consistency:
listsDirty => listsInitialized (logic inverted)
updateFileLists => initFileLists
clear => clearFileLists
Also note that initializing file lists shouldn't trigger detach, because
no previous version of the cached data has been seen.
Reviewed-by: Thomas Zander
|
|
|
|
|
|
| |
Moved common initialization code from QDir ctor to QDirPrivate.
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Merged QDirPrivate with QDirPrivate::Data, as QDirPrivate served no
purpose by itself, only adding an additional layer of indirection to the
potentially shared private data, and an unnecessary allocation.
Now, QDir holds a QSharedDataPointer to its private data. Private data
will be shared among copied instances with COW semantics. Still, this
sharing is very limited as plenty of regular use cases will cause the
shared data to detach, such as refreshing the file lists.
As the use QSharedDataPointer breaks usage of the Q_DECLARE_PRIVATE
macro, we manually define the d_func'tions. Non-const d_func detaches on
shared data. A detach function was added to the public interface to
support this. (On a side note, QFileInfo already exposes a similar
detach function).
As much as possible, detach is handled implicitly inside the Q_D macro,
through the d_func() non-const overload. On the other hand, implicit
creation of file engines through detach was made explicit with a call to
a new initFileEngine function.
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
| |
The QFileInfoPrivate::Data member class is removed now. All the methods
moved to QFileInfoPrivate. QFileInfoPrivate becomes a QSharedData type.
Reviewed-by: Joao
|
|
|
|
| |
Reviewed-by: Thomas Zander
|
| |
|
|
|
|
| |
Reviewed-by: Joao
|
|
|
|
|
|
|
|
| |
There was an unnecessary split of QDir's private data between
QDirPrivate and QDirPrivate::Data. As a stepping stone towards merging
the two, this moves everything into QDirPrivate::Data.
Reviewed-by: Thomas Zander
|
|
|
|
| |
Reviewed-by: Joao
|
| |
|
|
|
|
| |
Reviewed-by: Prasanth Ullattil
|
|
|
|
|
|
| |
Empty for now.
Reviewed-by: Thomas Zander
|
|
|
|
| |
Reviewed-by: Thomas Zander
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make the QItemSelectionRange and QItemSelectionModel ensure that the model is correct.
Fixed autotest compilation issue on solaris
Fixed build issue on Solaris
|
| |
| |
| |
| |
| |
| |
| | |
is correct.
Merge-request: 720
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
|
| |
| |
| |
| | |
Task-number: QTBUG-12991
|
|/
|
|
| |
Task-number: QTBUG-12994
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QGroupBox: Fix the focus rect of the title when using stylesheet
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13015
Reviewed-by: Olivier Goffart
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qUncompress: don't exit on allocation failure with -no-exceptions
Prefer Q_CHECK_PTR to q_check_ptr
Prefer Q_CHECK_PTR to q_check_ptr
Ensure Q_CHECK_PTR always requires terminating ;
Q_CHECK_PTR should issue qFatal with QT_NO_EXCEPTIONS
Workaround what seems to be a compiler parser bug
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If we're not allowed to fail here with -no-exceptions, we shouldn't
throw either so just check the return value from qRealloc and be done
with it.
Also changed the test case so it doesn't expect bad_alloc being thrown;
the test data now gets properly initialized...
Reviewed-by: Olivier Goffart
Reviewed-by: Harald Fernengel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
With the macro version we get proper debug output (with __FILE__,
__LINE__ annotations) when compiling with -no-exceptions and
!QT_NO_DEBUG.
All changes in this patch affect assignment to local variables, where
the order of assignment versus actual pointer check is not important.
Reviewed-by: Olivier Goffart
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
With the macro version we get proper debug output (with __FILE__,
__LINE__ annotations) when compiling with -no-exceptions and
!QT_NO_DEBUG.
Reviewed-by: Olivier Goffart
|
| | |
| | |
| | |
| | |
| | |
| | | |
... even with -no-exceptions and QT_NO_DEBUG.
Reviewed-by: Olivier Goffart
|
| |\ \
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Q_CHECK_PTR should issue qFatal with QT_NO_EXCEPTIONS
Workaround what seems to be a compiler parser bug
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Allowing the null pointer to propagate seems to be a bigger evil and
could potentially become a security risk.
Task-number: QT-3785
Reviewed-by: Peter Hartmann
Reviewed-by: Olivier Goffart
Reviewed-by: Thiago Macieira
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The workaround seems harmless, otherwise. Maybe even standard-compliant
(14.2.4 [temp.names])
$ gcc --version
sbox-arm-none-linux-gnueabi-gcc (cs2009q1-eglibc2.8-armv7) 4.3.3
Copyright (C) 2008 Free Software Foundation, Inc.
Reviewed-by: Olivier Goffart
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Disable translatedRotatedAndScaledPainter testcase as it is broken.
Fixed partial update on QLineEdit
disable the outlinefillconsistency test until the line algorithm has been updated.
Fix nasty copy-paste bug in fetchTransformedBilinear()
fix breakages in qpainter autotests.
QMetaType: add "signed char" as builtin.
Fix how subpixel positions are intepreted in an aliased grid.
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QLineControl passes a QRect to tell when a partial update is needed.
We used to connect this slot to update. This made the whole lineedit
update when the cursor blinked.
Task-number: QTBUG-12709
Reviewed-by: gabi
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem is that the order of rounding to fixedpoint is different
in the static and normal text case and this leads to some glyphs
occationally being 1 pixel off.
In the normal case, the glyphs are laid out and positioned in fixed
point, then transformed using the full current matrix including the
position which is then snapped to integer device space when drawn.
In the static text case, the glyphs are laid out and positioned in
fixed point related to 0,0. The actual device position is then
added to the glyph positions.
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Introduced in commit 0d7e68391
Reviewed-by: Samuel
|
| | |\ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix breakages in qpainter autotests.
QMetaType: add "signed char" as builtin.
Fix how subpixel positions are intepreted in an aliased grid.
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Designer: Add 'Simplify rich text' filter to rich text editor.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add an option to filter out style elements created by the
text engine to keep the rich text simple.
Acked-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-10890
|