[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-09-04 18:23:30
Message-ID: 1125858210.378502.6351.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 457102 by mlaurent:
qt3to4
M +6 -4 kabcresourceslox.cpp
M +2 -0 kabcresourcesloxconfig.cpp
M +7 -5 kcalresourceslox.cpp
M +1 -1 kcalresourceslox.h
M +2 -0 kcalresourcesloxconfig.cpp
M +4 -2 sloxaccounts.cpp
M +1 -1 sloxfolderdialog.cpp
M +4 -2 sloxfoldermanager.cpp
M +8 -5 webdavhandler.cpp
M +2 -2 webdavhandler.h
--- trunk/KDE/kdepim/kresources/slox/kabcresourceslox.cpp #457101:457102
@@ -20,6 +20,8 @@
*/
#include <qapplication.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <kabc/picture.h>
#include <kconfig.h>
@@ -234,11 +236,11 @@
mWebdavHandler.log( doc.toString( 2 ) );
- QValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+ Q3ValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
bool changed = false;
- QValueList<SloxItem>::ConstIterator it;
+ Q3ValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
QString uid = "kresources_slox_kabc_" + item.sloxId;
@@ -299,9 +301,9 @@
kdDebug() << k_funcinfo << "Upload result: " << endl;
kdDebug() << doc.toString() << endl;
- QValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+ Q3ValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
- QValueList<SloxItem>::ConstIterator it;
+ Q3ValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
if ( !item.response.contains( "200" ) ) {
--- trunk/KDE/kdepim/kresources/slox/kabcresourcesloxconfig.cpp #457101:457102
@@ -36,6 +36,8 @@
#include <qcheckbox.h>
#include <qlabel.h>
#include <qlayout.h>
+//Added by qt3to4:
+#include <QGridLayout>
using namespace KABC;
--- trunk/KDE/kdepim/kresources/slox/kcalresourceslox.cpp #457101:457102
@@ -24,8 +24,10 @@
#include <qdatetime.h>
#include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
#include <qfile.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <kdebug.h>
#include <kurl.h>
@@ -909,13 +911,13 @@
mWebdavHandler.log( doc.toString( 2 ) );
- QValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+ Q3ValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
bool changed = false;
disableChangeNotification();
- QValueList<SloxItem>::ConstIterator it;
+ Q3ValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
QString uid = sloxIdToTodoUid( item.sloxId );
@@ -983,13 +985,13 @@
mWebdavHandler.log( doc.toString( 2 ) );
- QValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+ Q3ValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
bool changed = false;
disableChangeNotification();
- QValueList<SloxItem>::ConstIterator it;
+ Q3ValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
QString uid = sloxIdToEventUid( item.sloxId );
--- trunk/KDE/kdepim/kresources/slox/kcalresourceslox.h #457101:457102
@@ -23,7 +23,7 @@
#include "sloxbase.h"
#include "webdavhandler.h"
-#include <qptrlist.h>
+#include <q3ptrlist.h>
#include <qstring.h>
#include <qdatetime.h>
#include <qdom.h>
--- trunk/KDE/kdepim/kresources/slox/kcalresourcesloxconfig.cpp #457101:457102
@@ -23,6 +23,8 @@
#include <qlabel.h>
#include <qlayout.h>
#include <qcheckbox.h>
+//Added by qt3to4:
+#include <QGridLayout>
#include <klocale.h>
#include <kdebug.h>
--- trunk/KDE/kdepim/kresources/slox/sloxaccounts.cpp #457101:457102
@@ -36,6 +36,8 @@
#include <qfile.h>
#include <qdom.h>
#include <qstring.h>
+//Added by qt3to4:
+#include <QTextStream>
SloxAccounts::SloxAccounts( SloxBase *res, const KURL &baseUrl )
: mBaseUrl( baseUrl ), mRes( res )
@@ -152,7 +154,7 @@
} else {
if ( mRes->resType() == "ox" ) {
QFile f( cacheFile() );
- if ( !f.open( IO_WriteOnly ) ) {
+ if ( !f.open( QIODevice::WriteOnly ) ) {
kdWarning() << "Unable to open '" << cacheFile() << "'" << endl;
return;
}
@@ -182,7 +184,7 @@
kdDebug() << "SloxAccounts::readAccounts()" << endl;
QFile f( cacheFile() );
- if ( !f.open( IO_ReadOnly ) ) {
+ if ( !f.open( QIODevice::ReadOnly ) ) {
kdDebug() << "Unable to open '" << cacheFile() << "'" << endl;
requestAccounts();
return;
--- trunk/KDE/kdepim/kresources/slox/sloxfolderdialog.cpp #457101:457102
@@ -101,7 +101,7 @@
QString SloxFolderDialog::selectedFolder() const
{
- QListViewItem *item = mListView->selectedItem();
+ Q3ListViewItem *item = mListView->selectedItem();
if ( item )
return item->text( 1 );
return "-1"; // OX default folder
--- trunk/KDE/kdepim/kresources/slox/sloxfoldermanager.cpp #457101:457102
@@ -20,6 +20,8 @@
#include <qfile.h>
#include <qdom.h>
#include <qstring.h>
+//Added by qt3to4:
+#include <QTextStream>
#include <kdebug.h>
#include <kio/job.h>
@@ -92,7 +94,7 @@
} else {
kdDebug() << k_funcinfo << " success, writing to " << cacheFile() << endl;
QFile f( cacheFile() );
- if ( !f.open( IO_WriteOnly ) ) {
+ if ( !f.open( QIODevice::WriteOnly ) ) {
kdDebug() << "Unable to open '" << cacheFile() << "'" << endl;
return;
}
@@ -122,7 +124,7 @@
kdDebug() << k_funcinfo << endl;
QFile f( cacheFile() );
- if ( !f.open( IO_ReadOnly ) ) {
+ if ( !f.open( QIODevice::ReadOnly ) ) {
kdDebug() << "Unable to open '" << cacheFile() << "'" << endl;
requestFolders();
return;
--- trunk/KDE/kdepim/kresources/slox/webdavhandler.cpp #457101:457102
@@ -39,6 +39,9 @@
#include <kconfig.h>
#include <qfile.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3CString>
SloxItem::SloxItem()
: status( Invalid )
@@ -73,22 +76,22 @@
QString filename = mLogFile + "-" + QString::number( mLogCount );
QFile file( filename );
- if ( !file.open( IO_WriteOnly ) ) {
+ if ( !file.open( QIODevice::WriteOnly ) ) {
kdWarning() << "Unable to open log file '" << filename << "'" << endl;
return;
}
- QCString textUtf8 = text.utf8();
+ Q3CString textUtf8 = text.utf8();
file.writeBlock( textUtf8.data(), textUtf8.size() - 1 );
if ( ++mLogCount > 5 ) mLogCount = 0;
}
-QValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const QDomDocument \
&doc ) +Q3ValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const \
QDomDocument &doc ) {
kdDebug() << "getSloxItems" << endl;
- QValueList<SloxItem> items;
+ Q3ValueList<SloxItem> items;
QDomElement docElement = doc.documentElement();
@@ -174,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
- QCString origTz = getenv("TZ");
+ Q3CString origTz = getenv("TZ");
setenv( "TZ", "UTC", 1 );
uint ticks = utc.toTime_t();
if ( origTz.isNull() )
--- trunk/KDE/kdepim/kresources/slox/webdavhandler.h #457101:457102
@@ -20,7 +20,7 @@
#ifndef WEBDAVHANDLER_H
#define WEBDAVHANDLER_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
#include <qstring.h>
#include <qdatetime.h>
#include <qdom.h>
@@ -76,7 +76,7 @@
static QString qDateTimeToSlox( const QDateTime &dt,
const QString &timeZoneId );
- static QValueList<SloxItem> getSloxItems( SloxBase *res, const QDomDocument &doc \
); + static Q3ValueList<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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic