[localthemedaemonclient] fix SVG prioritisation over inheritance #14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The whole model has been simplified: all file names (without path and extension) are stored in one hash array across all inherited themes. Since extension is ignored, the topmost theme to provide the graphic wins the race, no matter what the file type is.
| @@ -206,7 +197,8 @@ void MLocalThemeDaemonClient::buildHash(const QDir& rootDir, const QStringList& | |||
| rDir.setNameFilters(nameFilter); | |||
| QStringList files = rDir.entryList(QDir::Files); | |||
| foreach (const QString &filename, files) { | |||
| m_filenameHash.insert(filename, rootDir.absolutePath()); | |||
| QFileInfo fi(filename); | |||
| m_filenameHash.insert(fi.baseName(), rootDir.absolutePath() + QDir::separator() + filename); | |||
There was a problem hiding this comment.
fi.absolutePath() is probably the same thing as the second argument you're constructing with concatenations
There was a problem hiding this comment.
Nope it isn't: the filename variable contains only file name e.g. "graphic-l-sample.png" (no path). As before this commit, it used to be done as "m_filenameHash.insert(filename, ...".
Proof: readImage(id) does m_filenameHash.value(id [+suffix before this patch]) , where id is only filename without extension (no path)
|
OK |
|
Tested, works, approved, pulling the trigger |
sledges
added a commit
that referenced
this pull request
Oct 22, 2013
[localthemedaemonclient] fix SVG prioritisation over inheritance
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The whole model has been simplified: all file names (without path and extension)
are stored in one hash array across all inherited themes. Since extension is
ignored, the topmost theme to provide the graphic wins the race, no matter what
the file type is.