Fixup commit 15d09f9, QStandardPaths can't use wildcards directly

wilder-portage
Hrvoje Senjan 12 years ago
parent 83515eafbc
commit 9ecc27aadb
  1. 20
      src/ColorSchemeManager.cpp
  2. 10
      src/KeyboardTranslatorManager.cpp
  3. 11
      src/ProfileReader.cpp

@ -267,12 +267,28 @@ bool ColorSchemeManager::loadKDE3ColorScheme(const QString& filePath)
QStringList ColorSchemeManager::listColorSchemes()
{
return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/*.colorscheme"));
QStringList colorschemes;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "konsole", QStandardPaths::LocateDirectory);
Q_FOREACH (const QString& dir, dirs) {
const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.colorscheme"));
Q_FOREACH (const QString& file, fileNames) {
colorschemes.append(dir + '/' + file);
}
}
return colorschemes;
}
QStringList ColorSchemeManager::listKDE3ColorSchemes()
{
return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/*.schema"));
QStringList kde3colorschemes;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "konsole", QStandardPaths::LocateDirectory);
Q_FOREACH (const QString& dir, dirs) {
const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.schema"));
Q_FOREACH (const QString& file, fileNames) {
kde3colorschemes.append(dir + '/' + file);
}
}
return kde3colorschemes;
}
const ColorScheme ColorSchemeManager::_defaultColorScheme;

@ -83,7 +83,15 @@ QString KeyboardTranslatorManager::findTranslatorPath(const QString& name)
void KeyboardTranslatorManager::findTranslators()
{
QStringList list = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/*.keytab"));
QStringList list;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "konsole", QStandardPaths::LocateDirectory);
Q_FOREACH (const QString& dir, dirs) {
const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.keytab"));
Q_FOREACH (const QString& file, fileNames) {
list.append(dir + '/' + file);
}
}
// add the name of each translator to the list and associated
// the name with a null pointer to indicate that the translator

@ -24,6 +24,7 @@
// Qt
#include <QtCore/QFile>
#include <QtCore/QDir>
// KDE
#include <KConfig>
@ -39,7 +40,15 @@ static const char GENERAL_GROUP[] = "General";
QStringList KDE4ProfileReader::findProfiles()
{
return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("konsole/*.profile"));
QStringList profiles;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "konsole", QStandardPaths::LocateDirectory);
Q_FOREACH (const QString& dir, dirs) {
const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.profile"));
Q_FOREACH (const QString& file, fileNames) {
profiles.append(dir + '/' + file);
}
}
return profiles;
}
void KDE4ProfileReader::readProperties(const KConfig& config, Profile::Ptr profile,
const Profile::PropertyInfo* properties)

Loading…
Cancel
Save