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

List:       kde-commits
Subject:    koffice/libs/kofficecore
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2006-03-28 11:41:56
Message-ID: 1143546116.154850.17705.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 523493 by nikolaus:

- QImageIO -> QImageReader
- KConfigGroupSaver -> KConfigGroup
- move file static compareMap() to KoGenStyle.cpp


 M  +1 -1      KoDocumentInfoDlg.cpp  
 M  +14 -0     KoGenStyle.cpp  
 M  +0 -1      KoGenStyle.h  
 M  +0 -14     KoGenStyles.cpp  
 M  +2 -1      KoPictureImage.cpp  
 M  +3 -2      KoPictureShared.cpp  


--- trunk/koffice/libs/kofficecore/KoDocumentInfoDlg.cpp #523492:523493
@@ -350,7 +350,7 @@
   authorInfo->setPosition( d->m_authorWidget->leAuthorPosition->text() );
 
   KConfig* config = KoGlobal::kofficeConfig();
-  KConfigGroupSaver cgs( config, "Author" );
+  KConfigGroup cgs( config, "Author" );
   config->writeEntry("telephone", d->m_authorWidget->leTelephoneHome->text());
   config->writeEntry("telephone-work", d->m_authorWidget->leTelephoneWork->text());
   config->writeEntry("fax", d->m_authorWidget->leFax->text());
--- trunk/koffice/libs/kofficecore/KoGenStyle.cpp #523492:523493
@@ -256,3 +256,17 @@
     }
     return true;
 }
+
+// Returns -1, 0 (equal) or 1
+static int compareMap( const QMap<QString, QString>& map1, const QMap<QString, QString>& map2 )
+{
+  QMap<QString, QString>::const_iterator it = map1.begin();
+  QMap<QString, QString>::const_iterator oit = map2.begin();
+  for ( ; it != map1.end(); ++it, ++oit ) { // both maps have been checked for size already
+    if ( it.key() != oit.key() )
+      return it.key() < oit.key() ? -1 : +1;
+    if ( it.data() != oit.data() )
+      return it.data() < oit.data() ? -1 : +1;
+  }
+  return 0; // equal
+}
--- trunk/koffice/libs/kofficecore/KoGenStyle.h #523492:523493
@@ -24,7 +24,6 @@
 #include <Q3CString>
 #include <QString>
 #include <koffice_export.h>
-class KoGenStyles;
 
 class KoGenStyles;
 class KoXmlWriter;
--- trunk/koffice/libs/kofficecore/KoGenStyles.cpp #523492:523493
@@ -157,17 +157,3 @@
     }
 }
 
-// Returns -1, 0 (equal) or 1
-static int compareMap( const QMap<QString, QString>& map1, const QMap<QString, QString>& map2 )
-{
-    QMap<QString, QString>::const_iterator it = map1.begin();
-    QMap<QString, QString>::const_iterator oit = map2.begin();
-    for ( ; it != map1.end(); ++it, ++oit ) { // both maps have been checked for size already
-        if ( it.key() != oit.key() )
-            return it.key() < oit.key() ? -1 : +1;
-        if ( it.data() != oit.data() )
-            return it.data() < oit.data() ? -1 : +1;
-    }
-    return 0; // equal
-}
-
--- trunk/koffice/libs/kofficecore/KoPictureImage.cpp #523492:523493
@@ -27,6 +27,7 @@
 #include <qbuffer.h>
 #include <qpainter.h>
 #include <qimage.h>
+#include <qimagereader.h>
 #include <qpixmap.h>
 #include <qapplication.h>
 #include <q3dragobject.h>
@@ -131,7 +132,7 @@
     // Second, create the original image
     QBuffer buffer(m_rawData);
     buffer.open(QIODevice::ReadWrite);
-    QImageIO imageIO(&buffer,NULL);
+    QImageReader imageIO(&buffer,NULL);
 
     if (!imageIO.read())
     {
--- trunk/koffice/libs/kofficecore/KoPictureShared.cpp #523492:523493
@@ -18,8 +18,9 @@
  * Boston, MA 02110-1301, USA.
 */
 
+#include <qfile.h>
+#include <qimagereader.h>
 #include <qpainter.h>
-#include <qfile.h>
 //Added by qt3to4:
 #include <QPixmap>
 #include <Q3CString>
@@ -239,7 +240,7 @@
             return false;
         }
 
-        QImageIO imageIO(&buf,NULL);
+        QImageReader imageIO(&buf,NULL);
 
         if (!imageIO.read())
         {
[prev in list] [next in list] [prev in thread] [next in thread]