yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix no cast from ASCII in Aurorae

Browse source
This commit is contained in:
Martin Gräßlin 2013-07-25 18:04:27 +02:00
parent a1c0c4048d
commit f924be909b
4 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
clients/aurorae/src/aurorae.cpp
View file

@ -54,14 +54,14 @@ void AuroraeFactory::init()
{
qRegisterMetaType<uint>("Qt::MouseButtons");
KConfig conf("auroraerc");
KConfig conf(QStringLiteral("auroraerc"));
KConfigGroup group(&conf, "Engine");
if (!group.hasKey("EngineType") && !group.hasKey("ThemeName")) {
// neither engine type and theme name are configured, use the only available theme
initQML(group);
} else if (group.hasKey("EngineType")) {
const QString engineType = group.readEntry("EngineType", "aurorae").toLower();
if (engineType == "qml") {
if (engineType == QStringLiteral("qml")) {
initQML(group);
} else {
// fallback to classic Aurorae Themes
@ -82,7 +82,7 @@ void AuroraeFactory::initAurorae(KConfig &conf, KConfigGroup &group)
initQML(group);
return;
}
KConfig config("aurorae/themes/" + themeName + '/' + themeName + "rc", KConfig::FullConfig, "data");
KConfig config(QStringLiteral("aurorae/themes/") + themeName + QStringLiteral("/") + themeName + QStringLiteral("rc"), KConfig::FullConfig, "data");
KConfigGroup themeGroup(&conf, themeName);
m_theme->loadTheme(themeName, config);
m_theme->setBorderSize((KDecorationDefines::BorderSize)themeGroup.readEntry<int>("BorderSize", KDecorationDefines::BorderNormal));
@ -92,13 +92,13 @@ void AuroraeFactory::initAurorae(KConfig &conf, KConfigGroup &group)
/* use logic from KDeclarative::setupBindings():
"addImportPath adds the path at the beginning, so to honour user's
paths we need to traverse the list in reverse order" */
QStringListIterator paths(KGlobal::dirs()->findDirs("module", "imports"));
QStringListIterator paths(KGlobal::dirs()->findDirs("module", QStringLiteral("imports")));
paths.toBack();
while (paths.hasPrevious()) {
m_engine->addImportPath(paths.previous());
}
m_component->loadUrl(QUrl(KStandardDirs::locate("data", "kwin/aurorae/aurorae.qml")));
m_engine->rootContext()->setContextProperty("auroraeTheme", m_theme);
m_component->loadUrl(QUrl(KStandardDirs::locate("data", QStringLiteral("kwin/aurorae/aurorae.qml"))));
m_engine->rootContext()->setContextProperty(QStringLiteral("auroraeTheme"), m_theme);
m_themeName = themeName;
}
@ -109,8 +109,8 @@ void AuroraeFactory::initQML(const KConfigGroup &group)
kDebug(1212) << "Trying to load QML Decoration " << themeName;
const QString internalname = themeName.toLower();
QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(internalname);
KService::List offers = KServiceTypeTrader::self()->query("KWin/Decoration", constraint);
QString constraint = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(internalname);
KService::List offers = KServiceTypeTrader::self()->query(QStringLiteral("KWin/Decoration"), constraint);
if (offers.isEmpty()) {
kError(1212) << "Couldn't find QML Decoration " << themeName << endl;
// TODO: what to do in error case?
@ -118,9 +118,9 @@ void AuroraeFactory::initQML(const KConfigGroup &group)
}
KService::Ptr service = offers.first();
KPluginInfo plugininfo(service);
const QString pluginName = service->property("X-KDE-PluginInfo-Name").toString();
const QString scriptName = service->property("X-Plasma-MainScript").toString();
const QString file = KStandardDirs::locate("data", QLatin1String(KWIN_NAME) + "/decorations/" + pluginName + "/contents/" + scriptName);
const QString pluginName = service->property(QStringLiteral("X-KDE-PluginInfo-Name")).toString();
const QString scriptName = service->property(QStringLiteral("X-Plasma-MainScript")).toString();
const QString file = KStandardDirs::locate("data", QStringLiteral(KWIN_NAME) + QStringLiteral("/decorations/") + pluginName + QStringLiteral("/contents/") + scriptName);
if (file.isNull()) {
kDebug(1212) << "Could not find script file for " << pluginName;
// TODO: what to do in error case?
@ -131,7 +131,7 @@ void AuroraeFactory::initQML(const KConfigGroup &group)
/* use logic from KDeclarative::setupBindings():
"addImportPath adds the path at the beginning, so to honour user's
paths we need to traverse the list in reverse order" */
QStringListIterator paths(KGlobal::dirs()->findDirs("module", "imports"));
QStringListIterator paths(KGlobal::dirs()->findDirs("module", QStringLiteral("imports")));
paths.toBack();
while (paths.hasPrevious()) {
m_engine->addImportPath(paths.previous());
@ -165,10 +165,10 @@ bool AuroraeFactory::reset(unsigned long changed)
if (changed & SettingCompositing) {
return false;
}
const KConfig conf("auroraerc");
const KConfig conf(QStringLiteral("auroraerc"));
const KConfigGroup group(&conf, "Engine");
const QString themeName = group.readEntry("ThemeName", "example-deco");
const KConfig config("aurorae/themes/" + themeName + '/' + themeName + "rc", KConfig::FullConfig, "data");
const KConfig config(QStringLiteral("aurorae/themes/") + themeName + QStringLiteral("/") + themeName + QStringLiteral("rc"), KConfig::FullConfig, "data");
const KConfigGroup themeGroup(&conf, themeName);
if (themeName != m_themeName) {
m_engine->clearComponentCache();
@ -229,7 +229,7 @@ QList< KDecorationDefines::BorderSize > AuroraeFactory::borderSizes() const
QDeclarativeItem *AuroraeFactory::createQmlDecoration(Aurorae::AuroraeClient *client)
{
QDeclarativeContext *context = new QDeclarativeContext(m_engine->rootContext(), this);
context->setContextProperty("decoration", client);
context->setContextProperty(QStringLiteral("decoration"), client);
return qobject_cast< QDeclarativeItem* >(m_component->create(context));
}
@ -368,9 +368,9 @@ void AuroraeClient::borders(int &left, int &right, int &top, int &bottom) const
const bool maximized = maximizeMode() == MaximizeFull && !options()->moveResizeMaximizedWindows();
QObject *borders = NULL;
if (maximized) {
borders = m_item->findChild<QObject*>("maximizedBorders");
borders = m_item->findChild<QObject*>(QStringLiteral("maximizedBorders"));
} else {
borders = m_item->findChild<QObject*>("borders");
borders = m_item->findChild<QObject*>(QStringLiteral("borders"));
}
sizesFromBorders(borders, left, right, top, bottom);
}
@ -385,7 +385,7 @@ void AuroraeClient::padding(int &left, int &right, int &top, int &bottom) const
left = right = top = bottom = 0;
return;
}
sizesFromBorders(m_item->findChild<QObject*>("padding"), left, right, top, bottom);
sizesFromBorders(m_item->findChild<QObject*>(QStringLiteral("padding")), left, right, top, bottom);
}
void AuroraeClient::sizesFromBorders(const QObject *borders, int &left, int &right, int &top, int &bottom) const
@ -590,7 +590,7 @@ void AuroraeClient::doTitlebarDblClickOperation()
QVariant AuroraeClient::readConfig(const QString &key, const QVariant &defaultValue)
{
KSharedConfigPtr config = KSharedConfig::openConfig("auroraerc");
KSharedConfigPtr config = KSharedConfig::openConfig(QStringLiteral("auroraerc"));
return config->group(AuroraeFactory::instance()->currentThemeName()).readEntry(key, defaultValue);
}
@ -623,7 +623,7 @@ QRegion AuroraeClient::region(KDecorationDefines::Region r)
}
int left, right, top, bottom;
left = right = top = bottom = 0;
sizesFromBorders(m_item->findChild<QObject*>("extendedBorders"), left, right, top, bottom);
sizesFromBorders(m_item->findChild<QObject*>(QStringLiteral("extendedBorders")), left, right, top, bottom);
if (top == 0 && right == 0 && bottom == 0 && left == 0) {
// no extended borders
return QRegion();

14
clients/aurorae/src/lib/auroraetheme.cpp
View file

@ -63,11 +63,11 @@ AuroraeThemePrivate::~AuroraeThemePrivate()
void AuroraeThemePrivate::initButtonFrame(AuroraeButtonType type)
{
QString file("aurorae/themes/" + themeName + '/' + AuroraeTheme::mapButtonToName(type) + ".svg");
QString file(QStringLiteral("aurorae/themes/") + themeName + QStringLiteral("/") + AuroraeTheme::mapButtonToName(type) + QStringLiteral(".svg"));
QString path = KGlobal::dirs()->findResource("data", file);
if (path.isEmpty()) {
// let's look for svgz
file.append("z");
file.append(QStringLiteral("z"));
path = KGlobal::dirs()->findResource("data", file);
}
if (!path.isEmpty()) {
@ -100,8 +100,8 @@ bool AuroraeTheme::isValid() const
void AuroraeTheme::loadTheme(const QString &name)
{
KConfig conf("auroraerc");
KConfig config("aurorae/themes/" + name + '/' + name + "rc", KConfig::FullConfig, "data");
KConfig conf(QStringLiteral("auroraerc"));
KConfig config(QStringLiteral("aurorae/themes/") + name + QStringLiteral("/") + name + QStringLiteral("rc"), KConfig::FullConfig, "data");
KConfigGroup themeGroup(&conf, name);
loadTheme(name, config);
setBorderSize((KDecorationDefines::BorderSize)themeGroup.readEntry<int>("BorderSize", KDecorationDefines::BorderNormal));
@ -111,10 +111,10 @@ void AuroraeTheme::loadTheme(const QString &name)
void AuroraeTheme::loadTheme(const QString &name, const KConfig &config)
{
d->themeName = name;
QString file("aurorae/themes/" + d->themeName + "/decoration.svg");
QString file(QStringLiteral("aurorae/themes/") + d->themeName + QStringLiteral("/decoration.svg"));
QString path = KGlobal::dirs()->findResource("data", file);
if (path.isEmpty()) {
file += 'z';
file += QStringLiteral("z");
path = KGlobal::dirs()->findResource("data", file);
}
if (path.isEmpty()) {
@ -407,7 +407,7 @@ QString AuroraeTheme::prototype ( ) const \
if (hasButton( buttonType )) { \
return d->pathes[ buttonType ]; \
} else { \
return ""; \
return QString(); \
} \
}\

10
clients/aurorae/src/lib/themeconfig.cpp
View file

@ -102,20 +102,20 @@ void ThemeConfig::load(const KConfig &conf)
m_haloActive = general.readEntry("HaloActive", defaultHaloActive());
m_haloInactive = general.readEntry("HaloInactive", defaultHaloInactive());
QString alignment = (general.readEntry("TitleAlignment", "Left")).toLower();
if (alignment == "left") {
if (alignment == QStringLiteral("left")) {
m_alignment = Qt::AlignLeft;
}
else if (alignment == "center") {
else if (alignment == QStringLiteral("center")) {
m_alignment = Qt::AlignCenter;
}
else {
m_alignment = Qt::AlignRight;
}
alignment = (general.readEntry("TitleVerticalAlignment", "Center")).toLower();
if (alignment == "top") {
if (alignment == QStringLiteral("top")) {
m_verticalAlignment = Qt::AlignTop;
}
else if (alignment == "center") {
else if (alignment == QStringLiteral("center")) {
m_verticalAlignment = Qt::AlignVCenter;
}
else {
@ -127,7 +127,7 @@ void ThemeConfig::load(const KConfig &conf)
m_shadow = general.readEntry("Shadow", defaultShadow());
m_decorationPosition = general.readEntry("DecorationPosition", defaultDecorationPosition());
KConfigGroup border(&conf, "Layout");
KConfigGroup border(&conf, QStringLiteral("Layout"));
// default values taken from KCommonDecoration::layoutMetric() in kcommondecoration.cpp
m_borderLeft = border.readEntry("BorderLeft", defaultBorderLeft());
m_borderRight = border.readEntry("BorderRight", defaultBorderRight());

26
clients/aurorae/themes/plastik/code/plastikbutton.cpp
View file

@ -37,7 +37,7 @@ QPixmap PlastikButtonProvider::requestPixmap(const QString &id, QSize *size, con
if (size) {
*size = QSize(origSize, origSize);
}
QStringList idParts = id.split('/');
QStringList idParts = id.split(QStringLiteral("/"));
if (idParts.isEmpty()) {
// incorrect id
return QDeclarativeImageProvider::requestPixmap(id, size, requestedSize);
@ -45,53 +45,53 @@ QPixmap PlastikButtonProvider::requestPixmap(const QString &id, QSize *size, con
bool active = false;
bool toggled = false;
bool shadow = false;
if (idParts.length() > 1 && idParts.at(1) == "true") {
if (idParts.length() > 1 && idParts.at(1) == QStringLiteral("true")) {
active = true;
}
if (idParts.length() > 2 && idParts.at(2) == "true") {
if (idParts.length() > 2 && idParts.at(2) == QStringLiteral("true")) {
toggled = true;
}
if (idParts.length() > 3 && idParts.at(3) == "true") {
if (idParts.length() > 3 && idParts.at(3) == QStringLiteral("true")) {
shadow = true;
}
ButtonIcon button;
if (idParts[0] == "X") {
if (idParts[0] == QStringLiteral("X")) {
button = CloseIcon;
} else if (idParts[0] == "A") {
} else if (idParts[0] == QStringLiteral("A")) {
if (toggled) {
button = MaxRestoreIcon;
} else {
button = MaxIcon;
}
} else if (idParts[0] == "I") {
} else if (idParts[0] == QStringLiteral("I")) {
button = MinIcon;
} else if (idParts[0] == "H") {
} else if (idParts[0] == QStringLiteral("H")) {
button = HelpIcon;
} else if (idParts[0] == "S") {
} else if (idParts[0] == QStringLiteral("S")) {
if (toggled) {
button = NotOnAllDesktopsIcon;
} else {
button = OnAllDesktopsIcon;
}
} else if (idParts[0] == "F") {
} else if (idParts[0] == QStringLiteral("F")) {
if (toggled) {
button = NoKeepAboveIcon;
} else {
button = KeepAboveIcon;
}
} else if (idParts[0] == "B") {
} else if (idParts[0] == QStringLiteral("B")) {
if (toggled) {
button = NoKeepBelowIcon;
} else {
button = KeepBelowIcon;
}
} else if (idParts[0] == "L") {
} else if (idParts[0] == QStringLiteral("L")) {
if (toggled) {
button = UnShadeIcon;
} else {
button = ShadeIcon;
}
} else if (idParts[0] == "N") {
} else if (idParts[0] == QStringLiteral("N")) {
button = AppMenuIcon;
} else {
// not recognized icon