Commit 8c2eb77d authored by Robert Knight's avatar Robert Knight
Browse files

Merge from trunk

svn path=/branches/work/konsole-split-view/; revision=636040
parent bca3b496
......@@ -176,13 +176,13 @@ ColorSchema::ColorSchema(KConfig& c)
m_title = c.readEntry("Title",i18n("[no title]"));
m_imagePath = c.readEntry("ImagePath");
m_alignment = c.readEntry("ImageAlignment", QVariant(1)).toInt();
m_useTransparency = c.readEntry("UseTransparency", QVariant(false)).toBool();
m_alignment = c.readEntry("ImageAlignment", int(1));
m_useTransparency = c.readEntry("UseTransparency", false);
m_tr_r = c.readEntry("TransparentR", QVariant(0)).toInt();
m_tr_g = c.readEntry("TransparentG", QVariant(0)).toInt();
m_tr_b = c.readEntry("TransparentB", QVariant(0)).toInt();
m_tr_x = c.readEntry("TransparentX", QVariant(0.0)).toDouble();
m_tr_r = c.readEntry("TransparentR", int(0));
m_tr_g = c.readEntry("TransparentG", int(0));
m_tr_b = c.readEntry("TransparentB", int(0));
m_tr_x = c.readEntry("TransparentX", double(0.0));
for (int i=0; i < TABLE_COLORS; i++)
{
......@@ -266,8 +266,8 @@ void ColorSchema::readConfigColor(KConfig& c,
QVariant v_color = configGroup.readEntry("Color");
e.color = v_color.value<QColor>();
e.transparent = configGroup.readEntry("Transparent", QVariant(false)).toBool();
e.bold = configGroup.readEntry("Bold", QVariant(false)).toBool();
e.transparent = configGroup.readEntry("Transparent", false);
e.bold = configGroup.readEntry("Bold", false);
}
......@@ -275,7 +275,7 @@ void ColorSchema::writeConfig(const QString& path) const
{
// KONSOLEDEBUG << "Writing schema " << relPath << " to file " << path << endl;
KConfig c(path,false,false);
KConfig c( path, KConfig::NoGlobals );
c.setGroup("SchemaGeneral");
c.writeEntry("Title",m_title);
......@@ -546,7 +546,8 @@ bool ColorSchemaList::updateAllSchemaTimes(const QDateTime& now)
{
// KONSOLEDEBUG << "Updating time stamps" << endl;
QStringList list = KGlobal::dirs()->findAllResources("data", "konsole/*.schema");
QStringList list;
KGlobal::dirs()->findAllResources("data", "konsole/*.schema", KStandardDirs::NoDuplicates, list);
QStringList::ConstIterator it;
bool r = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment