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

List:       kde-commits
Subject:    KDE/kdepim/kresources/slox
From:       Laurent Montel <montel () kde ! org>
Date:       2005-11-24 17:59:24
Message-ID: 1132855164.164588.14333.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 482997 by mlaurent:

qt3support--

 M  +4 -6      kabcresourceslox.cpp  
 M  +4 -6      kcalresourceslox.cpp  
 M  +1 -1      sloxaccounts.cpp  
 M  +3 -6      webdavhandler.cpp  
 M  +1 -1      webdavhandler.h  


--- trunk/KDE/kdepim/kresources/slox/kabcresourceslox.cpp #482996:482997
@@ -20,8 +20,6 @@
 */
 
 #include <qapplication.h>
-//Added by qt3to4:
-#include <Q3ValueList>
 
 #include <kabc/picture.h>
 #include <kconfig.h>
@@ -236,11 +234,11 @@
 
     mWebdavHandler.log( doc.toString( 2 ) );
 
-    Q3ValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+    QList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
 
     bool changed = false;
 
-    Q3ValueList<SloxItem>::ConstIterator it;
+    QList<SloxItem>::ConstIterator it;
     for( it = items.begin(); it != items.end(); ++it ) {
       SloxItem item = *it;
       QString uid = "kresources_slox_kabc_" + item.sloxId;
@@ -301,9 +299,9 @@
     kdDebug() << k_funcinfo << "Upload result: " << endl;
     kdDebug() << doc.toString() << endl;
 
-    Q3ValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+    QList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
 
-    Q3ValueList<SloxItem>::ConstIterator it;
+    QList<SloxItem>::ConstIterator it;
     for( it = items.begin(); it != items.end(); ++it ) {
       SloxItem item = *it;
       if ( !item.response.contains( "200" ) ) {
--- trunk/KDE/kdepim/kresources/slox/kcalresourceslox.cpp #482996:482997
@@ -26,8 +26,6 @@
 #include <qstring.h>
 #include <q3ptrlist.h>
 #include <qfile.h>
-//Added by qt3to4:
-#include <Q3ValueList>
 
 #include <kdebug.h>
 #include <kurl.h>
@@ -918,13 +916,13 @@
 
     mWebdavHandler.log( doc.toString( 2 ) );
 
-    Q3ValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+    QList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
 
     bool changed = false;
 
     disableChangeNotification();
 
-    Q3ValueList<SloxItem>::ConstIterator it;
+    QList<SloxItem>::ConstIterator it;
     for( it = items.begin(); it != items.end(); ++it ) {
       SloxItem item = *it;
       QString uid = sloxIdToTodoUid( item.sloxId );
@@ -992,13 +990,13 @@
 
     mWebdavHandler.log( doc.toString( 2 ) );
 
-    Q3ValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+    QList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
 
     bool changed = false;
 
     disableChangeNotification();
 
-    Q3ValueList<SloxItem>::ConstIterator it;
+    QList<SloxItem>::ConstIterator it;
     for( it = items.begin(); it != items.end(); ++it ) {
       SloxItem item = *it;
       QString uid = sloxIdToEventUid( item.sloxId );
--- trunk/KDE/kdepim/kresources/slox/sloxaccounts.cpp #482996:482997
@@ -200,7 +200,7 @@
   mUsers.clear();
 
   QDomNodeList nodes = doc.elementsByTagName( mRes->resType() == "ox" ? "ox:user" : \
                "user" );
-  for( uint i = 0; i < nodes.count(); ++i ) {
+  for( int i = 0; i < nodes.count(); ++i ) {
     QDomElement element = nodes.item(i).toElement();
     QString id;
     KABC::Addressee a;
--- trunk/KDE/kdepim/kresources/slox/webdavhandler.cpp #482996:482997
@@ -42,9 +42,6 @@
 #include <kconfig.h>
 
 #include <qfile.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-#include <Q3CString>
 
 SloxItem::SloxItem()
   : status( Invalid )
@@ -90,11 +87,11 @@
   if ( ++mLogCount > 5 ) mLogCount = 0;
 }
 
-Q3ValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const QDomDocument \
&doc ) +QList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const \
QDomDocument &doc )  {
   kdDebug() << "getSloxItems" << endl;
 
-  Q3ValueList<SloxItem> items;
+  QList<SloxItem> items;
 
   QDomElement docElement = doc.documentElement();
 
@@ -180,7 +177,7 @@
   // secsTo and toTime_t etc also perform a timezone conversion using the system \
timezone,  // but we want to use the calendar timezone, so we have to convert ourself \
and spoof the tz to UTC before  // converting to ticks to prevent this
-  Q3CString origTz = getenv("TZ");
+  QByteArray origTz = getenv("TZ");
   setenv( "TZ", "UTC", 1 );
   uint ticks = utc.toTime_t();
   if ( origTz.isNull() )
--- trunk/KDE/kdepim/kresources/slox/webdavhandler.h #482996:482997
@@ -76,7 +76,7 @@
     static QString qDateTimeToSlox( const QDateTime &dt,
                                     const QString &timeZoneId );
 
-    static Q3ValueList<SloxItem> getSloxItems( SloxBase *res, const QDomDocument \
&doc ); +    static QList<SloxItem> getSloxItems( SloxBase *res, const QDomDocument \
&doc );  
     void clearSloxAttributeStatus();
     void parseSloxAttribute( const QDomElement & );


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