[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/fonts
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-12-13 13:17:30
[Download RAW message or body]

CVS commit by mueller: 

compile fix (gcc 3.4+)


  M +5 -8      kxftconfig.cpp   1.26


--- kdebase/kcontrol/fonts/kxftconfig.cpp  #1.25:1.26
@@ -416,5 +416,5 @@ bool KXftConfig::reset()
         m_doc.appendChild(m_doc.createElement("fontconfig"));
 #else
-    std::ifstream f(QFile::encodeName(m_file));
+    QFile f( m_file );
 
     m_size=0;
@@ -426,10 +425,9 @@ bool KXftConfig::reset()
     }
 
-    if(f)
+    if(f.open( IO_Raw| IO_ReadOnly ))
     {
-        f.seekg(0, std::ios::end);
-        m_size=f.tellg();
-
+        m_size = f.size();
         ok=true;
+
         if(m_size>0)
         {
@@ -438,6 +436,5 @@ bool KXftConfig::reset()
             if(m_data)
             {
-                f.seekg(0, std::ios::beg);
-                f.read(m_data, m_size);
+                f.readBlock( m_data, m_size );
                 m_data[m_size]='\0';
                 readContents();


[prev in list] [next in list] [prev in thread] [next in thread]