Initial import of Trinity 3.5.11 to kdebase

Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 6 insertions, 6 deletions

diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 8cb1cbafc..c50c89bc9 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -331,7 +331,7 @@ bool FontAASettings::load( bool useDefaults )
     kglobals.setReadDefaults( useDefaults );
 
     kglobals.setGroup("General");
-    hStyle=KXftConfig::Hint::Medium;
+    hStyle=KXftConfig::Hint::Full;
     xft.setHintStyle(hStyle);
     xft.apply();  // Save this setting
     kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
@@ -449,7 +449,7 @@ KXftConfig::Hint::Style FontAASettings::getHintStyle()
     if(hintingStyle->currentText()==KXftConfig::description((KXftConfig::Hint::Style)s))
       return (KXftConfig::Hint::Style)s;
 
-  return KXftConfig::Hint::Medium;
+  return KXftConfig::Hint::Full;
 }
 #endif
 
@@ -527,13 +527,13 @@ KFonts::KFonts(QWidget *parent, const char *name, const QStringList &)
   QFont f0("Sans Serif", 10);
   QFont f1("Monospace", 10);
   QFont f2("Sans Serif", 10);
-  QFont f3("Sans Serif", 9, QFont::Bold);
+  QFont f3("Sans Serif", 10, QFont::Bold);
   QFont f4("Sans Serif", 10);
 
   f0.setPointSize(10);
   f1.setPointSize(10);
   f2.setPointSize(10);
-  f3.setPointSize(9);
+  f3.setPointSize(10);
   f4.setPointSize(10);
 
   defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp
index 833e31118..22621f5e6 100644
--- a/kcontrol/fonts/kxftconfig.cpp
+++ b/kcontrol/fonts/kxftconfig.cpp
@@ -1147,7 +1147,7 @@ void KXftConfig::readContents()
             if(*ptr=='\"')
             {
                 ptr++;
-                if(NULL!=(eostr=strchr(ptr, '\"')) && eostr-ptr<constMaxDataLen)
+                if(NULL!=(eostr=(char*)strchr(ptr, '\"')) && eostr-ptr<constMaxDataLen)
                 {
                     memcpy(data, ptr, eostr-ptr);
                     data[eostr-ptr]='\0';
@@ -1183,7 +1183,7 @@ void KXftConfig::readContents()
                     if(*ptr=='\"')
                     {
                         ptr++;
-                        if(NULL!=(eostr=strchr(ptr, '\"')) && eostr-ptr<constMaxDataLen)
+                        if(NULL!=(eostr=(char*)strchr(ptr, '\"')) && eostr-ptr<constMaxDataLen)
                         {
                             memcpy(data, ptr, eostr-ptr);
                             data[eostr-ptr]='\0';