summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prefer mutable over const_cast.João Abecasis2009-07-222-5/+4
| | | | | Reviewed-by: Simon Hausmann Reviewed-by: Frans Englich
* Bugfix/optimization in QResourceFileEngineIteratorJoão Abecasis2009-07-221-2/+1
| | | | | | | | 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
* Off-by-one error in QResourceFileEngineIteratorJoão Abecasis2009-07-221-1/+1
| | | | | | | | 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
* Don't hide errors in QDirIteratorJoão Abecasis2009-07-221-4/+1
| | | | | | | 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
* QDirIterator refactoringJoão Abecasis2009-07-221-5/+18
| | | | | | | Name filters and resulting regular expressions are stable, no need to regenerate the latter on each iteration. Reviewed-by: Olivier Goffart
* QDirIterator refactoringJoão Abecasis2009-07-221-6/+5
| | | | | | | | '*' 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
* QDirIterator refactoringJoão Abecasis2009-07-221-13/+16
| | | | | | Moving member data around and marking immutable data as such. Reviewed-by: Marius Storm-Olsen
* QDirIterator: fail early, fail oftenJoão Abecasis2009-07-221-2/+2
| | | | | | | If nothing else changes, there's no point to keep trying. Let a broken QDirIterator be broken. Reviewed-by: Marius Storm-Olsen
* QDirIterator: Cleaning up after one's selfJoão Abecasis2009-07-221-2/+1
| | | | | | | | | Well, why not? Resetting nextFileInfo when we're done allows removing unnecessary check in QDirIterator::next(), while retaining behavior. Reviewed-by: Marius Storm-Olsen
* QDirIterator cleanup after refactoringJoão Abecasis2009-07-221-9/+8
| | | | | | | Return value for checkAndPushDirectory is no longer used, we can just throw it out. Reviewed-by: Marius Storm-Olsen
* QDirIterator refactoringJoão Abecasis2009-07-221-11/+7
| | | | | | | | | | | 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
* QDirIterator refactoringJoão Abecasis2009-07-221-9/+9
| | | | | | | | | 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
* QDirIterator: no point in delaying the inevitableJoão Abecasis2009-07-221-7/+3
| | | | | | | | | | | | | | 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
* QDirIterator refactoringJoão Abecasis2009-07-221-4/+3
| | | | | | | | 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
* QDirIterator: another one bites the dustJoão Abecasis2009-07-221-12/+5
| | | | | | | | | | | | 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
* Still fixing QDirIterator...João Abecasis2009-07-221-2/+2
| | | | | | | | | | | 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
* QDirIterator cleanupJoão Abecasis2009-07-221-7/+5
| | | | | | | 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
* QDirIterator: Don't recurse into hidden directories unless askedJoão Abecasis2009-07-221-0/+4
| | | | | | | | | | | 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
* QDirIterator moving around conditionsJoão Abecasis2009-07-221-6/+5
| | | | | | | Which is faster QFileInfo::isSymlink() or QFileInfo::fileName() followed by string comparisons? Reviewed-by: Marius Storm-Olsen
* Faster condition comes firstJoão Abecasis2009-07-221-1/+1
| | | | Reviewed-by: Marius Storm-Olsen
* QDirIterator: refactor initializations in private constructorJoão Abecasis2009-07-221-5/+5
| | | | | | There's no need for initializing variables twice. Reviewed-by: Marius Storm-Olsen
* Merge commit 'origin/4.5'Olivier Goffart2009-07-2211-10/+73
|\ | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qt_cocoa_helpers_mac_p.h
| * Designer: Fixed bug in setting QUrl property values from resources.Friedemann Kleint2009-07-221-2/+5
| | | | | | | | | | | | | | 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>
| * Fix a potential crash due to the fact that _q_UpdateIndex() is reenteredAndy Shaw2009-07-221-1/+1
| | | | | | | | | | | | | | | | | | 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
| * Add a (failing) test for QProcess bug 258462.Rohan McGovern2009-07-221-0/+31
| |
| * Make sure DFB version macros are definedAnders Bakken2009-07-211-0/+1
| | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| * Another fix needed to build in a namespace on Mac with -arch ppcAndy Shaw2009-07-211-1/+2
| | | | | | | | | | | | | | | | Don't know how this got lost in the original submit since I had added both. Task-number: 257080 Reviewed-by: nrc
| * QHttpNetworkConnection: Clarifying code comment about compressionMarkus Goetz2009-07-211-1/+6
| | | | | | | | Reviewed-by: TrustMe
| * Fix building in a namespace when building with -arch ppc on Mac OS XAndy2009-07-211-2/+0
| | | | | | | | | | Task-number: 257080 Reviewed-by: nrc
| * QNAM: Proper loading of meta data when having AlwaysCache modeMarkus Goetz2009-07-212-0/+24
| | | | | | | | | | | | | | | | | | 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
| * Fixed compile on certain Solaris versions.Rohan McGovern2009-07-201-1/+1
| | | | | | | | | | Every source file must end with a newline, otherwise: "Error: There is extra text on this line."
| * s/slots/Q_SLOTS/Anders Bakken2009-07-202-2/+2
| | | | | | | | | | | | Fix QDirectFBMousePrivate and QDirectFBKeyboardPrivate Reviewed-by: TrustMe
| * fix qmake syntaxOswald Buddenhagen2009-07-201-2/+2
| | | | | | | | Reviewed-by: TrustMe
* | Show text even if maximum == 0Olivier Goffart2009-07-222-2/+2
| |
* | Support for very large range in QProgressBarOlivier Goffart2009-07-225-10/+39
| | | | | | | | | | | | Regression since my last commit. Task-number: 152227
* | Simplify the computation of the QProgressBar progress.Olivier Goffart2009-07-223-8/+7
| | | | | | | | | | | | | | This is also a work around for a bug in gcc on powerpc (embedded-linux) Task-number: 258358 Reviewed-by: jbache
* | qdoc: Reported links to obsolete things that appear in non-obsolete things.Martin Smith2009-07-222-2/+10
| | | | | | | | Also marked the other QHttpXxx classes as \obsolete.
* | qdoc: Added page for obsolete classes.Martin Smith2009-07-224-25/+124
| | | | | | | | | | | | | | 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.
* | qdoc: Changed to build qdoc3 in release mode.Martin Smith2009-07-221-2/+3
| |
* | delete incorrect documentationKent Hansen2009-07-221-12/+0
| |
* | Fix Warning saying that signal cannot be made virtualOlivier Goffart2009-07-222-11/+31
| | | | | | | | | | | | | | | | 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
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-07-22127-1111/+1211
|\ \
| * | Fixed compile with -qtnamespace and MSVC.Rohan McGovern2009-07-222-5/+8
| | | | | | | | | | | | | | | When an extern function is declared in the scope of another function, MSVC sometimes ignores the enclosing namespace {}.
| * | Fixed valgrind warnings related to sigaction from every testcase.Rohan McGovern2009-07-211-1/+1
| | | | | | | | | | | | Whoops, don't do sigaction for (nonexistent) signal 0.
| * | Doc: documentation for boolean properties should say what happens whenVolker Hilsheimer2009-07-211-5/+7
| | | | | | | | | | | | the property is set, not what doesn't happen when the property is not set.
| * | Doc: make potentially incorrect overloads obsolete.Volker Hilsheimer2009-07-212-3/+25
| | | | | | | | | | | | | | | | | | Also add additional overload. Reviewed-by: Andreas
| * | Silence compiler warnings on shadowing of member functions.Volker Hilsheimer2009-07-211-11/+11
| | |
| * | Doc: document reimplementations of internal functions as internal.Volker Hilsheimer2009-07-214-8/+8
| | |
| * | Fixed opacity bug in the GL2 paint engine.Kim Motoyoshi Kalland2009-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | | When premultiplying a color with the opacity, the color's alpha channel was not set correcly. Reviewed-by: Tom
| * | Fixed gradient bug in the GL2 paint engine.Kim Motoyoshi Kalland2009-07-211-3/+3
| | | | | | | | | | | | | | | | | | | | | Texture filtering was set before binding the texture, so the gradient spread was not set correctly. Reviewed-by: Tom