| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-by: Simon Hausmann
Reviewed-by: Frans Englich
|
|
|
|
|
|
|
|
| |
If the resource is valid, children should not be empty. If it happens to
be, hasNext() should then return false. Setting the index to 0 ensures
this and also that we don't keep trying the same thing over and over.
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
|
| |
This was making the resource iterator return empty entries after listing
resources. This showed up after QDirIterator stopped filtering empty
entries.
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
| |
Empty filenames should only show up from bugs in file engine iterators's
hasNext() function. We shouldn't try to hide those here.
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
| |
Name filters and resulting regular expressions are stable, no need to
regenerate the latter on each iteration.
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
|
| |
'*' is functionally the same as having no name filters. Equating the
equivalence in the constructor avoids repeated checks in the advance
"loop".
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
| |
Moving member data around and marking immutable data as such.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
| |
If nothing else changes, there's no point to keep trying. Let a broken
QDirIterator be broken.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
| |
Well, why not?
Resetting nextFileInfo when we're done allows removing unnecessary check
in QDirIterator::next(), while retaining behavior.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
| |
Return value for checkAndPushDirectory is no longer used, we can just
throw it out.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
| |
Now that the heavy lifting has been done, we can condense
QDirIteratorPrivate::advance() further. It almost looks nice, even!
Using fileEngineIterators.top() directly in the loop condition allows us
to manipulate the stack without the foundDirectory check. Since QStack
can be inlined, this shouldn't severely affect performance...
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
| |
Some pointless renaming and mashing up...
Actually, some of it sets the stage for (yes, you guessed it!) more
refactoring!
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The only reason I see for not calling advance() directly in the
constructor is to delay potentially unnecessary work.
However, since copy constructors have been explicitly disabled, once
QDirIterator is instantiated one has signed up for all the pain that
comes with it.
That's also a couple less conditionals in each iteration of normal use
cases.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
| |
done was set no sooner and no later than the file engine iterators stack
was emptied (in a single threaded setting, anyway). There is no need to
maintain additional state separately.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removing another data member in QDirIteratorPrivate.
The only reason I see for not doing this is to delay doing work as much
as possible. Since copy constructors are disabled anyway, once
QDirIterator is instantiated one has already signed up for the pain.
The code also looks cleaner this way.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
| |
Setting nextFileInfo in the constructor would generate visible behavior
changes on the first call to QDirIterator::hasNext(), and that's just
wrong.
Namely, fileName(), filePath() would return different results before and
after calling hasNext().
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
| |
The authoritative copy of filters and nameFilters is available, there is
no need to get this from the file engine iterators.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
| |
If we're skipping hidden files, we should skip hidden directories as
well. The user can still request that hidden directories not be skipped
by specifying QDir::AllDirs in the filter.
Incidentally, all other filters are ignored when recursing into
sub-directories. Perhaps that should be addressed as well.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
| |
Which is faster QFileInfo::isSymlink() or QFileInfo::fileName() followed by
string comparisons?
Reviewed-by: Marius Storm-Olsen
|
|
|
|
| |
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
| |
There's no need for initializing variables twice.
Reviewed-by: Marius Storm-Olsen
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qt_cocoa_helpers_mac_p.h
|
| |
| |
| |
| |
| |
| |
| | |
Setting a file from a resource would result in 'qrc::/file' as
the resource browser returns ':/file'.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Initial-patch-by: andy <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is confirmed to resolve a number of problems from the original
reportee. It's already fixed in Qt 4.6 in a more wider fix, but this
one liner is a good to have in Qt 4.5.x anyway.
Task-number: 258194
Reviewed-by: alexis
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Don't know how this got lost in the original submit since I had added
both.
Task-number: 257080
Reviewed-by: nrc
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| | |
Task-number: 257080
Reviewed-by: nrc
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Properly load the raw headers and properly handle the redirection
when having a network cache in AlwaysCache mode (equals the offline
mode in web browser).
Task-number: 256240
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| | |
Every source file must end with a newline, otherwise:
"Error: There is extra text on this line."
|
| |
| |
| |
| |
| |
| | |
Fix QDirectFBMousePrivate and QDirectFBKeyboardPrivate
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
| |
| |
| |
| |
| |
| | |
Regression since my last commit.
Task-number: 152227
|
| |
| |
| |
| |
| |
| |
| | |
This is also a work around for a bug in gcc on powerpc (embedded-linux)
Task-number: 258358
Reviewed-by: jbache
|
| |
| |
| |
| | |
Also marked the other QHttpXxx classes as \obsolete.
|
| |
| |
| |
| |
| |
| |
| | |
The classes marked \obsolete are no longer included in the
"All Classes" list. They are listed separately on an
"Obsolete Classes" list. The new page is reachable from the
"All Classes" page and from the "Grouped Classes" page.
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
The test for virtual signal did not work.
But we cannot make an error right now or it might break existing code
(exemple in task 210879)
Reviewed-by: Kent Hansen
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | | |
When an extern function is declared in the scope of another function,
MSVC sometimes ignores the enclosing namespace {}.
|
| | |
| | |
| | |
| | | |
Whoops, don't do sigaction for (nonexistent) signal 0.
|
| | |
| | |
| | |
| | | |
the property is set, not what doesn't happen when the property is not set.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Also add additional overload.
Reviewed-by: Andreas
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When premultiplying a color with the opacity, the color's alpha channel
was not set correcly.
Reviewed-by: Tom
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Texture filtering was set before binding the texture, so the gradient
spread was not set correctly.
Reviewed-by: Tom
|