summaryrefslogtreecommitdiffabout
path: root/kabc
authorMichael Krelin <hacker@klever.net>2007-07-04 11:23:42 (UTC)
committer Michael Krelin <hacker@klever.net>2007-07-04 11:23:42 (UTC)
commita08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (side-by-side diff)
tree8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kabc
parent11edc920afe4f274c0964436633aa632c8288a40 (diff)
downloadkdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip
kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz
kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2
initial public commit of qt4 portp1
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/address.h6
-rw-r--r--kabc/addressbook.cpp30
-rw-r--r--kabc/addressbook.h4
-rw-r--r--kabc/addressee.cpp2
-rw-r--r--kabc/addressee.h4
-rw-r--r--kabc/addresseedialog.cpp51
-rw-r--r--kabc/addresseedialog.h18
-rw-r--r--kabc/addresseelist.cpp12
-rw-r--r--kabc/addresseelist.h6
-rw-r--r--kabc/addresseeview.cpp47
-rw-r--r--kabc/addresseeview.h4
-rw-r--r--kabc/distributionlist.cpp6
-rw-r--r--kabc/distributionlist.h7
-rw-r--r--kabc/distributionlistdialog.cpp36
-rw-r--r--kabc/distributionlistdialog.h12
-rw-r--r--kabc/distributionlisteditor.cpp30
-rw-r--r--kabc/distributionlisteditor.h10
-rw-r--r--kabc/field.cpp10
-rw-r--r--kabc/field.h4
-rw-r--r--kabc/formatfactory.cpp2
-rw-r--r--kabc/formatfactory.h4
-rw-r--r--kabc/formats/binary/kabcformat_binaryE.pro2
-rw-r--r--kabc/formats/vcardformatplugin2.cpp20
-rw-r--r--kabc/kabc.pro8
-rw-r--r--kabc/kabcE.pro8
-rw-r--r--kabc/key.h6
-rw-r--r--kabc/phonenumber.h6
-rw-r--r--kabc/picture.cpp2
-rw-r--r--kabc/picture.h2
-rw-r--r--kabc/plugins/dir/dir.pro14
-rw-r--r--kabc/plugins/dir/dirE.pro4
-rw-r--r--kabc/plugins/dir/resourcedir.cpp8
-rw-r--r--kabc/plugins/dir/resourcedirconfig.cpp4
-rw-r--r--kabc/plugins/file/file.pro14
-rw-r--r--kabc/plugins/file/fileE.pro4
-rw-r--r--kabc/plugins/file/resourcefile.cpp10
-rw-r--r--kabc/plugins/file/resourcefileconfig.cpp4
-rw-r--r--kabc/plugins/ldap/ldapE.pro4
-rw-r--r--kabc/plugins/olaccess/olaccess.pro8
-rw-r--r--kabc/plugins/opie/opieE.pro6
-rw-r--r--kabc/plugins/qtopia/qtopia.pro16
-rw-r--r--kabc/plugins/qtopia/qtopiaE.pro6
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.cpp24
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.h9
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp14
-rw-r--r--kabc/plugins/qtopia/resourceqtopiaconfig.cpp4
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmE.pro8
-rw-r--r--kabc/secrecy.h4
-rw-r--r--kabc/sound.h2
-rw-r--r--kabc/tmpaddressbook.cpp2
-rw-r--r--kabc/vcard/AdrParam.cpp10
-rw-r--r--kabc/vcard/AdrValue.cpp9
-rw-r--r--kabc/vcard/AgentParam.cpp6
-rw-r--r--kabc/vcard/AgentValue.cpp6
-rw-r--r--kabc/vcard/ClassValue.cpp6
-rw-r--r--kabc/vcard/ContentLine.cpp36
-rw-r--r--kabc/vcard/DateParam.cpp6
-rw-r--r--kabc/vcard/DateValue.cpp30
-rw-r--r--kabc/vcard/EmailParam.cpp6
-rw-r--r--kabc/vcard/Entity.cpp12
-rw-r--r--kabc/vcard/Enum.cpp8
-rw-r--r--kabc/vcard/FloatValue.cpp8
-rw-r--r--kabc/vcard/GeoValue.cpp6
-rw-r--r--kabc/vcard/ImageParam.cpp6
-rw-r--r--kabc/vcard/ImageValue.cpp6
-rw-r--r--kabc/vcard/ImgValue.cpp6
-rw-r--r--kabc/vcard/LangValue.cpp24
-rw-r--r--kabc/vcard/NValue.cpp10
-rw-r--r--kabc/vcard/OrgValue.cpp10
-rw-r--r--kabc/vcard/Param.cpp16
-rw-r--r--kabc/vcard/PhoneNumberValue.cpp6
-rw-r--r--kabc/vcard/RToken.cpp6
-rw-r--r--kabc/vcard/SoundValue.cpp6
-rw-r--r--kabc/vcard/SourceParam.cpp6
-rw-r--r--kabc/vcard/TelParam.cpp6
-rw-r--r--kabc/vcard/TelValue.cpp6
-rw-r--r--kabc/vcard/TextBinParam.cpp6
-rw-r--r--kabc/vcard/TextBinValue.cpp6
-rw-r--r--kabc/vcard/TextListValue.cpp10
-rw-r--r--kabc/vcard/TextParam.cpp6
-rw-r--r--kabc/vcard/TextValue.cpp8
-rw-r--r--kabc/vcard/URIValue.cpp16
-rw-r--r--kabc/vcard/UTCValue.cpp6
-rw-r--r--kabc/vcard/VCardEntity.cpp12
-rw-r--r--kabc/vcard/VCardv.cpp33
-rw-r--r--kabc/vcard/Value.cpp6
-rw-r--r--kabc/vcard/include/VCardAdrParam.h16
-rw-r--r--kabc/vcard/include/VCardAdrValue.h46
-rw-r--r--kabc/vcard/include/VCardAgentParam.h4
-rw-r--r--kabc/vcard/include/VCardAgentValue.h2
-rw-r--r--kabc/vcard/include/VCardClassValue.h2
-rw-r--r--kabc/vcard/include/VCardContentLine.h18
-rw-r--r--kabc/vcard/include/VCardDateParam.h2
-rw-r--r--kabc/vcard/include/VCardDateValue.h2
-rw-r--r--kabc/vcard/include/VCardDefines.h6
-rw-r--r--kabc/vcard/include/VCardEmailParam.h8
-rw-r--r--kabc/vcard/include/VCardEntity.h14
-rw-r--r--kabc/vcard/include/VCardEnum.h8
-rw-r--r--kabc/vcard/include/VCardFloatValue.h2
-rw-r--r--kabc/vcard/include/VCardImageParam.h2
-rw-r--r--kabc/vcard/include/VCardImageValue.h2
-rw-r--r--kabc/vcard/include/VCardLangValue.h16
-rw-r--r--kabc/vcard/include/VCardNValue.h24
-rw-r--r--kabc/vcard/include/VCardOrgValue.h8
-rw-r--r--kabc/vcard/include/VCardParam.h22
-rw-r--r--kabc/vcard/include/VCardRToken.h4
-rw-r--r--kabc/vcard/include/VCardSoundValue.h2
-rw-r--r--kabc/vcard/include/VCardSourceParam.h12
-rw-r--r--kabc/vcard/include/VCardTelParam.h6
-rw-r--r--kabc/vcard/include/VCardTelValue.h2
-rw-r--r--kabc/vcard/include/VCardTextBinParam.h2
-rw-r--r--kabc/vcard/include/VCardTextBinValue.h2
-rw-r--r--kabc/vcard/include/VCardTextListValue.h8
-rw-r--r--kabc/vcard/include/VCardTextParam.h2
-rw-r--r--kabc/vcard/include/VCardURIValue.h16
-rw-r--r--kabc/vcard/include/VCardUTCValue.h2
-rw-r--r--kabc/vcard/include/VCardVCard.h18
-rw-r--r--kabc/vcard/include/VCardVCardEntity.h6
-rw-r--r--kabc/vcard/include/VCardValue.h6
-rw-r--r--kabc/vcard/include/generated/AdrParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/AdrValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/AgentParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/AgentValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/ClassValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/ContentLine-generated.h10
-rw-r--r--kabc/vcard/include/generated/DateParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/DateValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/EmailParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/FloatValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/GeoValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/Group-generated.h10
-rw-r--r--kabc/vcard/include/generated/ImageParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/ImageValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/ImgParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/ImgValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/LangValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/NValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/Name-generated.h10
-rw-r--r--kabc/vcard/include/generated/OrgValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/Param-generated.h10
-rw-r--r--kabc/vcard/include/generated/ParamName-generated.h10
-rw-r--r--kabc/vcard/include/generated/ParamValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/PhoneNumberValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/SoundValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/SourceParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/TelParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/TelValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/TextBinParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/TextBinValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/TextListValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/TextNSParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/TextParam-generated.h10
-rw-r--r--kabc/vcard/include/generated/TextValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/URIValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/UTCValue-generated.h10
-rw-r--r--kabc/vcard/include/generated/VCard-generated.h10
-rw-r--r--kabc/vcard/include/generated/VCardEntity-generated.h10
-rw-r--r--kabc/vcard/include/generated/Value-generated.h10
-rw-r--r--kabc/vcard/testread.cpp12
-rw-r--r--kabc/vcard/testwrite.cpp4
-rw-r--r--kabc/vcard21parser.cpp40
-rw-r--r--kabc/vcard21parser.h10
-rw-r--r--kabc/vcardformatimpl.cpp25
-rw-r--r--kabc/vcardformatplugin.cpp2
-rw-r--r--kabc/vcardparser/vcard.h4
-rw-r--r--kabc/vcardparser/vcardline.cpp6
-rw-r--r--kabc/vcardparser/vcardline.h8
-rw-r--r--kabc/vcardparser/vcardparser.cpp2
-rw-r--r--kabc/vcardparser/vcardtool.cpp2
169 files changed, 966 insertions, 731 deletions
diff --git a/kabc/address.h b/kabc/address.h
index 38ad20b..41794fe 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -32,7 +32,7 @@ $Id$
#include <qstring.h>
#include <qregexp.h>
#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
// template tags for address formatting localization
#define KABC_FMTTAG_realname QString("%n")
@@ -68,8 +68,8 @@ class Address
/**
List of addresses.
*/
- typedef QValueList<Address> List;
- typedef QValueList<int> TypeList;
+ typedef Q3ValueList<Address> List;
+ typedef Q3ValueList<int> TypeList;
/**
Address types:
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index fe59fcb..c700897 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -37,8 +37,8 @@ $Id$
#include "errorhandler.h"
*/
-#include <qptrlist.h>
-#include <qtextstream.h>
+#include <q3ptrlist.h>
+#include <q3textstream.h>
#include <qfile.h>
#include <qregexp.h>
@@ -244,7 +244,7 @@ void AddressBook::init(const QString &config, const QString &family )
blockLSEchange = false;
d = new AddressBookData;
QString fami = family;
- if (config != 0) {
+ if (!config.isEmpty()) {
if ( family == "syncContact" ) {
qDebug("creating sync config ");
fami = "contact";
@@ -381,13 +381,13 @@ void AddressBook::export2File( QString fileName, QString resourceName )
{
QFile outFile( fileName );
- if ( !outFile.open( IO_WriteOnly ) ) {
+ if ( !outFile.open( QIODevice::WriteOnly ) ) {
QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
KMessageBox::error( 0, text.arg( fileName ) );
return ;
}
- QTextStream t( &outFile );
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ Q3TextStream t( &outFile );
+ t.setEncoding( Q3TextStream::UnicodeUTF8 );
Iterator it;
KABC::VCardConverter::Version version;
version = KABC::VCardConverter::v3_0;
@@ -468,10 +468,10 @@ bool AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
}
QFile outFile(fileName);
- if ( outFile.open(IO_WriteOnly) ) {
+ if ( outFile.open(QIODevice::WriteOnly) ) {
datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
- QTextStream t( &outFile ); // use a text stream
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ Q3TextStream t( &outFile ); // use a text stream
+ t.setEncoding( Q3TextStream::UnicodeUTF8 );
t <<datastream;
t << "\r\n\r\n";
outFile.close();
@@ -490,7 +490,7 @@ int AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
setUntagged( true, resource );
KABC::Addressee::List list;
QFile file( fileName );
- file.open( IO_ReadOnly );
+ file.open( QIODevice::ReadOnly );
QByteArray rawData = file.readAll();
file.close();
QString data;
@@ -634,7 +634,7 @@ void AddressBook::findNewExtIds( QString fileName, QString currentSyncDevice )
setUntagged();
KABC::Addressee::List list;
QFile file( fileName );
- file.open( IO_ReadOnly );
+ file.open( QIODevice::ReadOnly );
QByteArray rawData = file.readAll();
file.close();
QString data;
@@ -1218,9 +1218,9 @@ bool AddressBook::addResource( Resource *resource )
void AddressBook::removeResources()
{
//remove all possible resources. This should cleanup the configfile.
- QPtrList<KABC::Resource> mResources = resources();
+ Q3PtrList<KABC::Resource> mResources = resources();
- QPtrListIterator<KABC::Resource> it(mResources);
+ Q3PtrListIterator<KABC::Resource> it(mResources);
for ( ; it.current(); ++it ) {
KABC::Resource *res = it.current();
removeResource(res);
@@ -1240,9 +1240,9 @@ bool AddressBook::removeResource( Resource *resource )
return true;
}
-QPtrList<Resource> AddressBook::resources()
+Q3PtrList<Resource> AddressBook::resources()
{
- QPtrList<Resource> list;
+ Q3PtrList<Resource> list;
// qDebug("AddressBook::resources() 1");
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index a8a9fc1..56fce4d 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -31,7 +31,7 @@ $Id$
#include <qobject.h>
#include <kresources/manager.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
#include "addressee.h"
#include "field.h"
@@ -280,7 +280,7 @@ class AddressBook : public QObject
/**
Return pointer list of all resources.
*/
- QPtrList<Resource> resources();
+ Q3PtrList<Resource> resources();
/**
Set the @p ErrorHandler, that is used by @ref error() to
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index e8e440c..9994e29 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -391,7 +391,7 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
if ( mData->formattedName.isEmpty() ) mData->formattedName = ad.mData->formattedName;
if ( mData->familyName.isEmpty() ) mData->familyName = ad.mData->familyName;
if ( mData->givenName.isEmpty() ) mData->givenName = ad.mData->givenName ;
- if ( mData->additionalName ) mData->additionalName = ad.mData->additionalName;
+ if ( mData->additionalName.isEmpty() ) mData->additionalName = ad.mData->additionalName;
if ( mData->prefix.isEmpty() ) mData->prefix = ad.mData->prefix;
if ( mData->suffix.isEmpty() ) mData->suffix = ad.mData->suffix;
if ( mData->title .isEmpty() ) mData->title = ad.mData->title ;
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 0ea1803..30dcd5d 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -33,7 +33,7 @@ $Id$
#include <qstring.h>
#include <qregexp.h>
#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
#include <ksharedptr.h>
#include <kurl.h>
@@ -84,7 +84,7 @@ class Addressee
friend QDataStream &operator>>( QDataStream &, Addressee & );
public:
- typedef QValueList<Addressee> List;
+ typedef Q3ValueList<Addressee> List;
/**
Construct an empty address book entry.
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 671787e..bda1b9e 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -20,11 +20,14 @@
#include <qlayout.h>
#include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
#include <qapplication.h>
#include <qregexp.h>
-#include <qvbox.h>
+#include <q3vbox.h>
#include <qlabel.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
#include <klocale.h>
#include <kdebug.h>
@@ -38,8 +41,8 @@
using namespace KABC;
-AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
- QListViewItem( parent ),
+AddresseeItem::AddresseeItem( Q3ListView *parent, const Addressee &addressee ) :
+ Q3ListViewItem( parent ),
mAddressee( addressee )
{
setText( Name,addressee.realName());
@@ -71,7 +74,7 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
QWidget *listWidget = new QWidget( mMiniSplitter );
- QVBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
+ Q3VBoxLayout *listLayout = new Q3VBoxLayout (listWidget) ;
//topLayout->addLayout( listLayout );
mAddresseeList = new KListView( listWidget );
@@ -81,10 +84,10 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
mAddresseeList->setAllColumnsShowFocus( true );
mAddresseeList->setFullWidth( true );
listLayout->addWidget( mAddresseeList );
- connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
+ connect( mAddresseeList, SIGNAL( doubleClicked( Q3ListViewItem * ) ),
SLOT( slotOk() ) );
//QHBox* searchBox = new QHBox ( listWidget );
- QHBox * hb = new QHBox ( listWidget );
+ Q3HBox * hb = new Q3HBox ( listWidget );
listLayout->addWidget ( hb );
mAddresseeEdit = new QLineEdit( hb );
connect( mAddresseeEdit, SIGNAL( returnPressed() ),
@@ -101,9 +104,9 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
mSelectedList->setFullWidth( true );
//connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
// SLOT( removeSelected() ) );
- connect( mSelectedList, SIGNAL( clicked( QListViewItem * ) ),
+ connect( mSelectedList, SIGNAL( clicked( Q3ListViewItem * ) ),
SLOT( removeSelected() ) );
- connect( mSelectedList, SIGNAL( returnPressed( QListViewItem *) ),
+ connect( mSelectedList, SIGNAL( returnPressed( Q3ListViewItem *) ),
SLOT( removeSelected() ) );
#if 0
@@ -111,10 +114,10 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
#endif
- connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
- SLOT( addSelected( QListViewItem * ) ) );
- connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
- SLOT( selectNextItem( QListViewItem * ) ) );
+ connect( mAddresseeList, SIGNAL( clicked( Q3ListViewItem * ) ),
+ SLOT( addSelected( Q3ListViewItem * ) ) );
+ connect( mAddresseeList, SIGNAL( returnPressed( Q3ListViewItem * ) ),
+ SLOT( selectNextItem( Q3ListViewItem * ) ) );
}
@@ -126,7 +129,7 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
SLOT( addressBookChanged() ) );
#endif
loadAddressBook();
- QValueList<int> splitterSize;
+ Q3ValueList<int> splitterSize;
splitterSize.append( ( width() / 5 ) * 3 );
splitterSize.append( ( width() / 5 ) *2 );
mMiniSplitter->setSizes( splitterSize );
@@ -172,7 +175,7 @@ void AddresseeDialog::loadAddressBook()
}
}
-void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
+void AddresseeDialog::addCompletionItem( const QString &str, Q3ListViewItem *item )
{
if ( str.isEmpty() ) return;
@@ -184,7 +187,7 @@ void AddresseeDialog::selectItem( const QString &str )
{
if ( str.isEmpty() ) return;
- QListViewItem *item = mItemDict.find( str );
+ Q3ListViewItem *item = mItemDict.find( str );
if ( item ) {
mAddresseeList->blockSignals( true );
mAddresseeList->setSelected( item, true );
@@ -193,30 +196,30 @@ void AddresseeDialog::selectItem( const QString &str )
}
}
-void AddresseeDialog::updateEdit( QListViewItem *item )
+void AddresseeDialog::updateEdit( Q3ListViewItem *item )
{
mAddresseeEdit->setText( item->text( 0 ) );
mAddresseeEdit->setSelection( 0, item->text( 0 ).length() );
}
-void AddresseeDialog::selectNextItem( QListViewItem *item )
+void AddresseeDialog::selectNextItem( Q3ListViewItem *item )
{
addSelected( item );
- QListViewItem *next = item->nextSibling();
+ Q3ListViewItem *next = item->nextSibling();
if ( next ) {
next->setSelected( true );
item->setSelected( false );
mAddresseeList->setCurrentItem( next );
}
}
-void AddresseeDialog::addSelected( QListViewItem *item )
+void AddresseeDialog::addSelected( Q3ListViewItem *item )
{
AddresseeItem *addrItem = (AddresseeItem *)( item );
if ( !addrItem ) return;
Addressee a = addrItem->addressee();
- QListViewItem *selectedItem = mSelectedDict.find( a.uid() );
+ Q3ListViewItem *selectedItem = mSelectedDict.find( a.uid() );
if ( !selectedItem ) {
selectedItem = new AddresseeItem( mSelectedList, a );
mSelectedDict.insert( a.uid(), selectedItem );
@@ -226,10 +229,10 @@ void AddresseeDialog::addSelected( QListViewItem *item )
void AddresseeDialog::removeSelected()
{
- QListViewItem *item = mSelectedList->selectedItem();
+ Q3ListViewItem *item = mSelectedList->selectedItem();
AddresseeItem *addrItem = (AddresseeItem *)( item );
if ( !addrItem ) return;
- QListViewItem *next = item->nextSibling();
+ Q3ListViewItem *next = item->nextSibling();
mSelectedDict.remove( addrItem->addressee().uid() );
delete addrItem;
if ( next )
@@ -255,7 +258,7 @@ Addressee::List AddresseeDialog::addressees()
AddresseeItem *aItem = 0;
if ( mMultiple ) {
- QListViewItem *item = mSelectedList->firstChild();
+ Q3ListViewItem *item = mSelectedList->firstChild();
while( item ) {
aItem = (AddresseeItem *)( item );
if ( aItem ) al.append( aItem->addressee() );
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 6fab62d..be7bbb4 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -21,7 +21,7 @@
#ifndef KABC_ADDRESSEEDIALOG_H
#define KABC_ADDRESSEEDIALOG_H
-#include <qdict.h>
+#include <q3dict.h>
#include <kdialogbase.h>
#include <klineedit.h>
@@ -34,7 +34,7 @@ namespace KABC {
/**
@short Special ListViewItem, that is used by the AddresseeDialog.
*/
-class AddresseeItem : public QListViewItem
+class AddresseeItem : public Q3ListViewItem
{
public:
@@ -51,7 +51,7 @@ class AddresseeItem : public QListViewItem
@param parent The parent listview.
@param addressee The associated addressee.
*/
- AddresseeItem( QListView *parent, const Addressee &addressee );
+ AddresseeItem( Q3ListView *parent, const Addressee &addressee );
/**
Returns the addressee.
@@ -129,9 +129,9 @@ class AddresseeDialog : public KDialogBase
private slots:
void selectItem( const QString & );
- void selectNextItem( QListViewItem *item );
- void updateEdit( QListViewItem *item );
- void addSelected( QListViewItem *item );
+ void selectNextItem( Q3ListViewItem *item );
+ void updateEdit( Q3ListViewItem *item );
+ void addSelected( Q3ListViewItem *item );
void removeSelected();
void loadAddressBook();
@@ -139,7 +139,7 @@ class AddresseeDialog : public KDialogBase
void addressBookChanged();
private:
- void addCompletionItem( const QString &str, QListViewItem *item );
+ void addCompletionItem( const QString &str, Q3ListViewItem *item );
bool mMultiple;
@@ -150,8 +150,8 @@ class AddresseeDialog : public KDialogBase
AddressBook *mAddressBook;
- QDict<QListViewItem> mItemDict;
- QDict<QListViewItem> mSelectedDict;
+ Q3Dict<Q3ListViewItem> mItemDict;
+ Q3Dict<Q3ListViewItem> mSelectedDict;
class AddresseeDialogPrivate;
AddresseeDialogPrivate *d;
diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp
index 097e162..e1ba1ce 100644
--- a/kabc/addresseelist.cpp
+++ b/kabc/addresseelist.cpp
@@ -28,7 +28,9 @@ $Id$
#include <kdebug.h>
//US
-#include <qtl.h>
+#include <q3tl.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include "addresseelist.h"
@@ -121,7 +123,7 @@ bool SortingTraits::GivenName::lt( const Addressee &a1, const Addressee &a2 )
//
AddresseeList::AddresseeList()
- : QValueList<Addressee>()
+ : Q3ValueList<Addressee>()
{
mReverseSorting = false;
mActiveSortingCriterion = FormattedName;
@@ -133,14 +135,14 @@ AddresseeList::~AddresseeList()
}
AddresseeList::AddresseeList( const AddresseeList &l )
- : QValueList<Addressee>( l )
+ : Q3ValueList<Addressee>( l )
{
mReverseSorting = l.reverseSorting();
mActiveSortingCriterion = l.sortingCriterion();
}
-AddresseeList::AddresseeList( const QValueList<Addressee> &l )
- : QValueList<Addressee>( l )
+AddresseeList::AddresseeList( const Q3ValueList<Addressee> &l )
+ : Q3ValueList<Addressee>( l )
{
mReverseSorting = false;
}
diff --git a/kabc/addresseelist.h b/kabc/addresseelist.h
index 2df252c..6106804 100644
--- a/kabc/addresseelist.h
+++ b/kabc/addresseelist.h
@@ -29,7 +29,7 @@ $Id$
#ifndef KABC_ADDRESSEELIST_H
#define KABC_ADDRESSEELIST_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
#include "addressee.h"
@@ -114,13 +114,13 @@ typedef enum { Uid, Name, FormattedName, FamilyName, GivenName } SortingCriterio
*
* @author Jost Schenck jost@schenck.de
*/
-class AddresseeList : public QValueList<Addressee>
+class AddresseeList : public Q3ValueList<Addressee>
{
public:
AddresseeList();
~AddresseeList();
AddresseeList( const AddresseeList & );
- AddresseeList( const QValueList<Addressee> & );
+ AddresseeList( const Q3ValueList<Addressee> & );
/**
* Debug output.
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index cde19a1..425e67c 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -27,23 +27,28 @@
#include <kiconloader.h>
#include <klocale.h>
//US #include <kstringhandler.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
#include <qregexp.h>
#include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
#include <qlabel.h>
#include <qwidget.h>
#include <qlayout.h>
#include <qapplication.h>
#include <qpushbutton.h>
#ifdef DESKTOP_VERSION
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
#include <qprinter.h>
#include <qpainter.h>
#endif
+#include <QDesktopWidget>
-#include <qstylesheet.h>
+#include <q3stylesheet.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QPixmap>
+#include <Q3VBoxLayout>
#include "externalapphandler.h"
#include <kabc/addresseeview.h>
@@ -59,7 +64,7 @@ using namespace KABC;
bool AddresseeView::sFullDetailsMode = false;
AddresseeView::AddresseeView( QWidget *parent, const char *name )
- : QTextBrowser( parent, name )
+ : Q3TextBrowser( parent, name )
{
@@ -82,7 +87,7 @@ void AddresseeView::printMe()
return;
QPainter p;
p.begin ( &printer );
- QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+ Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
float dx, dy;
int wid = (m.width() * 9)/10;
dx = (float) wid/(float)contentsWidth ();
@@ -402,7 +407,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) {
picString = "<img src=\"myimage\" width=\"50\" height=\"70\">";
if ( picAvailintern ) {
- QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
+ Q3MimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
int wid = picture.data().width();
int hei = picture.data().height();
if ( wid > 128 || hei > 128 ) {
@@ -418,7 +423,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
} else {
if ( picAvailUrl ) {
QPixmap picPix( picture.url() );
- QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", picPix );
+ Q3MimeSourceFactory::defaultFactory()->setPixmap( "myimage", picPix );
int wid = picPix.width();
int hei = picPix.height();
if ( wid > 128 || hei > 128 ) {
@@ -435,7 +440,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {
static bool setDefaultImageChildren = false;
if ( !setDefaultImageChildren ) {
- QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
+ Q3MimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
setDefaultImageChildren = true;
}
picString = "<img src=\"familyIcon\" width=\"64\" height=\"64\">";
@@ -443,7 +448,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
} else if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) {
static bool setDefaultImagepouses = false;
if ( !setDefaultImagepouses ) {
- QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
+ Q3MimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
setDefaultImagepouses = true;
}
picString = "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">";
@@ -452,7 +457,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
if ( gen == "male" ) {
static bool setDefaultImageMale = false;
if ( !setDefaultImageMale ) {
- QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
+ Q3MimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
setDefaultImageMale = true;
}
picString = "<img src=\"MaleIcon\" width=\"64\" height=\"64\">";
@@ -460,7 +465,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
} else if ( gen == "female" ) {
static bool setDefaultImageFemale = false;
if ( !setDefaultImageFemale ) {
- QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
+ Q3MimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
setDefaultImageFemale = true;
}
picString = "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">";
@@ -469,7 +474,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
static bool setDefaultImage = false;
if ( !setDefaultImage ) {
//qDebug("Setting default pixmap ");
- QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
+ Q3MimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
setDefaultImage = true;
}
picString = "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";
@@ -653,7 +658,7 @@ void AddresseeView::addTag(const QString & tag,const QString & text)
{
if ( text.isEmpty() )
return;
- int number=text.contains("\n");
+ int number=text.count("\n");
QString str = "<" + tag + ">";
QString tmpText=text;
QString tmpStr=str;
@@ -688,24 +693,24 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo
findButton( User1 )->setText( i18n("Local"));
QWidget* topframe = new QWidget( this );
setMainWidget( topframe );
- QBoxLayout* bl;
+ Q3BoxLayout* bl;
if ( QApplication::desktop()->width() < 640 ) {
- bl = new QVBoxLayout( topframe );
+ bl = new Q3VBoxLayout( topframe );
} else {
- bl = new QHBoxLayout( topframe );
+ bl = new Q3HBoxLayout( topframe );
}
- QVBox* subframe = new QVBox( topframe );
+ Q3VBox* subframe = new Q3VBox( topframe );
bl->addWidget(subframe );
QLabel* lab = new QLabel( i18n("Local Addressee"), subframe );
if ( takeloc )
- lab->setBackgroundColor(Qt::green.light() );
+ lab->setBackgroundColor(QColor(Qt::green).light() );
AddresseeView * av = new AddresseeView( subframe );
av->setAddressee( loc );
- subframe = new QVBox( topframe );
+ subframe = new Q3VBox( topframe );
bl->addWidget(subframe );
lab = new QLabel( i18n("Remote Addressee"), subframe );
if ( !takeloc )
- lab->setBackgroundColor(Qt::green.light() );
+ lab->setBackgroundColor(QColor(Qt::green).light() );
av = new AddresseeView( subframe );
av->setAddressee( rem );
QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote()));
diff --git a/kabc/addresseeview.h b/kabc/addresseeview.h
index a4de085..f7ce2e0 100644
--- a/kabc/addresseeview.h
+++ b/kabc/addresseeview.h
@@ -26,12 +26,12 @@
#include <kdialogbase.h>
//US #include <ktextbrowser.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
namespace KABC {
//US class AddresseeView : public KTextBrowser
-class AddresseeView : public QTextBrowser
+class AddresseeView : public Q3TextBrowser
{
public:
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index d34ba0b..cf5afa6 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -23,6 +23,8 @@
#include <kdebug.h>
#include "distributionlist.h"
+//Added by qt3to4:
+#include <Q3ValueList>
using namespace KABC;
@@ -54,7 +56,7 @@ void DistributionList::insertEntry( const Addressee &a, const QString &email )
if (em.isNull() )
em = a.preferredEmail();
Entry e( a, em );
- QValueList<Entry>::Iterator it;
+ Q3ValueList<Entry>::Iterator it;
for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
if ( (*it).addressee.uid() == a.uid() ) {
/**
@@ -74,7 +76,7 @@ void DistributionList::insertEntry( const Addressee &a, const QString &email )
void DistributionList::removeEntry( const Addressee &a, const QString &email )
{
- QValueList<Entry>::Iterator it;
+ Q3ValueList<Entry>::Iterator it;
for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
if ( (*it).addressee.uid() == a.uid() && (*it).email == email ) {
mEntries.remove( it );
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index c81e543..8d21a17 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -24,6 +24,9 @@
//#include <kdirwatch.h>
#include "addressbook.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
namespace KABC {
@@ -48,7 +51,7 @@ class DistributionList
*/
struct Entry
{
- typedef QValueList<Entry> List;
+ typedef Q3ValueList<Entry> List;
Entry() {}
Entry( const Addressee &_addressee, const QString &_email ) :
@@ -167,7 +170,7 @@ class DistributionListManager
private:
AddressBook *mAddressBook;
- QPtrList<DistributionList> mLists;
+ Q3PtrList<DistributionList> mLists;
};
/**
diff --git a/kabc/distributionlistdialog.cpp b/kabc/distributionlistdialog.cpp
index d2e1144..82883e6 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/kabc/distributionlistdialog.cpp
@@ -18,13 +18,19 @@
Boston, MA 02111-1307, USA.
*/
-#include <qlistview.h>
+#include <q3listview.h>
#include <qlayout.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qcombobox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
#include <klineeditdlg.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
+#include <Q3Button>
#include <qradiobutton.h>
#include <klocale.h>
@@ -60,10 +66,10 @@ EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
parent )
{
- QFrame *topFrame = plainPage();
- QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+ Q3Frame *topFrame = plainPage();
+ Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
- mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+ mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
topFrame );
topLayout->addWidget( mButtonGroup );
@@ -78,7 +84,7 @@ EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
QString EmailSelector::selected()
{
- QButton *button = mButtonGroup->selected();
+ QAbstractButton *button = mButtonGroup->selected();
if ( button ) return button->text();
return QString::null;
}
@@ -96,12 +102,12 @@ QString EmailSelector::getEmail( const QStringList &emails, const QString &curre
return result;
}
-class EntryItem : public QListViewItem
+class EntryItem : public Q3ListViewItem
{
public:
- EntryItem( QListView *parent, const Addressee &addressee,
+ EntryItem( Q3ListView *parent, const Addressee &addressee,
const QString &email=QString::null ) :
- QListViewItem( parent ),
+ Q3ListViewItem( parent ),
mAddressee( addressee ),
mEmail( email )
{
@@ -136,10 +142,10 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
{
kdDebug(5700) << "DistributionListEditor()" << endl;
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
topLayout->setSpacing( KDialog::spacingHint() );
- QBoxLayout *nameLayout = new QHBoxLayout( topLayout) ;
+ Q3BoxLayout *nameLayout = new Q3HBoxLayout( topLayout) ;
mNameCombo = new QComboBox( this );
nameLayout->addWidget( mNameCombo );
@@ -157,7 +163,7 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
nameLayout->addWidget( mRemoveButton );
connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeList() ) );
- QGridLayout *gridLayout = new QGridLayout( topLayout, 3, 3 );
+ Q3GridLayout *gridLayout = new Q3GridLayout( topLayout, 3, 3 );
gridLayout->setColStretch(1, 1);
QLabel *listLabel = new QLabel( i18n("Available addresses:"), this );
@@ -166,14 +172,14 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
mListLabel = new QLabel( this );
gridLayout->addMultiCellWidget( mListLabel, 0, 0, 1, 2 );
- mAddresseeView = new QListView( this );
+ mAddresseeView = new Q3ListView( this );
mAddresseeView->addColumn( i18n("Name") );
mAddresseeView->addColumn( i18n("Preferred Email") );
mAddresseeView->setAllColumnsShowFocus( true );
gridLayout->addWidget( mAddresseeView, 1, 0 );
connect( mAddresseeView, SIGNAL( selectionChanged() ),
SLOT( slotSelectionAddresseeViewChanged() ) );
- connect( mAddresseeView, SIGNAL( doubleClicked( QListViewItem * ) ),
+ connect( mAddresseeView, SIGNAL( doubleClicked( Q3ListViewItem * ) ),
SLOT( addEntry() ) );
mAddEntryButton = new QPushButton( i18n("Add Entry"), this );
@@ -181,7 +187,7 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
gridLayout->addWidget( mAddEntryButton, 2, 0 );
connect( mAddEntryButton, SIGNAL( clicked() ), SLOT( addEntry() ) );
- mEntryView = new QListView( this );
+ mEntryView = new Q3ListView( this );
mEntryView->addColumn( i18n("Name") );
mEntryView->addColumn( i18n("Email") );
mEntryView->addColumn( i18n("Use Preferred") );
diff --git a/kabc/distributionlistdialog.h b/kabc/distributionlistdialog.h
index b6d3c80..3627431 100644
--- a/kabc/distributionlistdialog.h
+++ b/kabc/distributionlistdialog.h
@@ -22,13 +22,15 @@
#define KABC_DISTRIBUTIONLISTDIALOG_H
#include <qwidget.h>
+//Added by qt3to4:
+#include <QLabel>
#include <kdialogbase.h>
-class QListView;
+class Q3ListView;
class QLabel;
class QComboBox;
-class QButtonGroup;
+class Q3ButtonGroup;
namespace KABC {
@@ -93,7 +95,7 @@ class EmailSelector : public KDialogBase
QWidget *parent );
private:
- QButtonGroup *mButtonGroup;
+ Q3ButtonGroup *mButtonGroup;
};
/**
@@ -124,8 +126,8 @@ class DistributionListEditorWidget : public QWidget
private:
QComboBox *mNameCombo;
QLabel *mListLabel;
- QListView *mEntryView;
- QListView *mAddresseeView;
+ Q3ListView *mEntryView;
+ Q3ListView *mAddresseeView;
AddressBook *mAddressBook;
DistributionListManager *mManager;
diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp
index 9f5840b..ca5ecb7 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/kabc/distributionlisteditor.cpp
@@ -18,7 +18,7 @@
Boston, MA 02111-1307, USA.
*/
-#include <qlistview.h>
+#include <q3listview.h>
#include <qlayout.h>
#include <qpushbutton.h>
#include <qcombobox.h>
@@ -27,8 +27,12 @@
#else
#include <qtcompat/qinputdialog.h>
#endif
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
#include <qradiobutton.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
#include <klocale.h>
#include <kdebug.h>
@@ -48,10 +52,10 @@ EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString &
KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
parent )
{
- QFrame *topFrame = plainPage();
- QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+ Q3Frame *topFrame = plainPage();
+ Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
- mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+ mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
topFrame );
topLayout->addWidget( mButtonGroup );
@@ -66,7 +70,7 @@ EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString &
QString EmailSelectDialog::selected()
{
- QButton *button = mButtonGroup->selected();
+ QAbstractButton *button = mButtonGroup->selected();
if ( button ) return button->text();
return QString::null;
}
@@ -85,12 +89,12 @@ QString EmailSelectDialog::getEmail( const QStringList &emails, const QString &c
return result;
}
-class EditEntryItem : public QListViewItem
+class EditEntryItem : public Q3ListViewItem
{
public:
- EditEntryItem( QListView *parent, const Addressee &addressee,
+ EditEntryItem( Q3ListView *parent, const Addressee &addressee,
const QString &email=QString::null ) :
- QListViewItem( parent ),
+ Q3ListViewItem( parent ),
mAddressee( addressee ),
mEmail( email )
{
@@ -125,11 +129,11 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidge
{
kdDebug(5700) << "DistributionListEditor()" << endl;
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
topLayout->setMargin( KDialog::marginHint() );
topLayout->setSpacing( KDialog::spacingHint() );
- QBoxLayout *nameLayout = new QHBoxLayout( topLayout) ;
+ Q3BoxLayout *nameLayout = new Q3HBoxLayout( topLayout) ;
mNameCombo = new QComboBox( this );
nameLayout->addWidget( mNameCombo );
@@ -143,7 +147,7 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidge
nameLayout->addWidget( removeButton );
connect( removeButton, SIGNAL( clicked() ), SLOT( removeList() ) );
- mEntryView = new QListView( this );
+ mEntryView = new Q3ListView( this );
mEntryView->addColumn( i18n("Name") );
mEntryView->addColumn( i18n("Email") );
mEntryView->addColumn( i18n("Use Preferred") );
@@ -162,7 +166,7 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidge
topLayout->addWidget( addEntryButton );
connect( addEntryButton, SIGNAL( clicked() ), SLOT( addEntry() ) );
- mAddresseeView = new QListView( this );
+ mAddresseeView = new Q3ListView( this );
mAddresseeView->addColumn( i18n("Name") );
mAddresseeView->addColumn( i18n("Preferred Email") );
topLayout->addWidget( mAddresseeView );
diff --git a/kabc/distributionlisteditor.h b/kabc/distributionlisteditor.h
index e0b4221..e672a14 100644
--- a/kabc/distributionlisteditor.h
+++ b/kabc/distributionlisteditor.h
@@ -24,9 +24,9 @@
#include <kdialogbase.h>
-class QListView;
+class Q3ListView;
class QComboBox;
-class QButtonGroup;
+class Q3ButtonGroup;
namespace KABC {
@@ -45,7 +45,7 @@ class EmailSelectDialog : public KDialogBase
QWidget *parent );
private:
- QButtonGroup *mButtonGroup;
+ Q3ButtonGroup *mButtonGroup;
};
/**
@@ -72,8 +72,8 @@ class DistributionListEditor : public QWidget
private:
QComboBox *mNameCombo;
- QListView *mEntryView;
- QListView *mAddresseeView;
+ Q3ListView *mEntryView;
+ Q3ListView *mAddresseeView;
AddressBook *mAddressBook;
DistributionListManager *mManager;
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 7c6d7a9..203f696 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -33,6 +33,8 @@ $Id$
#include "field.h"
#include "resource.h"
+//Added by qt3to4:
+#include <Q3ValueList>
using namespace KABC;
@@ -377,7 +379,7 @@ bool Field::setValue( KABC::Addressee &a, const QString &value )
// But Qt::IsoDate and QDate::fromString was not specified. Do I have the wrong QT version ?
{
QDate dt = KGlobal::locale()->readDate( value, "%Y-%m-%d"); // = Qt::ISODate
- a.setBirthday(dt);
+ a.setBirthday((QDateTime)dt);
}
return true;
case FieldImpl::CustomField:
@@ -493,7 +495,7 @@ void Field::saveFields( const QString &identifier,
void Field::saveFields( KConfig *cfg, const QString &identifier,
const Field::List &fields )
{
- QValueList<int> fieldIds;
+ Q3ValueList<int> fieldIds;
//US
// qDebug("Field::saveFields to %s %s", cfg->getFileName().latin1(), identifier.latin1());
@@ -533,14 +535,14 @@ Field::List Field::restoreFields( const QString &identifier )
Field::List Field::restoreFields( KConfig *cfg, const QString &identifier )
{
- QValueList<int> fieldIds = cfg->readIntListEntry( identifier);
+ Q3ValueList<int> fieldIds = cfg->readIntListEntry( identifier);
//US
// qDebug("Field::restoreFields from %s, identifier: %s", cfg->getFileName().latin1(), identifier.latin1());
Field::List fields;
int custom = 0;
- QValueList<int>::ConstIterator it;
+ Q3ValueList<int>::ConstIterator it;
for( it = fieldIds.begin(); it != fieldIds.end(); ++it ) {
FieldImpl *f = 0;
if ( (*it) == FieldImpl::CustomField ) {
diff --git a/kabc/field.h b/kabc/field.h
index 9e06597..55cc705 100644
--- a/kabc/field.h
+++ b/kabc/field.h
@@ -29,7 +29,7 @@ $Id$
#define KABC_FIELD_H
#include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
#include "addressee.h"
@@ -43,7 +43,7 @@ class Field
friend class FieldImpl;
public:
- typedef QValueList<Field *> List;
+ typedef Q3ValueList<Field *> List;
/**
* @li @p All -
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp
index 3ae1c27..cbb97a2 100644
--- a/kabc/formatfactory.cpp
+++ b/kabc/formatfactory.cpp
@@ -102,7 +102,7 @@ QStringList FormatFactory::formats()
// make sure 'vcard' is the first entry
retval << "vcard";
- QDictIterator<FormatInfo> it( mFormatList );
+ Q3DictIterator<FormatInfo> it( mFormatList );
for ( ; it.current(); ++it )
if ( it.currentKey() != "vcard" )
retval << it.currentKey();
diff --git a/kabc/formatfactory.h b/kabc/formatfactory.h
index 9612374..de15b17 100644
--- a/kabc/formatfactory.h
+++ b/kabc/formatfactory.h
@@ -21,7 +21,7 @@
#ifndef KABC_FORMATFACTORY_H
#define KABC_FORMATFACTORY_H
-#include <qdict.h>
+#include <q3dict.h>
#include <qstring.h>
#include <kconfig.h>
@@ -97,7 +97,7 @@ class FormatFactory
#endif
static FormatFactory *mSelf;
- QDict<FormatInfo> mFormatList;
+ Q3Dict<FormatInfo> mFormatList;
};
}
diff --git a/kabc/formats/binary/kabcformat_binaryE.pro b/kabc/formats/binary/kabcformat_binaryE.pro
index 2d9594d..c71197e 100644
--- a/kabc/formats/binary/kabcformat_binaryE.pro
+++ b/kabc/formats/binary/kabcformat_binaryE.pro
@@ -8,7 +8,7 @@ INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../qtcomp
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
LIBS += -L$(QPEDIR)/lib
DEFINES += KAB_EMBEDDED
diff --git a/kabc/formats/vcardformatplugin2.cpp b/kabc/formats/vcardformatplugin2.cpp
index 41b0c9a..fbebe92 100644
--- a/kabc/formats/vcardformatplugin2.cpp
+++ b/kabc/formats/vcardformatplugin2.cpp
@@ -11,7 +11,7 @@ $Id$
#include "addressee.h"
#include "vcardparser/vcardtool.h"
-#include <qtextstream.h>
+#include <q3textstream.h>
#include <qfile.h>
using namespace KABC;
@@ -37,8 +37,8 @@ bool VCardFormatPlugin2::load( Addressee &addressee, QFile *file )
qDebug("VCardFormatPlugin2::load");
QString data;
- QTextStream t( file );
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ Q3TextStream t( file );
+ t.setEncoding( Q3TextStream::UnicodeUTF8 );
data = t.read();
VCardTool tool;
@@ -58,8 +58,8 @@ bool VCardFormatPlugin2::loadAll( AddressBook *addressBook, Resource *resource,
qDebug("VCardFormatPlugin2::loadAll");
QString data;
- QTextStream t( file );
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ Q3TextStream t( file );
+ t.setEncoding( Q3TextStream::UnicodeUTF8 );
data = t.read();
VCardTool tool;
@@ -86,8 +86,8 @@ void VCardFormatPlugin2::save( const Addressee &addressee, QFile *file )
vcardlist.append( addressee );
- QTextStream t( file );
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ Q3TextStream t( file );
+ t.setEncoding( Q3TextStream::UnicodeUTF8 );
t << tool.createVCards( vcardlist );
}
@@ -105,8 +105,8 @@ void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *fi
}
}
- QTextStream t( file );
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ Q3TextStream t( file );
+ t.setEncoding( Q3TextStream::UnicodeUTF8 );
t << tool.createVCards( vcardlist );
}
@@ -114,7 +114,7 @@ bool VCardFormatPlugin2::checkFormat( QFile *file ) const
{
QString line;
- file->readLine( line, 1024 );
+ char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp;
line = line.stripWhiteSpace();
if ( line == "BEGIN:VCARD" )
return true;
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 17ebff8..846ed8a 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -3,13 +3,13 @@ CONFIG += qt warn_on
#release debug
DESTDIR=../bin
-TARGET = microkabc
+TARGET = xmicrokabc
include( ../variables.pri )
INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui ..
-#LIBS += -lmicrokde -lldap
+#LIBS += -lxmicrokde -lldap
LIBS += -L$(QPEDIR)/lib
DEFINES += KAB_EMBEDDED DESKTOP_VERSION
unix : {
@@ -216,3 +216,7 @@ vcard/TextListValue.cpp
# plugins/ldap/resourceldapconfig.cpp \
#formats/binary/binaryformat.cpp \
+#The following line was inserted by qt3to4
+QT += xml qt3support
+#The following line was inserted by qt3to4
+QT +=
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 1d28a4d..6045b68 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,14 +1,14 @@
TEMPLATE = lib
CONFIG += qt warn_on
-TARGET = microkabc
+TARGET = xmicrokabc
INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokde
+LIBS += -lxmicrokdepim
#LIBS += -lldap
LIBS += -L$(QPEDIR)/lib
DEFINES += KAB_EMBEDDED
@@ -194,3 +194,5 @@ vcard/TextListValue.cpp
# plugins/ldap/resourceldap.cpp \
# plugins/ldap/resourceldapconfig.cpp \
+#The following line was inserted by qt3to4
+QT += qt3support
diff --git a/kabc/key.h b/kabc/key.h
index 6ea5b47..313eb7d 100644
--- a/kabc/key.h
+++ b/kabc/key.h
@@ -28,7 +28,7 @@ $Id$
#ifndef KABC_KEY_H
#define KABC_KEY_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
namespace KABC {
@@ -41,8 +41,8 @@ class Key
friend QDataStream &operator>>( QDataStream &, Key & );
public:
- typedef QValueList<Key> List;
- typedef QValueList<int> TypeList;
+ typedef Q3ValueList<Key> List;
+ typedef Q3ValueList<int> TypeList;
/**
* Key types
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index feeba6c..6bc89d3 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -28,7 +28,7 @@ $Id$
#ifndef KABC_PHONENUMBER_H
#define KABC_PHONENUMBER_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
#include <qstring.h>
namespace KABC {
@@ -46,8 +46,8 @@ class PhoneNumber
friend QDataStream &operator>>( QDataStream &, PhoneNumber & );
public:
- typedef QValueList<PhoneNumber> List;
- typedef QValueList<int> TypeList;
+ typedef Q3ValueList<PhoneNumber> List;
+ typedef Q3ValueList<int> TypeList;
/**
@li @p Home - Home number
diff --git a/kabc/picture.cpp b/kabc/picture.cpp
index 57aa297..0c59937 100644
--- a/kabc/picture.cpp
+++ b/kabc/picture.cpp
@@ -26,6 +26,8 @@ $Id$
*/
#include "picture.h"
+//Added by qt3to4:
+#include <QPixmap>
using namespace KABC;
diff --git a/kabc/picture.h b/kabc/picture.h
index 714d1e2..1b63610 100644
--- a/kabc/picture.h
+++ b/kabc/picture.h
@@ -29,6 +29,8 @@ $Id$
#define KABC_PICTURE_H
#include <qimage.h>
+//Added by qt3to4:
+#include <QPixmap>
namespace KABC {
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index 3e18594..9b3b894 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -4,10 +4,10 @@ CONFIG += qt warn_on release
include( ../../../variables.pri )
-TARGET = microkabc_dir
+TARGET = xmicrokabc_dir
INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
DESTDIR = ../../../bin
-#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -lxmicrokde -lxmicrokabc
#LIBS += -L$(QPEDIR)/lib
INTERFACES = \
@@ -29,8 +29,12 @@ CONFIG += dll
DEFINES += _WIN32_
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
LIBS += ../../../bin/microkabc.lib
}
+#The following line was inserted by qt3to4
+QT += qt3support
+#The following line was inserted by qt3to4
+QT += xml
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index cda4e2f..75332a0 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -2,12 +2,12 @@ TEMPLATE = lib
CONFIG += qt warn_on release
#release debug
-TARGET = microkabc_dir
+TARGET = xmicrokabc_dir
INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
LIBS += -L$(QPEDIR)/lib
INTERFACES = \
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index c61664b..cc4afee 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -170,7 +170,7 @@ bool ResourceDir::doOpen()
return true;
QFile file( mPath + "/" + testName );
- if ( file.open( IO_ReadOnly ) )
+ if ( file.open( QIODevice::ReadOnly ) )
return true;
if ( file.size() == 0 )
@@ -196,7 +196,7 @@ bool ResourceDir::load()
for ( it = files.begin(); it != files.end(); ++it ) {
QFile file( mPath + "/" + (*it) );
- if ( !file.open( IO_ReadOnly ) ) {
+ if ( !file.open( QIODevice::ReadOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
ok = false;
continue;
@@ -223,7 +223,7 @@ bool ResourceDir::save( Ticket *ticket )
continue;
QFile file( mPath + "/" + (*it).uid() );
- if ( !file.open( IO_WriteOnly ) ) {
+ if ( !file.open( QIODevice::WriteOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
continue;
}
@@ -267,7 +267,7 @@ bool ResourceDir::lock( const QString &path )
// Create unique file
QFile file( mLockUniqueName );
- file.open( IO_WriteOnly );
+ file.open( QIODevice::WriteOnly );
file.close();
// Create lock file
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
index 98d18fe..8fa48d0 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -27,6 +27,8 @@ $Id$
#include <qlabel.h>
#include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
#include <kdebug.h>
#include <klocale.h>
@@ -44,7 +46,7 @@ using namespace KABC;
ResourceDirConfig::ResourceDirConfig( QWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0,
+ Q3GridLayout *mainLayout = new Q3GridLayout( this, 2, 2, 0,
KDialog::spacingHint() );
QLabel *label = new QLabel( i18n( "Format:" ), this );
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 2d17313..e4f1270 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -4,11 +4,11 @@ CONFIG += qt warn_on release
include( ../../../variables.pri )
-TARGET = microkabc_file
+TARGET = xmicrokabc_file
INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
DESTDIR = ../../../bin
-#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -lxmicrokde -lxmicrokabc
#LIBS += -L$(QPEDIR)/lib
INTERFACES = \
@@ -30,8 +30,12 @@ CONFIG += dll
DEFINES += _WIN32_
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
LIBS += ../../../bin/microkabc.lib
}
+#The following line was inserted by qt3to4
+QT += qt3support
+#The following line was inserted by qt3to4
+QT += xml
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 16707e5..5044cd9 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -2,12 +2,12 @@ TEMPLATE = lib
CONFIG += qt warn_on release
#release debug
-TARGET = microkabc_file
+TARGET = xmicrokabc_file
INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
LIBS += -L$(QPEDIR)/lib
INTERFACES = \
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index dad4571..3ed850c 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -201,13 +201,13 @@ bool ResourceFile::doOpen()
if ( !file.exists() ) {
// try to create the file
- bool ok = file.open( IO_WriteOnly );
+ bool ok = file.open( QIODevice::WriteOnly );
if ( ok )
file.close();
return ok;
} else {
- if ( !file.open( IO_ReadWrite ) )
+ if ( !file.open( QIODevice::ReadWrite ) )
return false;
if ( file.size() < 10 ) {
@@ -230,7 +230,7 @@ bool ResourceFile::load()
{
QFile file( fileName() );
- if ( !file.open( IO_ReadOnly ) ) {
+ if ( !file.open( QIODevice::ReadOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1'." ).arg( fileName() ) );
return false;
}
@@ -311,7 +311,7 @@ bool ResourceFile::save( Ticket *ticket )
}
QFile info;
info.setName( fileName() );
- bool ok = info.open( IO_WriteOnly );
+ bool ok = info.open( QIODevice::WriteOnly );
if ( ok ) {
mFormat->saveAll( addressBook(), this, &info );
@@ -363,7 +363,7 @@ bool ResourceFile::lock( const QString &fileName )
// Create unique file
QFile file( mLockUniqueName );
- file.open( IO_WriteOnly );
+ file.open( QIODevice::WriteOnly );
file.close();
// Create lock file
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp
index b63775d..70b0bac 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/kabc/plugins/file/resourcefileconfig.cpp
@@ -28,6 +28,8 @@ $Id$
#include <qlabel.h>
#include <qlayout.h>
#include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
#include <kdebug.h>
#include <klocale.h>
@@ -50,7 +52,7 @@ ResourceFileConfig::ResourceFileConfig( QWidget* parent, const char* name )
{
//qDebug("ResourceFileConfig::ResourceFileConfig");
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0,
+ Q3GridLayout *mainLayout = new Q3GridLayout( this, 2, 2, 0,
KDialog::spacingHint() );
QLabel *label = new QLabel( i18n( "Format:" ), this );
diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro
index 57b6f84..c56d24d 100644
--- a/kabc/plugins/ldap/ldapE.pro
+++ b/kabc/plugins/ldap/ldapE.pro
@@ -2,12 +2,12 @@ TEMPLATE = lib
CONFIG += qt warn_on release
#release debug
-TARGET = microkabc_ldap
+TARGET = xmicrokabc_ldap
INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
LIBS += -L$(QPEDIR)/lib
INTERFACES = \
diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro
index 9b95015..ad7e1ef 100644
--- a/kabc/plugins/olaccess/olaccess.pro
+++ b/kabc/plugins/olaccess/olaccess.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
CONFIG += qt warn_on
-TARGET = microkabc_olaccess
+TARGET = xmicrokabc_olaccess
include( ../../../variables.pri )
@@ -28,8 +28,8 @@ CONFIG += dll
DEFINES += _WIN32_
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
LIBS += ../../../bin/microkabc.lib
}
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index b7ecbc0..aa6b8ea 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
CONFIG += qt warn_on
#release debug
-TARGET = microkabc_opie
+TARGET = xmicrokabc_opie
INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include $(OPIEDIR)/include
@@ -9,8 +9,8 @@ INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kde
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde
-LIBS += -lmicrokabc
+LIBS += -lxmicrokde
+LIBS += -lxmicrokabc
LIBS += -L$(QPEDIR)/lib
LIBS += -L$(OPIEDIR)/lib
LIBS += -lopie
diff --git a/kabc/plugins/qtopia/qtopia.pro b/kabc/plugins/qtopia/qtopia.pro
index 64d1abc..d91a2e3 100644
--- a/kabc/plugins/qtopia/qtopia.pro
+++ b/kabc/plugins/qtopia/qtopia.pro
@@ -3,13 +3,13 @@ CONFIG += qt warn_on release
include( ../../../variables.pri )
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources
DESTDIR = ../../../bin
-#LIBS += -lmicrokde
-#LIBS += -lkamicrokabc
+#LIBS += -lxmicrokde
+#LIBS += -lxkamicrokabc
DEFINES += KAB_EMBEDDED DESKTOP_VERSION
@@ -36,8 +36,12 @@ CONFIG += dll
DEFINES += _WIN32_
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
LIBS += ../../../bin/microkabc.lib
}
+#The following line was inserted by qt3to4
+QT += xml qt3support
+#The following line was inserted by qt3to4
+QT +=
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index 700057b..4b174b2 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,15 +1,15 @@
TEMPLATE = lib
CONFIG += qt warn_on
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde
-LIBS += -lmicrokabc
+LIBS += -lxmicrokde
+LIBS += -lxmicrokabc
LIBS += -L$(QPEDIR)/lib
LIBS += -lqpe
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 9693a68..9b3903b 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -34,7 +34,9 @@ $Id$
#include <qfile.h>
#include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3ValueList>
//#include <.h>
#include <libkdepim/ksyncprofile.h>
@@ -71,8 +73,8 @@ QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QStr
{
startover:
QStringList dummy;
- QValueList<OpieCategories>::ConstIterator catIt;
- QValueList<OpieCategories> categories = m_edit->categories();
+ Q3ValueList<OpieCategories>::ConstIterator catIt;
+ Q3ValueList<OpieCategories> categories = m_edit->categories();
bool found = false;
for ( QStringList::ConstIterator listIt = list.begin(); listIt != list.end(); ++listIt ) {
/* skip empty category name */
@@ -192,7 +194,7 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
QDate date = dateFromString( el.attribute( "Birthday" ) );
if ( date.isValid() )
- adr.setBirthday( date );
+ adr.setBirthday( (QDateTime)date );
adr.setRole( el.attribute( "JobTitle" ) );
if ( !el.attribute( "FileAs" ).isEmpty() )
@@ -317,7 +319,7 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
return true;
}
-bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, QTextStream *stream )
+bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, Q3TextStream *stream )
{
*stream << "<Contact ";
*stream << "FirstName=\"" << escape(ab.givenName()) << "\" ";
@@ -484,13 +486,13 @@ CategoryEdit::~CategoryEdit(){
void CategoryEdit::save(const QString& fileName)const{
QFile file( fileName );
QString endl = "\n";
- if ( file.open( IO_WriteOnly ) ) {
- QTextStream stream( &file );
- stream.setEncoding( QTextStream::UnicodeUTF8 );
+ if ( file.open( QIODevice::WriteOnly ) ) {
+ Q3TextStream stream( &file );
+ stream.setEncoding( Q3TextStream::UnicodeUTF8 );
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
stream << "<!DOCTYPE CategoryList>" << endl;
stream << "<Categories>" << endl;
- for ( QValueList<OpieCategories>::ConstIterator it = m_categories.begin();
+ for ( Q3ValueList<OpieCategories>::ConstIterator it = m_categories.begin();
it != m_categories.end(); ++it )
{
stream << "<Category id=\""<< ( (*it).id() ) << "\" ";
@@ -537,7 +539,7 @@ void CategoryEdit::parse( const QString &tempFile ){
QDomDocument doc( "mydocument" );
QFile f( tempFile );
- if ( !f.open( IO_ReadOnly ) )
+ if ( !f.open( QIODevice::ReadOnly ) )
return;
if ( !doc.setContent( &f ) ) {
@@ -587,7 +589,7 @@ void CategoryEdit::clear()
}
QString CategoryEdit::categoryById( const QString &id, const QString &app )const
{
- QValueList<OpieCategories>::ConstIterator it;
+ Q3ValueList<OpieCategories>::ConstIterator it;
QString category;
QString fallback;
for( it = m_categories.begin(); it != m_categories.end(); ++it ){
diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h
index 744dd41..389926c 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.h
+++ b/kabc/plugins/qtopia/qtopiaconverter.h
@@ -28,6 +28,9 @@ $Id$
#define KABC_QTOPIACONVERTER_H
#include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3TextStream>
#include "addressee.h"
#ifdef DESKTOP_VERSION
@@ -76,14 +79,14 @@ class OpieCategories {
QStringList categoriesByIds( const QStringList& ids, const QString& app );
void clear();
- QValueList<OpieCategories> categories()const { return m_categories; };
+ Q3ValueList<OpieCategories> categories()const { return m_categories; };
private:
/**
* this function will be used internally to update the kde categories...
*/
void updateKDE( const QString& app, const QStringList& categories );
QMap<int, bool> ids; // from tt Qtopia::UidGen
- QValueList<OpieCategories> m_categories;
+ Q3ValueList<OpieCategories> m_categories;
};
@@ -117,7 +120,7 @@ public:
* @param addr The addressee.
* @param contact The qtopia contact.
*/
- bool addresseeToQtopia( const Addressee &ab, QTextStream *stream );
+ bool addresseeToQtopia( const Addressee &ab, Q3TextStream *stream );
private:
QString categoriesToNumber( const QStringList &list, const QString &app );
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 79ddaea..a36eb8f 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -31,7 +31,7 @@ $Id$
#endif
#include <qdir.h>
#include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
#include <qfileinfo.h>
#include <qregexp.h>
//US #include <qtimer.h>
@@ -156,7 +156,7 @@ bool ResourceQtopia::load()
{
QFile file( fileName() );
- if ( !file.open(IO_ReadOnly ) ) {
+ if ( !file.open(QIODevice::ReadOnly ) ) {
return false;
}
@@ -203,12 +203,12 @@ bool ResourceQtopia::save( Ticket *ticket )
KABC::AddressBook::Iterator it;
bool res;
QFile file( fileName() );
- if (!file.open( IO_WriteOnly ) ) {
+ if (!file.open( QIODevice::WriteOnly ) ) {
return false;
}
- QTextStream ts( &file );
- QTextStream *stream = &ts;
- stream->setEncoding( QTextStream::UnicodeUTF8 );
+ Q3TextStream ts( &file );
+ Q3TextStream *stream = &ts;
+ stream->setEncoding( Q3TextStream::UnicodeUTF8 );
*stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>" << endl;
*stream << " <Groups>" << endl;
*stream << " </Groups>" << endl;
@@ -260,7 +260,7 @@ bool ResourceQtopia::lock( const QString &lockfileName )
// Create unique file
QFile file( mLockUniqueName );
- file.open( IO_WriteOnly );
+ file.open( QIODevice::WriteOnly );
file.close();
// Create lock file
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
index d5d6141..42fd428 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
@@ -27,6 +27,8 @@ $Id$
#include <qlabel.h>
#include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
#include <kdebug.h>
#include <klocale.h>
@@ -46,7 +48,7 @@ using namespace KABC;
ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent, const char* name )
: ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
+ Q3GridLayout *mainLayout = new Q3GridLayout( this, 1, 2, 0,
KDialog::spacingHint() );
QLabel *label = new QLabel( i18n( "Location:" ), this );
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 23b0b76..7fc8ba8 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
CONFIG += qt warn_on
-TARGET = microkabc_sharpdtm
+TARGET = xmicrokabc_sharpdtm
INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
@@ -8,9 +8,9 @@ INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde
-LIBS += -lmicrokabc
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokde
+LIBS += -lxmicrokabc
+LIBS += -lxmicrokdepim
LIBS += -lmicroqtcompat
LIBS += -L$(QPEDIR)/lib
LIBS += -ljpeg
diff --git a/kabc/secrecy.h b/kabc/secrecy.h
index b2ff565..0fe956e 100644
--- a/kabc/secrecy.h
+++ b/kabc/secrecy.h
@@ -28,7 +28,7 @@ $Id$
#ifndef KABC_SECRECY_H
#define KABC_SECRECY_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
namespace KABC {
@@ -38,7 +38,7 @@ class Secrecy
friend QDataStream &operator>>( QDataStream &, Secrecy & );
public:
- typedef QValueList<int> TypeList;
+ typedef Q3ValueList<int> TypeList;
/**
* Secrecy types
diff --git a/kabc/sound.h b/kabc/sound.h
index 0ec5ec8..9777054 100644
--- a/kabc/sound.h
+++ b/kabc/sound.h
@@ -28,7 +28,7 @@ $Id$
#ifndef KABC_SOUND_H
#define KABC_SOUND_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <qstring.h>
namespace KABC {
diff --git a/kabc/tmpaddressbook.cpp b/kabc/tmpaddressbook.cpp
index cfa57e3..5152e00 100644
--- a/kabc/tmpaddressbook.cpp
+++ b/kabc/tmpaddressbook.cpp
@@ -24,7 +24,7 @@ Copyright (c) 2004 Ulf Schenk
$Id$
*/
-#include <qptrlist.h>
+#include <q3ptrlist.h>
#include "tmpaddressbook.h"
diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp
index fa46499..33d358c 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/kabc/vcard/AdrParam.cpp
@@ -24,6 +24,8 @@
#include <VCardRToken.h>
#include <VCardAdrParam.h>
#include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -38,7 +40,7 @@ AdrParam::AdrParam(const AdrParam & x)
{
}
-AdrParam::AdrParam(const QCString & s)
+AdrParam::AdrParam(const Q3CString & s)
: Param(s)
{
}
@@ -56,7 +58,7 @@ AdrParam::operator = (AdrParam & x)
}
AdrParam &
-AdrParam::operator = (const QCString & s)
+AdrParam::operator = (const Q3CString & s)
{
Param::operator = (s);
@@ -77,7 +79,7 @@ AdrParam::operator == (AdrParam & x)
if (x.adrTypeList().count() != adrTypeList_.count())
return false;
- QStrListIterator it(x.adrTypeList_);
+ Q3StrListIterator it(x.adrTypeList_);
for (; it.current(); ++it)
if (!adrTypeList_.find(it.current()))
@@ -114,7 +116,7 @@ AdrParam::_assemble()
return;
}
- QStrListIterator it(adrTypeList_);
+ Q3StrListIterator it(adrTypeList_);
for (; it.current(); ++it) {
diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp
index 7ecef33..51ca12a 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/kabc/vcard/AdrValue.cpp
@@ -25,6 +25,9 @@
#include <VCardAdrValue.h>
#include <VCardValue.h>
#include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3StrList>
+#include <Q3CString>
using namespace VCARD;
@@ -45,7 +48,7 @@ AdrValue::AdrValue(const AdrValue & x)
{
}
-AdrValue::AdrValue(const QCString & s)
+AdrValue::AdrValue(const Q3CString & s)
: Value(s)
{
}
@@ -68,7 +71,7 @@ AdrValue::operator = (AdrValue & x)
}
AdrValue &
-AdrValue::operator = (const QCString & s)
+AdrValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -105,7 +108,7 @@ AdrValue::_parse()
{
vDebug("AdrValue::_parse()");
- QStrList l;
+ Q3StrList l;
RTokenise(strRep_, ";", l);
for (unsigned int i = 0; i < l.count(); i++) {
diff --git a/kabc/vcard/AgentParam.cpp b/kabc/vcard/AgentParam.cpp
index 5625e00..aae35ac 100644
--- a/kabc/vcard/AgentParam.cpp
+++ b/kabc/vcard/AgentParam.cpp
@@ -24,6 +24,8 @@
#include <VCardAgentParam.h>
#include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -39,7 +41,7 @@ AgentParam::AgentParam(const AgentParam & x)
{
}
-AgentParam::AgentParam(const QCString & s)
+AgentParam::AgentParam(const Q3CString & s)
: Param(s)
{
}
@@ -57,7 +59,7 @@ AgentParam::operator = (AgentParam & x)
}
AgentParam &
-AgentParam::operator = (const QCString & s)
+AgentParam::operator = (const Q3CString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/AgentValue.cpp b/kabc/vcard/AgentValue.cpp
index bccde80..14e73b1 100644
--- a/kabc/vcard/AgentValue.cpp
+++ b/kabc/vcard/AgentValue.cpp
@@ -24,6 +24,8 @@
#include <VCardAgentValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ AgentValue::AgentValue(const AgentValue & x)
{
}
-AgentValue::AgentValue(const QCString & s)
+AgentValue::AgentValue(const Q3CString & s)
: Value(s)
{
}
@@ -52,7 +54,7 @@ AgentValue::operator = (AgentValue & x)
}
AgentValue &
-AgentValue::operator = (const QCString & s)
+AgentValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/ClassValue.cpp b/kabc/vcard/ClassValue.cpp
index f01e5a6..c088d7c 100644
--- a/kabc/vcard/ClassValue.cpp
+++ b/kabc/vcard/ClassValue.cpp
@@ -26,6 +26,8 @@
#include <VCardValue.h>
#include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -40,7 +42,7 @@ ClassValue::ClassValue(const ClassValue & x)
{
}
-ClassValue::ClassValue(const QCString & s)
+ClassValue::ClassValue(const Q3CString & s)
: Value(s)
{
}
@@ -58,7 +60,7 @@ ClassValue::operator = (ClassValue & x)
}
ClassValue &
-ClassValue::operator = (const QCString & s)
+ClassValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 0a2f97d..1d4886c 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -21,8 +21,8 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
#include <qregexp.h>
#include <kdebug.h>
@@ -98,7 +98,7 @@ ContentLine::ContentLine(const ContentLine & x)
}
-ContentLine::ContentLine(const QCString & s)
+ContentLine::ContentLine(const Q3CString & s)
: Entity(s),
value_(0),
paramType_( ParamUnknown ),
@@ -129,7 +129,7 @@ ContentLine::operator = (ContentLine & x)
}
ContentLine &
-ContentLine::operator = (const QCString & s)
+ContentLine::operator = (const Q3CString & s)
{
Entity::operator = (s);
delete value_;
@@ -142,7 +142,7 @@ ContentLine::operator == (ContentLine & x)
{
x.parse();
- QPtrListIterator<Param> it(x.paramList());
+ Q3PtrListIterator<Param> it(x.paramList());
if (!paramList_.find(it.current()))
return false;
@@ -163,11 +163,11 @@ ContentLine::_parse()
// Unfold folded lines
// NLR
- strRep_ = strRep_.replace( QRegExp( "\\r" ), "" );
+ strRep_ = strRep_.replace( "\\r" , "" );
// Unqote newlines
- strRep_ = strRep_.replace( QRegExp( "\\\\n" ), "\n" );
+ strRep_ = strRep_.replace( "\\\\n", "\n" );
//NLR
- strRep_ = strRep_.replace( QRegExp( "\\\\r" ), "\r" );
+ strRep_ = strRep_.replace( "\\\\r" , "\r" );
int split = strRep_.find(':');
@@ -176,8 +176,8 @@ ContentLine::_parse()
return;
}
- QCString firstPart(strRep_.left(split));
- QCString valuePart(strRep_.mid(split + 1));
+ Q3CString firstPart(strRep_.left(split));
+ Q3CString valuePart(strRep_.mid(split + 1));
split = firstPart.find('.');
@@ -192,7 +192,7 @@ ContentLine::_parse()
// Now we have the group, the name and param list together and the value.
- QStrList l;
+ Q3StrList l;
RTokenise(firstPart, ";", l);
@@ -214,11 +214,11 @@ ContentLine::_parse()
// For each parameter, create a new parameter of the correct type.
- QStrListIterator it(l);
+ Q3StrListIterator it(l);
for (; it.current(); ++it, i++) {
- QCString str = *it;
+ Q3CString str = *it;
split = str.find("=");
if (split < 0 ) {
@@ -226,13 +226,13 @@ ContentLine::_parse()
continue;
}
- QCString paraName = str.left(split);
- QCString paraValue = str.mid(split + 1);
+ Q3CString paraName = str.left(split);
+ Q3CString paraValue = str.mid(split + 1);
- QStrList paraValues;
+ Q3StrList paraValues;
RTokenise(paraValue, ",", paraValues);
- QStrListIterator it2( paraValues );
+ Q3StrListIterator it2( paraValues );
for(; it2.current(); ++it2) {
@@ -309,7 +309,7 @@ ContentLine::_assemble()
vDebug("Assemble (argl) - my name is \"" + name_ + "\"");
strRep_.truncate(0);
- QCString line;
+ Q3CString line;
if (!group_.isEmpty())
line += group_ + '.';
diff --git a/kabc/vcard/DateParam.cpp b/kabc/vcard/DateParam.cpp
index 52af089..52fb828 100644
--- a/kabc/vcard/DateParam.cpp
+++ b/kabc/vcard/DateParam.cpp
@@ -24,6 +24,8 @@
#include <VCardDateParam.h>
#include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ DateParam::DateParam(const DateParam & x)
{
}
-DateParam::DateParam(const QCString & s)
+DateParam::DateParam(const Q3CString & s)
: Param(s)
{
}
@@ -52,7 +54,7 @@ DateParam::operator = (DateParam & x)
}
DateParam &
-DateParam::operator = (const QCString & s)
+DateParam::operator = (const Q3CString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp
index c5c5c85..87c7007 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/kabc/vcard/DateValue.cpp
@@ -22,6 +22,8 @@
*/
#include <qregexp.h>
+//Added by qt3to4:
+#include <Q3CString>
#include <kdebug.h>
@@ -105,7 +107,7 @@ DateValue::DateValue(const DateValue & x)
hasTime_ = x.hasTime_;
}
-DateValue::DateValue(const QCString & s)
+DateValue::DateValue(const Q3CString & s)
: Value(s)
{
}
@@ -120,7 +122,7 @@ DateValue::operator = (DateValue & x)
}
DateValue &
-DateValue::operator = (const QCString & s)
+DateValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -154,8 +156,8 @@ DateValue::_parse()
int timeSep = strRep_.find('T');
- QCString dateStr;
- QCString timeStr;
+ Q3CString dateStr;
+ Q3CString timeStr;
if (timeSep == -1) {
@@ -173,7 +175,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// DATE
- dateStr.replace(QRegExp("-"), "");
+ dateStr.replace("-", "");
kdDebug(5710) << "dateStr: " << dateStr << endl;
@@ -196,7 +198,7 @@ DateValue::_parse()
if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
- QCString zoneStr(timeStr.mid(zoneSep + 1));
+ Q3CString zoneStr(timeStr.mid(zoneSep + 1));
vDebug("zoneStr == " + zoneStr);
zonePositive_ = (zoneStr[0] == '+');
@@ -211,13 +213,13 @@ DateValue::_parse()
int secFracSep = timeStr.findRev(',');
if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
- QCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
+ Q3CString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
secFrac_ = quirkafleeg.toDouble();
}
/////////////////////////////////////////////////////////////// HMS
- timeStr.replace(QRegExp(":"), "");
+ timeStr.replace(":", "");
hour_ = timeStr.left(2).toInt();
minute_ = timeStr.mid(2, 2).toInt();
@@ -229,9 +231,9 @@ DateValue::_assemble()
{
vDebug("DateValue::_assemble");
- QCString year;
- QCString month;
- QCString day;
+ Q3CString year;
+ Q3CString month;
+ Q3CString day;
year.setNum( year_ );
month.setNum( month_ );
@@ -243,9 +245,9 @@ DateValue::_assemble()
strRep_ = year + '-' + month + '-' + day;
if ( hasTime_ ) {
- QCString hour;
- QCString minute;
- QCString second;
+ Q3CString hour;
+ Q3CString minute;
+ Q3CString second;
hour.setNum( hour_ );
minute.setNum( minute_ );
diff --git a/kabc/vcard/EmailParam.cpp b/kabc/vcard/EmailParam.cpp
index 8c87477..877af60 100644
--- a/kabc/vcard/EmailParam.cpp
+++ b/kabc/vcard/EmailParam.cpp
@@ -24,6 +24,8 @@
#include <VCardEmailParam.h>
#include <VCardParam.h>
#include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -40,7 +42,7 @@ EmailParam::EmailParam(const EmailParam & x)
{
}
-EmailParam::EmailParam(const QCString & s)
+EmailParam::EmailParam(const Q3CString & s)
: Param(s)
{
}
@@ -58,7 +60,7 @@ EmailParam::operator = (EmailParam & x)
}
EmailParam &
-EmailParam::operator = (const QCString & s)
+EmailParam::operator = (const Q3CString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/Entity.cpp b/kabc/vcard/Entity.cpp
index b7d09e0..e38fa11 100644
--- a/kabc/vcard/Entity.cpp
+++ b/kabc/vcard/Entity.cpp
@@ -22,6 +22,8 @@
*/
#include <VCardEntity.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -40,7 +42,7 @@ Entity::Entity(const Entity & e)
// empty
}
-Entity::Entity(const QCString & s)
+Entity::Entity(const Q3CString & s)
: strRep_ (s),
parsed_ (false),
assembled_ (true)
@@ -61,7 +63,7 @@ Entity::operator = (const Entity & e)
}
Entity &
-Entity::operator = (const QCString & s)
+Entity::operator = (const Q3CString & s)
{
strRep_ = s;
parsed_ = false;
@@ -83,13 +85,13 @@ Entity::operator != (Entity & e)
}
bool
-Entity::operator == (const QCString & s)
+Entity::operator == (const Q3CString & s)
{
return asString() == s;
}
bool
-Entity::operator != (const QCString & s)
+Entity::operator != (const Q3CString & s)
{
return !(*this == s);
}
@@ -99,7 +101,7 @@ Entity::~Entity()
// empty
}
- QCString
+ Q3CString
Entity::asString()
{
// vDebug("Entity::asString()");
diff --git a/kabc/vcard/Enum.cpp b/kabc/vcard/Enum.cpp
index cc48b5a..036324c 100644
--- a/kabc/vcard/Enum.cpp
+++ b/kabc/vcard/Enum.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qcstring.h>
+#include <q3cstring.h>
#include <ctype.h>
#include <VCardEnum.h>
@@ -29,7 +29,7 @@
using namespace VCARD;
// There are 31 possible types, not including extensions.
- const QCString
+ const Q3CString
VCARD::paramNames [] =
{
"NAME",
@@ -222,7 +222,7 @@ VCARD::EntityTypeToValueType(EntityType e)
return t;
}
- QCString
+ Q3CString
VCARD::EntityTypeToParamName(EntityType e)
{
if ( e > EntityUnknown ) e = EntityUnknown;
@@ -230,7 +230,7 @@ VCARD::EntityTypeToParamName(EntityType e)
}
EntityType
-VCARD::EntityNameToEntityType(const QCString & s)
+VCARD::EntityNameToEntityType(const Q3CString & s)
{
if (s.isEmpty()) return EntityUnknown;
diff --git a/kabc/vcard/FloatValue.cpp b/kabc/vcard/FloatValue.cpp
index 15bb664..7065081 100644
--- a/kabc/vcard/FloatValue.cpp
+++ b/kabc/vcard/FloatValue.cpp
@@ -24,6 +24,8 @@
#include <VCardFloatValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -45,7 +47,7 @@ FloatValue::FloatValue(const FloatValue & x)
value_ = x.value_;
}
-FloatValue::FloatValue(const QCString & s)
+FloatValue::FloatValue(const Q3CString & s)
: Value(s)
{
}
@@ -63,7 +65,7 @@ FloatValue::operator = (FloatValue & x)
}
FloatValue &
-FloatValue::operator = (const QCString & s)
+FloatValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -101,7 +103,7 @@ FloatValue::_parse()
void
FloatValue::_assemble()
{
- strRep_ = QCString().setNum(value_);
+ strRep_ = Q3CString().setNum(value_);
}
float
diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp
index e02b402..ba57a6b 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/kabc/vcard/GeoValue.cpp
@@ -23,6 +23,8 @@
#include <VCardValue.h>
#include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -36,7 +38,7 @@ GeoValue::GeoValue(const GeoValue & x)
{
}
-GeoValue::GeoValue(const QCString & s)
+GeoValue::GeoValue(const Q3CString & s)
: Value(s)
{
}
@@ -54,7 +56,7 @@ GeoValue::operator = (GeoValue & x)
}
GeoValue &
-GeoValue::operator = (const QCString & s)
+GeoValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/ImageParam.cpp b/kabc/vcard/ImageParam.cpp
index c9cf6fd..6da317d 100644
--- a/kabc/vcard/ImageParam.cpp
+++ b/kabc/vcard/ImageParam.cpp
@@ -24,6 +24,8 @@
#include <VCardImageParam.h>
#include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ ImageParam::ImageParam(const ImageParam & x)
{
}
-ImageParam::ImageParam(const QCString & s)
+ImageParam::ImageParam(const Q3CString & s)
: Param(s)
{
}
@@ -52,7 +54,7 @@ ImageParam::operator = (ImageParam & x)
}
ImageParam &
-ImageParam::operator = (const QCString & s)
+ImageParam::operator = (const Q3CString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/ImageValue.cpp b/kabc/vcard/ImageValue.cpp
index 4630fac..678a81c 100644
--- a/kabc/vcard/ImageValue.cpp
+++ b/kabc/vcard/ImageValue.cpp
@@ -24,6 +24,8 @@
#include <VCardImageValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ ImageValue::ImageValue(const ImageValue & x)
{
}
-ImageValue::ImageValue(const QCString & s)
+ImageValue::ImageValue(const Q3CString & s)
: Value(s)
{
}
@@ -52,7 +54,7 @@ ImageValue::operator = (ImageValue & x)
}
ImageValue &
-ImageValue::operator = (const QCString & s)
+ImageValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/ImgValue.cpp b/kabc/vcard/ImgValue.cpp
index 7b961f8..1b289df 100644
--- a/kabc/vcard/ImgValue.cpp
+++ b/kabc/vcard/ImgValue.cpp
@@ -24,6 +24,8 @@
#include <VCardImgValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ ImgValue::ImgValue(const ImgValue & x)
{
}
-ImgValue::ImgValue(const QCString & s)
+ImgValue::ImgValue(const Q3CString & s)
: Value(s)
{
}
@@ -52,7 +54,7 @@ ImgValue::operator = (ImgValue & x)
}
ImgValue &
-ImgValue::operator = (const QCString & s)
+ImgValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp
index edf1804..52a0204 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/kabc/vcard/LangValue.cpp
@@ -26,6 +26,9 @@
#include <VCardLangValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3StrList>
using namespace VCARD;
@@ -39,7 +42,7 @@ LangValue::LangValue(const LangValue & x)
{
}
-LangValue::LangValue(const QCString & s)
+LangValue::LangValue(const Q3CString & s)
: Value(s)
{
}
@@ -54,7 +57,7 @@ LangValue::operator = (LangValue & x)
}
LangValue &
-LangValue::operator = (const QCString & s)
+LangValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -74,7 +77,7 @@ LangValue::~LangValue()
void
LangValue::_parse()
{
- QStrList l;
+ Q3StrList l;
RTokenise(strRep_, "-", l);
if (l.count() == 0) return;
@@ -91,20 +94,21 @@ LangValue::_assemble()
{
strRep_ = primary_;
- QStrListIterator it(subtags_);
+ Q3StrListIterator it(subtags_);
- for (; it.current(); ++it)
- strRep_ += QCString('-') + it.current();
+ for (; it.current(); ++it) {
+ strRep_ += Q3CString('-'); strRep_ += it.current();
+ }
}
- QCString
+ Q3CString
LangValue::primary()
{
parse();
return primary_;
}
- QStrList
+ Q3StrList
LangValue::subtags()
{
parse();
@@ -112,14 +116,14 @@ LangValue::subtags()
}
void
-LangValue::setPrimary(const QCString & s)
+LangValue::setPrimary(const Q3CString & s)
{
parse();
primary_ = s;
}
void
-LangValue::setSubTags(const QStrList & l)
+LangValue::setSubTags(const Q3StrList & l)
{
parse();
subtags_ = l;
diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp
index cdec621..6c0f365 100644
--- a/kabc/vcard/NValue.cpp
+++ b/kabc/vcard/NValue.cpp
@@ -21,7 +21,9 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
#include <VCardRToken.h>
#include <VCardNValue.h>
@@ -46,7 +48,7 @@ NValue::NValue(const NValue & x)
{
}
-NValue::NValue(const QCString & s)
+NValue::NValue(const Q3CString & s)
: Value(s)
{
vDebug("ctor");
@@ -68,7 +70,7 @@ NValue::operator = (NValue & x)
}
NValue &
-NValue::operator = (const QCString & s)
+NValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -100,7 +102,7 @@ NValue::clone()
void
NValue::_parse()
{
- QStrList l;
+ Q3StrList l;
RTokenise(strRep_, ";", l);
for (unsigned int i = 0; i < l.count(); i++) {
diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp
index c3134c8..a6a32dd 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/kabc/vcard/OrgValue.cpp
@@ -26,6 +26,8 @@
#include <VCardOrgValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -39,7 +41,7 @@ OrgValue::OrgValue(const OrgValue & x)
{
}
-OrgValue::OrgValue(const QCString & s)
+OrgValue::OrgValue(const Q3CString & s)
: Value(s)
{
}
@@ -54,7 +56,7 @@ OrgValue::operator = (OrgValue & x)
}
OrgValue &
-OrgValue::operator = (const QCString & s)
+OrgValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -82,7 +84,7 @@ OrgValue::_assemble()
{
bool first(true);
- QStrListIterator it(valueList_);
+ Q3StrListIterator it(valueList_);
for (; it.current(); ++it) {
if (!first) strRep_ += ';';
@@ -98,7 +100,7 @@ OrgValue::numValues()
return valueList_.count();
}
- QCString
+ Q3CString
OrgValue::value(unsigned int i)
{
parse();
diff --git a/kabc/vcard/Param.cpp b/kabc/vcard/Param.cpp
index c513613..bd6b299 100644
--- a/kabc/vcard/Param.cpp
+++ b/kabc/vcard/Param.cpp
@@ -26,6 +26,8 @@
#include <VCardEntity.h>
#include <VCardRToken.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -43,7 +45,7 @@ Param::Param(const Param & x)
{
}
-Param::Param(const QCString & s)
+Param::Param(const Q3CString & s)
: Entity(s),
name_(""),
value_("")
@@ -63,7 +65,7 @@ Param::operator = (Param & x)
}
Param &
-Param::operator = (const QCString & s)
+Param::operator = (const Q3CString & s)
{
Entity::operator = (s);
return *this;
@@ -91,7 +93,7 @@ Param::_assemble()
strRep_ = name_ + "=" + value_;
}
-Param::Param(const QCString &name, const QCString &value)
+Param::Param(const Q3CString &name, const Q3CString &value)
: Entity(),
name_(name),
value_(value)
@@ -101,7 +103,7 @@ Param::Param(const QCString &name, const QCString &value)
}
void
-Param::setName(const QCString & name)
+Param::setName(const Q3CString & name)
{
name_ = name;
@@ -109,20 +111,20 @@ Param::setName(const QCString & name)
}
void
-Param::setValue(const QCString & value)
+Param::setValue(const Q3CString & value)
{
value_ = value;
assembled_ = false;
}
- QCString
+ Q3CString
Param::name()
{
return name_;
}
- QCString
+ Q3CString
Param::value()
{
return value_;
diff --git a/kabc/vcard/PhoneNumberValue.cpp b/kabc/vcard/PhoneNumberValue.cpp
index 17b1400..57aa336 100644
--- a/kabc/vcard/PhoneNumberValue.cpp
+++ b/kabc/vcard/PhoneNumberValue.cpp
@@ -24,6 +24,8 @@
#include <VCardPhoneNumberValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ PhoneNumberValue::PhoneNumberValue(const PhoneNumberValue & x)
{
}
-PhoneNumberValue::PhoneNumberValue(const QCString & s)
+PhoneNumberValue::PhoneNumberValue(const Q3CString & s)
: Value(s)
{
}
@@ -52,7 +54,7 @@ PhoneNumberValue::operator = (PhoneNumberValue & x)
}
PhoneNumberValue &
-PhoneNumberValue::operator = (const QCString & s)
+PhoneNumberValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp
index 2a85820..8fc0558 100644
--- a/kabc/vcard/RToken.cpp
+++ b/kabc/vcard/RToken.cpp
@@ -24,14 +24,14 @@
#include <string.h>
#include <stddef.h>
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
namespace VCARD
{
Q_UINT32
-RTokenise(const char * str, const char * delim, QStrList & l)
+RTokenise(const char * str, const char * delim, Q3StrList & l)
{
// FIXME no stderr !
l.clear();
diff --git a/kabc/vcard/SoundValue.cpp b/kabc/vcard/SoundValue.cpp
index 81040d1..4d098d2 100644
--- a/kabc/vcard/SoundValue.cpp
+++ b/kabc/vcard/SoundValue.cpp
@@ -24,6 +24,8 @@
#include <VCardSoundValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ SoundValue::SoundValue(const SoundValue & x)
{
}
-SoundValue::SoundValue(const QCString & s)
+SoundValue::SoundValue(const Q3CString & s)
: Value(s)
{
}
@@ -52,7 +54,7 @@ SoundValue::operator = (SoundValue & x)
}
SoundValue &
-SoundValue::operator = (const QCString & s)
+SoundValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp
index cd51cbd..8f02113 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/kabc/vcard/SourceParam.cpp
@@ -24,6 +24,8 @@
#include <VCardSourceParam.h>
#include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -41,7 +43,7 @@ SourceParam::SourceParam(const SourceParam & x)
{
}
-SourceParam::SourceParam(const QCString & s)
+SourceParam::SourceParam(const Q3CString & s)
: Param(s),
type_(SourceParam::TypeUnknown)
{
@@ -60,7 +62,7 @@ SourceParam::operator = (SourceParam & x)
}
SourceParam &
-SourceParam::operator = (const QCString & s)
+SourceParam::operator = (const Q3CString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/TelParam.cpp b/kabc/vcard/TelParam.cpp
index 9d9fe4d..4bc8b6a 100644
--- a/kabc/vcard/TelParam.cpp
+++ b/kabc/vcard/TelParam.cpp
@@ -24,6 +24,8 @@
#include <VCardTelParam.h>
#include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ TelParam::TelParam(const TelParam & x)
{
}
-TelParam::TelParam(const QCString & s)
+TelParam::TelParam(const Q3CString & s)
: Param(s)
{
}
@@ -52,7 +54,7 @@ TelParam::operator = (TelParam & x)
}
TelParam &
-TelParam::operator = (const QCString & s)
+TelParam::operator = (const Q3CString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/TelValue.cpp b/kabc/vcard/TelValue.cpp
index 349f99a..d9cbf3e 100644
--- a/kabc/vcard/TelValue.cpp
+++ b/kabc/vcard/TelValue.cpp
@@ -24,6 +24,8 @@
#include <VCardTelValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ TelValue::TelValue(const TelValue & x)
{
}
-TelValue::TelValue(const QCString & s)
+TelValue::TelValue(const Q3CString & s)
: Value(s)
{
}
@@ -52,7 +54,7 @@ TelValue::operator = (TelValue & x)
}
TelValue &
-TelValue::operator = (const QCString & s)
+TelValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/TextBinParam.cpp b/kabc/vcard/TextBinParam.cpp
index 66f2946..2866c12 100644
--- a/kabc/vcard/TextBinParam.cpp
+++ b/kabc/vcard/TextBinParam.cpp
@@ -24,6 +24,8 @@
#include <VCardTextBinParam.h>
#include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ TextBinParam::TextBinParam(const TextBinParam & x)
{
}
-TextBinParam::TextBinParam(const QCString & s)
+TextBinParam::TextBinParam(const Q3CString & s)
: Param(s)
{
}
@@ -52,7 +54,7 @@ TextBinParam::operator = (TextBinParam & x)
}
TextBinParam &
-TextBinParam::operator = (const QCString & s)
+TextBinParam::operator = (const Q3CString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/TextBinValue.cpp b/kabc/vcard/TextBinValue.cpp
index c584009..a3a96ae 100644
--- a/kabc/vcard/TextBinValue.cpp
+++ b/kabc/vcard/TextBinValue.cpp
@@ -25,6 +25,8 @@
#include <VCardTextBinValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -41,7 +43,7 @@ TextBinValue::TextBinValue(const TextBinValue & x)
mUrl_ = x.mUrl_;
}
-TextBinValue::TextBinValue(const QCString & s)
+TextBinValue::TextBinValue(const Q3CString & s)
: Value(s)
{
}
@@ -60,7 +62,7 @@ TextBinValue::operator = (TextBinValue & x)
}
TextBinValue &
-TextBinValue::operator = (const QCString & s)
+TextBinValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp
index c4ac1e3..919f4f7 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/kabc/vcard/TextListValue.cpp
@@ -26,6 +26,8 @@
#include <VCardTextListValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -39,7 +41,7 @@ TextListValue::TextListValue(const TextListValue & x)
{
}
-TextListValue::TextListValue(const QCString & s)
+TextListValue::TextListValue(const Q3CString & s)
: Value(s)
{
}
@@ -54,7 +56,7 @@ TextListValue::operator = (TextListValue & x)
}
TextListValue &
-TextListValue::operator = (const QCString & s)
+TextListValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -82,7 +84,7 @@ TextListValue::_assemble()
{
bool first(true);
- QStrListIterator it(valueList_);
+ Q3StrListIterator it(valueList_);
for (; it.current(); ++it) {
if (!first) strRep_ += ';';
@@ -98,7 +100,7 @@ TextListValue::numValues()
return valueList_.count();
}
- QCString
+ Q3CString
TextListValue::value(unsigned int i)
{
parse();
diff --git a/kabc/vcard/TextParam.cpp b/kabc/vcard/TextParam.cpp
index 7c68700..ce6661f 100644
--- a/kabc/vcard/TextParam.cpp
+++ b/kabc/vcard/TextParam.cpp
@@ -24,6 +24,8 @@
#include <VCardTextParam.h>
#include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ TextParam::TextParam(const TextParam & x)
{
}
-TextParam::TextParam(const QCString & s)
+TextParam::TextParam(const Q3CString & s)
: Param(s)
{
}
@@ -52,7 +54,7 @@ TextParam::operator = (TextParam & x)
}
TextParam &
-TextParam::operator = (const QCString & s)
+TextParam::operator = (const Q3CString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/TextValue.cpp b/kabc/vcard/TextValue.cpp
index 09934fa..d0d2996 100644
--- a/kabc/vcard/TextValue.cpp
+++ b/kabc/vcard/TextValue.cpp
@@ -24,6 +24,8 @@
#include <VCardTextValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -37,7 +39,7 @@ TextValue::TextValue(const TextValue & x)
{
}
-TextValue::TextValue(const QCString & s)
+TextValue::TextValue(const Q3CString & s)
: Value(s)
{
}
@@ -52,7 +54,7 @@ TextValue::operator = (TextValue & x)
}
TextValue &
-TextValue::operator = (const QCString & s)
+TextValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -61,7 +63,7 @@ TextValue::operator = (const QCString & s)
bool
TextValue::operator == (TextValue & x)
{
- return strRep_ = x.strRep_;
+ return strRep_ == x.strRep_;
}
TextValue::~TextValue()
diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp
index c1d1022..26da7f4 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/kabc/vcard/URIValue.cpp
@@ -24,6 +24,8 @@
#include <VCardURIValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -32,7 +34,7 @@ URIValue::URIValue()
{
}
-URIValue::URIValue(const QCString & scheme, const QCString & schemeSpecificPart)
+URIValue::URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart)
: Value(),
scheme_ (scheme),
schemeSpecificPart_ (schemeSpecificPart)
@@ -47,7 +49,7 @@ URIValue::URIValue(const URIValue & x)
{
}
-URIValue::URIValue(const QCString & s)
+URIValue::URIValue(const Q3CString & s)
: Value(s)
{
}
@@ -65,7 +67,7 @@ URIValue::operator = (URIValue & x)
}
URIValue &
-URIValue::operator = (const QCString & s)
+URIValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
@@ -103,14 +105,14 @@ URIValue::_assemble()
strRep_ = scheme_ + ':' + schemeSpecificPart_;
}
- QCString
+ Q3CString
URIValue::scheme()
{
parse();
return scheme_;
}
- QCString
+ Q3CString
URIValue::schemeSpecificPart()
{
parse();
@@ -118,14 +120,14 @@ URIValue::schemeSpecificPart()
}
void
-URIValue::setScheme(const QCString & s)
+URIValue::setScheme(const Q3CString & s)
{
parse();
scheme_ = s;
}
void
-URIValue::setSchemeSpecificPart(const QCString & s)
+URIValue::setSchemeSpecificPart(const Q3CString & s)
{
parse();
schemeSpecificPart_ = s;
diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp
index 374306c..f35d986 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/kabc/vcard/UTCValue.cpp
@@ -24,6 +24,8 @@
#include <VCardUTCValue.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -38,7 +40,7 @@ UTCValue::UTCValue(const UTCValue & x)
{
}
-UTCValue::UTCValue(const QCString & s)
+UTCValue::UTCValue(const Q3CString & s)
: Value(s)
{
}
@@ -57,7 +59,7 @@ UTCValue::operator = (UTCValue & x)
}
UTCValue &
-UTCValue::operator = (const QCString & s)
+UTCValue::operator = (const Q3CString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index a2ff327..bae5385 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -23,6 +23,8 @@
#include <qregexp.h>
#include <qdatetime.h>
+//Added by qt3to4:
+#include <Q3CString>
#include <VCardDefines.h>
#include <VCardVCardEntity.h>
@@ -41,7 +43,7 @@ VCardEntity::VCardEntity(const VCardEntity & x)
cardList_.setAutoDelete( TRUE );
}
-VCardEntity::VCardEntity(const QCString & s)
+VCardEntity::VCardEntity(const Q3CString & s)
: Entity(s)
{
cardList_.setAutoDelete( TRUE );
@@ -57,7 +59,7 @@ VCardEntity::operator = (VCardEntity & x)
}
VCardEntity &
-VCardEntity::operator = (const QCString & s)
+VCardEntity::operator = (const Q3CString & s)
{
Entity::operator = (s);
return *this;
@@ -83,7 +85,7 @@ VCardEntity::_parse()
int num = 0;
// old code
vDebug("parse");
- QCString s(strRep_);
+ Q3CString s(strRep_);
int i = s.find(QRegExp("BEGIN:VCARD", false));
@@ -91,7 +93,7 @@ VCardEntity::_parse()
i = s.find(QRegExp("BEGIN:VCARD", false), 11);
- QCString cardStr(s.left(i));
+ Q3CString cardStr(s.left(i));
VCard * v = new VCard(cardStr);
@@ -132,7 +134,7 @@ VCardEntity::_parse()
if ( i <= len ) {
++num;
char* dat = strRep_.data()+start;
- VCard * v = new VCard( QCString ( dat,i-start ) );
+ VCard * v = new VCard( Q3CString ( dat,i-start ) );
start = i;
cardList_.append(v);
v->parse();
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp
index bad2ef1..5dd675d 100644
--- a/kabc/vcard/VCardv.cpp
+++ b/kabc/vcard/VCardv.cpp
@@ -21,11 +21,11 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
#include <qstringlist.h>
#include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
#include <VCardEntity.h>
#include <VCardVCard.h>
@@ -48,7 +48,7 @@ VCard::VCard(const VCard & x)
{
contentLineList_.setAutoDelete( TRUE );
- QPtrListIterator<ContentLine> it(x.contentLineList_);
+ Q3PtrListIterator<ContentLine> it(x.contentLineList_);
for (; it.current(); ++it) {
ContentLine * c = new ContentLine(*it.current());
contentLineList_.append(c);
@@ -56,7 +56,7 @@ VCard::VCard(const VCard & x)
}
-VCard::VCard(const QCString & s)
+VCard::VCard(const Q3CString & s)
: Entity(s)
{
contentLineList_.setAutoDelete( TRUE );
@@ -68,7 +68,7 @@ VCard::operator = (VCard & x)
if (*this == x) return *this;
group_ = x.group();
- QPtrListIterator<ContentLine> it(x.contentLineList_);
+ Q3PtrListIterator<ContentLine> it(x.contentLineList_);
for (; it.current(); ++it) {
ContentLine * c = new ContentLine(*it.current());
contentLineList_.append(c);
@@ -79,7 +79,7 @@ VCard::operator = (VCard & x)
}
VCard &
-VCard::operator = (const QCString & s)
+VCard::operator = (const Q3CString & s)
{
Entity::operator = (s);
return *this;
@@ -101,7 +101,7 @@ VCard::_parse()
{
QStringList l;
- QStrList sl;
+ Q3StrList sl;
RTokenise(strRep_, "\r\n", sl);
@@ -109,7 +109,8 @@ VCard::_parse()
//qDebug("invalid vcard ");
return;
}
- l = QStringList::fromStrList( sl );
+ for(Q3StrList::iterator i=sl.begin();i!=sl.end();++i)
+ l.push_back(*i);
// Get the first line
QString beginLine = l[0].stripWhiteSpace();
@@ -180,7 +181,7 @@ VCard::_parse()
}
QStringList::Iterator it2 = refolded.begin();
for (; it2 != refolded.end(); ++it2) {
- ContentLine * cl = new ContentLine(QCString((*it2).latin1()));
+ ContentLine * cl = new ContentLine(Q3CString((*it2).latin1()));
cl->parse();
if (cl->value() == 0)
{
@@ -228,7 +229,7 @@ VCard::_assemble()
strRep_ = "BEGIN:VCARD\r\n";
strRep_ += "VERSION:3.0\r\n";
- QPtrListIterator<ContentLine> it(contentLineList_);
+ Q3PtrListIterator<ContentLine> it(contentLineList_);
for (; it.current(); ++it)
strRep_ += it.current()->asString() + "\r\n";
@@ -244,7 +245,7 @@ VCard::has(EntityType t)
}
bool
-VCard::has(const QCString & s)
+VCard::has(const Q3CString & s)
{
parse();
return contentLine(s) == 0 ? false : true;
@@ -259,7 +260,7 @@ VCard::add(const ContentLine & cl)
}
void
-VCard::add(const QCString & s)
+VCard::add(const Q3CString & s)
{
parse();
ContentLine * c = new ContentLine(s);
@@ -270,7 +271,7 @@ VCard::add(const QCString & s)
VCard::contentLine(EntityType t)
{
parse();
- QPtrListIterator<ContentLine> it(contentLineList_);
+ Q3PtrListIterator<ContentLine> it(contentLineList_);
for (; it.current(); ++it)
if (it.current()->entityType() == t)
@@ -280,10 +281,10 @@ VCard::contentLine(EntityType t)
}
ContentLine *
-VCard::contentLine(const QCString & s)
+VCard::contentLine(const Q3CString & s)
{
parse();
- QPtrListIterator<ContentLine> it(contentLineList_);
+ Q3PtrListIterator<ContentLine> it(contentLineList_);
for (; it.current(); ++it)
if (it.current()->entityType() == EntityNameToEntityType(s))
diff --git a/kabc/vcard/Value.cpp b/kabc/vcard/Value.cpp
index 1978af2..3a4d406 100644
--- a/kabc/vcard/Value.cpp
+++ b/kabc/vcard/Value.cpp
@@ -23,6 +23,8 @@
#include <VCardEntity.h>
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
using namespace VCARD;
@@ -36,7 +38,7 @@ Value::Value(const Value & x)
{
}
-Value::Value(const QCString & s)
+Value::Value(const Q3CString & s)
: Entity(s)
{
}
@@ -51,7 +53,7 @@ Value::operator = (Value & x)
}
Value &
-Value::operator = (const QCString & s)
+Value::operator = (const Q3CString & s)
{
Entity::operator = (s);
return *this;
diff --git a/kabc/vcard/include/VCardAdrParam.h b/kabc/vcard/include/VCardAdrParam.h
index 89dcb64..6456624 100644
--- a/kabc/vcard/include/VCardAdrParam.h
+++ b/kabc/vcard/include/VCardAdrParam.h
@@ -24,8 +24,8 @@
#ifndef ADRPARAM_H
#define ADRPARAM_H
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
#include <VCardParam.h>
@@ -37,16 +37,16 @@ class AdrParam : public Param
#include "AdrParam-generated.h"
- QStrList adrTypeList()
+ Q3StrList adrTypeList()
{ parse(); return adrTypeList_; }
- QCString textParam()
+ Q3CString textParam()
{ parse(); return textParam_; }
- void setAdrTypeList(const QStrList & l)
+ void setAdrTypeList(const Q3StrList & l)
{ adrTypeList_ = l; assembled_ = false; }
- void setTextParam(const QCString & s)
+ void setTextParam(const Q3CString & s)
{ textParam_ = s; assembled_ = false; }
enum AdrType {
@@ -56,8 +56,8 @@ class AdrParam : public Param
private:
- QStrList adrTypeList_;
- QCString textParam_;
+ Q3StrList adrTypeList_;
+ Q3CString textParam_;
};
}
diff --git a/kabc/vcard/include/VCardAdrValue.h b/kabc/vcard/include/VCardAdrValue.h
index 0731924..14ddb02 100644
--- a/kabc/vcard/include/VCardAdrValue.h
+++ b/kabc/vcard/include/VCardAdrValue.h
@@ -24,7 +24,9 @@
#ifndef ADRVALUE_H
#define ADRVALUE_H
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
#include <VCardValue.h>
namespace VCARD
@@ -37,44 +39,44 @@ class AdrValue : public Value
AdrValue *clone();
- void setPOBox(const QCString & s)
+ void setPOBox(const Q3CString & s)
{ poBox_ = s; assembled_ = false; }
- void setExtAddress(const QCString & s)
+ void setExtAddress(const Q3CString & s)
{ extAddress_ = s; assembled_ = false; }
- void setStreet(const QCString & s)
+ void setStreet(const Q3CString & s)
{ street_ = s; assembled_ = false; }
- void setLocality(const QCString & s)
+ void setLocality(const Q3CString & s)
{ locality_ = s; assembled_ = false; }
- void setRegion(const QCString & s)
+ void setRegion(const Q3CString & s)
{ region_ = s; assembled_ = false; }
- void setPostCode(const QCString & s)
+ void setPostCode(const Q3CString & s)
{ postCode_ = s; assembled_ = false; }
- void setCountryName(const QCString & s)
+ void setCountryName(const Q3CString & s)
{ countryName_ = s; assembled_ = false; }
- QCString poBox() { parse(); return poBox_; }
- QCString extAddress() { parse(); return extAddress_; }
- QCString street() { parse(); return street_; }
- QCString locality() { parse(); return locality_; }
- QCString region() { parse(); return region_; }
- QCString postCode() { parse(); return postCode_; }
- QCString countryName() { parse(); return countryName_; }
+ Q3CString poBox() { parse(); return poBox_; }
+ Q3CString extAddress() { parse(); return extAddress_; }
+ Q3CString street() { parse(); return street_; }
+ Q3CString locality() { parse(); return locality_; }
+ Q3CString region() { parse(); return region_; }
+ Q3CString postCode() { parse(); return postCode_; }
+ Q3CString countryName() { parse(); return countryName_; }
private:
- QCString poBox_;
- QCString extAddress_;
- QCString street_;
- QCString locality_;
- QCString region_;
- QCString postCode_;
- QCString countryName_;
+ Q3CString poBox_;
+ Q3CString extAddress_;
+ Q3CString street_;
+ Q3CString locality_;
+ Q3CString region_;
+ Q3CString postCode_;
+ Q3CString countryName_;
};
}
diff --git a/kabc/vcard/include/VCardAgentParam.h b/kabc/vcard/include/VCardAgentParam.h
index 72a05db..5733540 100644
--- a/kabc/vcard/include/VCardAgentParam.h
+++ b/kabc/vcard/include/VCardAgentParam.h
@@ -24,7 +24,7 @@
#ifndef AGENTPARAM_H
#define AGENTPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardParam.h>
#include <VCardURIValue.h>
@@ -46,7 +46,7 @@ class AgentParam : public Param
void setRefer(bool b)
{ refer_ = b; assembled_ = false; }
- void setURI(const QCString & s)
+ void setURI(const Q3CString & s)
{ uri_ = s; assembled_ = false; }
private:
diff --git a/kabc/vcard/include/VCardAgentValue.h b/kabc/vcard/include/VCardAgentValue.h
index f655836..b0d883b 100644
--- a/kabc/vcard/include/VCardAgentValue.h
+++ b/kabc/vcard/include/VCardAgentValue.h
@@ -24,7 +24,7 @@
#ifndef AGENTVALUE_H
#define AGENTVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardClassValue.h b/kabc/vcard/include/VCardClassValue.h
index ff133c2..c450169 100644
--- a/kabc/vcard/include/VCardClassValue.h
+++ b/kabc/vcard/include/VCardClassValue.h
@@ -24,7 +24,7 @@
#ifndef CLASSVALUE_H
#define CLASSVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardContentLine.h b/kabc/vcard/include/VCardContentLine.h
index 1c5f5be..c3c5253 100644
--- a/kabc/vcard/include/VCardContentLine.h
+++ b/kabc/vcard/include/VCardContentLine.h
@@ -24,7 +24,9 @@
#ifndef CONTENTLINE_H
#define CONTENTLINE_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
#include "VCardEnum.h"
#include "VCardEntity.h"
@@ -39,18 +41,18 @@ class ContentLine : public Entity
#include "ContentLine-generated.h"
- QCString group() { parse(); return group_; }
- QCString name() { parse(); return name_; }
+ Q3CString group() { parse(); return group_; }
+ Q3CString name() { parse(); return name_; }
Value * value() { parse(); return value_; }
ParamList paramList() { parse(); return paramList_; }
ParamType paramType() { parse(); return paramType_; }
ValueType valueType() { parse(); return valueType_; }
EntityType entityType() { parse(); return entityType_; }
- void setGroup (const QCString & s)
+ void setGroup (const Q3CString & s)
{ group_ = s; assembled_ = false; }
- void setName (const QCString & s)
+ void setName (const Q3CString & s)
{ name_ = s; assembled_ = false; }
void setValue (Value *s)
@@ -63,9 +65,9 @@ class ContentLine : public Entity
private:
- QCString group_;
- QCString name_;
- QPtrList<Param> paramList_;
+ Q3CString group_;
+ Q3CString name_;
+ Q3PtrList<Param> paramList_;
Value * value_;
ParamType paramType_;
diff --git a/kabc/vcard/include/VCardDateParam.h b/kabc/vcard/include/VCardDateParam.h
index 21ac1f1..959b75b 100644
--- a/kabc/vcard/include/VCardDateParam.h
+++ b/kabc/vcard/include/VCardDateParam.h
@@ -24,7 +24,7 @@
#ifndef DATEPARAM_H
#define DATEPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardParam.h>
diff --git a/kabc/vcard/include/VCardDateValue.h b/kabc/vcard/include/VCardDateValue.h
index c248966..fc216c0 100644
--- a/kabc/vcard/include/VCardDateValue.h
+++ b/kabc/vcard/include/VCardDateValue.h
@@ -24,7 +24,7 @@
#ifndef DATEVALUE_H
#define DATEVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <qdatetime.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardDefines.h b/kabc/vcard/include/VCardDefines.h
index 557410f..5d4f2f4 100644
--- a/kabc/vcard/include/VCardDefines.h
+++ b/kabc/vcard/include/VCardDefines.h
@@ -35,14 +35,14 @@
#if 0
#ifndef NDEBUG
-# include <qcstring.h>
+# include <q3cstring.h>
# include <iostream>
# ifdef __GNUG__
# define vDebug(a) cerr << className() << ":" << __FUNCTION__ << " (" \
- << __LINE__ << "): " << QCString((a)).data() << endl;
+ << __LINE__ << "): " << Q3CString((a)).data() << endl;
# else
# define vDebug(a) cerr << className() << ": " \
- << QCString((a)).data() << endl;
+ << Q3CString((a)).data() << endl;
# endif
#else
# define vDebug(a)
diff --git a/kabc/vcard/include/VCardEmailParam.h b/kabc/vcard/include/VCardEmailParam.h
index 98d1b30..ff07324 100644
--- a/kabc/vcard/include/VCardEmailParam.h
+++ b/kabc/vcard/include/VCardEmailParam.h
@@ -24,7 +24,7 @@
#ifndef EMAILPARAM_H
#define EMAILPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardParam.h>
@@ -36,10 +36,10 @@ class EmailParam : public Param
#include "EmailParam-generated.h"
- QCString emailType() { parse(); return emailType_; }
+ Q3CString emailType() { parse(); return emailType_; }
bool pref() { parse(); return pref_; }
- void setEmailType(const QCString & s)
+ void setEmailType(const Q3CString & s)
{ emailType_ = s; assembled_ = false; }
void setPref(bool b)
@@ -47,7 +47,7 @@ class EmailParam : public Param
private:
- QCString emailType_;
+ Q3CString emailType_;
bool pref_;
};
diff --git a/kabc/vcard/include/VCardEntity.h b/kabc/vcard/include/VCardEntity.h
index 3c945b5..1a3d20f 100644
--- a/kabc/vcard/include/VCardEntity.h
+++ b/kabc/vcard/include/VCardEntity.h
@@ -24,7 +24,7 @@
#ifndef ENTITY_H
#define ENTITY_H
-#include <qcstring.h>
+#include <q3cstring.h>
namespace VCARD
{
@@ -35,19 +35,19 @@ class Entity
Entity();
Entity(const Entity & e);
- Entity(const QCString & s);
+ Entity(const Q3CString & s);
virtual Entity & operator = (const Entity & e);
- virtual Entity & operator = (const QCString & s);
+ virtual Entity & operator = (const Q3CString & s);
virtual bool operator == (Entity & e);
virtual bool operator != (Entity & e);
- virtual bool operator == (const QCString & s);
- virtual bool operator != (const QCString & s);
+ virtual bool operator == (const Q3CString & s);
+ virtual bool operator != (const Q3CString & s);
virtual ~Entity();
- QCString asString();
+ Q3CString asString();
virtual void parse();
virtual void assemble();
@@ -57,7 +57,7 @@ class Entity
protected:
- QCString strRep_;
+ Q3CString strRep_;
bool parsed_;
bool assembled_;
};
diff --git a/kabc/vcard/include/VCardEnum.h b/kabc/vcard/include/VCardEnum.h
index b4e4094..0c35e5e 100644
--- a/kabc/vcard/include/VCardEnum.h
+++ b/kabc/vcard/include/VCardEnum.h
@@ -24,12 +24,12 @@
#ifndef ENUM_H
#define ENUM_H
-#include <qcstring.h>
+#include <q3cstring.h>
namespace VCARD
{
-extern const QCString paramNames [];
+extern const Q3CString paramNames [];
enum EntityType {
EntityName,
@@ -108,8 +108,8 @@ extern const ParamType paramTypesTable[];
ParamType EntityTypeToParamType(EntityType);
ValueType EntityTypeToValueType(EntityType);
-QCString EntityTypeToParamName(EntityType);
-EntityType EntityNameToEntityType(const QCString &);
+Q3CString EntityTypeToParamName(EntityType);
+EntityType EntityNameToEntityType(const Q3CString &);
char * encodeBase64(const char *, unsigned long, unsigned long &);
char * decodeBase64(const char *, unsigned long, unsigned long &);
diff --git a/kabc/vcard/include/VCardFloatValue.h b/kabc/vcard/include/VCardFloatValue.h
index 69fdc22..cac7a91 100644
--- a/kabc/vcard/include/VCardFloatValue.h
+++ b/kabc/vcard/include/VCardFloatValue.h
@@ -24,7 +24,7 @@
#ifndef FLOATVALUE_H
#define FLOATVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardImageParam.h b/kabc/vcard/include/VCardImageParam.h
index ce99ccc..2785331 100644
--- a/kabc/vcard/include/VCardImageParam.h
+++ b/kabc/vcard/include/VCardImageParam.h
@@ -24,7 +24,7 @@
#ifndef IMGPARAM_H
#define IMGPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardParam.h>
diff --git a/kabc/vcard/include/VCardImageValue.h b/kabc/vcard/include/VCardImageValue.h
index 6ce0371..3b64731 100644
--- a/kabc/vcard/include/VCardImageValue.h
+++ b/kabc/vcard/include/VCardImageValue.h
@@ -24,7 +24,7 @@
#ifndef IMAGEVALUE_H
#define IMAGEVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardLangValue.h b/kabc/vcard/include/VCardLangValue.h
index 991ceed..319de76 100644
--- a/kabc/vcard/include/VCardLangValue.h
+++ b/kabc/vcard/include/VCardLangValue.h
@@ -24,8 +24,8 @@
#ifndef LANGVALUE_H
#define LANGVALUE_H
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
#include <VCardValue.h>
@@ -36,14 +36,14 @@ class LangValue : public Value
{
#include "LangValue-generated.h"
- QCString primary();
- QStrList subtags();
+ Q3CString primary();
+ Q3StrList subtags();
- void setPrimary(const QCString &);
- void setSubTags(const QStrList &);
+ void setPrimary(const Q3CString &);
+ void setSubTags(const Q3StrList &);
- QCString primary_;
- QStrList subtags_;
+ Q3CString primary_;
+ Q3StrList subtags_;
};
}
diff --git a/kabc/vcard/include/VCardNValue.h b/kabc/vcard/include/VCardNValue.h
index 306821b..ffc5355 100644
--- a/kabc/vcard/include/VCardNValue.h
+++ b/kabc/vcard/include/VCardNValue.h
@@ -25,6 +25,8 @@
#define NVALUE_H
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
namespace VCARD
{
@@ -34,21 +36,21 @@ class NValue : public Value
#include "NValue-generated.h"
NValue *clone();
- QCString family() { parse(); return family_; }
- QCString given() { parse(); return given_; }
- QCString middle() { parse(); return middle_; }
- QCString prefix() { parse(); return prefix_; }
- QCString suffix() { parse(); return suffix_; }
+ Q3CString family() { parse(); return family_; }
+ Q3CString given() { parse(); return given_; }
+ Q3CString middle() { parse(); return middle_; }
+ Q3CString prefix() { parse(); return prefix_; }
+ Q3CString suffix() { parse(); return suffix_; }
- void setFamily (const QCString & s) { family_ = s; assembled_ = false; }
- void setGiven (const QCString & s) { given_ = s; assembled_ = false; }
- void setMiddle (const QCString & s) { middle_ = s; assembled_ = false; }
- void setPrefix (const QCString & s) { prefix_ = s; assembled_ = false; }
- void setSuffix (const QCString & s) { suffix_ = s; assembled_ = false; }
+ void setFamily (const Q3CString & s) { family_ = s; assembled_ = false; }
+ void setGiven (const Q3CString & s) { given_ = s; assembled_ = false; }
+ void setMiddle (const Q3CString & s) { middle_ = s; assembled_ = false; }
+ void setPrefix (const Q3CString & s) { prefix_ = s; assembled_ = false; }
+ void setSuffix (const Q3CString & s) { suffix_ = s; assembled_ = false; }
private:
- QCString family_, given_, middle_, prefix_, suffix_;
+ Q3CString family_, given_, middle_, prefix_, suffix_;
};
}
diff --git a/kabc/vcard/include/VCardOrgValue.h b/kabc/vcard/include/VCardOrgValue.h
index c4f3f25..2e5d32f 100644
--- a/kabc/vcard/include/VCardOrgValue.h
+++ b/kabc/vcard/include/VCardOrgValue.h
@@ -24,8 +24,8 @@
#ifndef ORGVALUE_H
#define ORGVALUE_H
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
#include <VCardValue.h>
@@ -38,11 +38,11 @@ class OrgValue : public Value
#include "OrgValue-generated.h"
unsigned int numValues();
- QCString value(unsigned int);
+ Q3CString value(unsigned int);
private:
- QStrList valueList_;
+ Q3StrList valueList_;
};
}
diff --git a/kabc/vcard/include/VCardParam.h b/kabc/vcard/include/VCardParam.h
index b61ce5c..b83fde1 100644
--- a/kabc/vcard/include/VCardParam.h
+++ b/kabc/vcard/include/VCardParam.h
@@ -24,8 +24,8 @@
#ifndef PARAM_H
#define PARAM_H
-#include <qcstring.h>
-#include <qptrlist.h>
+#include <q3cstring.h>
+#include <q3ptrlist.h>
#include <VCardEntity.h>
@@ -37,22 +37,22 @@ class Param : public Entity
#include "Param-generated.h"
- Param(const QCString &name, const QCString &value);
+ Param(const Q3CString &name, const Q3CString &value);
- void setName(const QCString &);
- void setValue(const QCString &);
+ void setName(const Q3CString &);
+ void setValue(const Q3CString &);
- QCString name();
- QCString value();
+ Q3CString name();
+ Q3CString value();
private:
- QCString name_;
- QCString value_;
+ Q3CString name_;
+ Q3CString value_;
};
-typedef QPtrList<Param> ParamList;
-typedef QPtrListIterator<Param> ParamListIterator;
+typedef Q3PtrList<Param> ParamList;
+typedef Q3PtrListIterator<Param> ParamListIterator;
}
diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h
index 2f95f1b..4a5adb2 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -25,12 +25,12 @@
#ifndef RTOKEN_H
#define RTOKEN_H
-#include <qstrlist.h>
+#include <q3strlist.h>
namespace VCARD
{
-Q_UINT32 RTokenise(const char * str, const char * delim, QStrList & l);
+Q_UINT32 RTokenise(const char * str, const char * delim, Q3StrList & l);
}
diff --git a/kabc/vcard/include/VCardSoundValue.h b/kabc/vcard/include/VCardSoundValue.h
index 994f55e..26f750b 100644
--- a/kabc/vcard/include/VCardSoundValue.h
+++ b/kabc/vcard/include/VCardSoundValue.h
@@ -24,7 +24,7 @@
#ifndef SOUNDVALUE_H
#define SOUNDVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardSourceParam.h b/kabc/vcard/include/VCardSourceParam.h
index 887ea20..5218864 100644
--- a/kabc/vcard/include/VCardSourceParam.h
+++ b/kabc/vcard/include/VCardSourceParam.h
@@ -24,7 +24,7 @@
#ifndef SOURCEPARAM_H
#define SOURCEPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardParam.h>
@@ -39,18 +39,18 @@ class SourceParam : public Param
enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
SourceParamType type() { parse(); return type_;}
- QCString par() { parse(); return par_; }
- QCString val() { parse(); return val_; }
+ Q3CString par() { parse(); return par_; }
+ Q3CString val() { parse(); return val_; }
void setType(SourceParamType t) { type_ = t; assembled_ = false; }
- void setPar(const QCString & s) { par_ = s; assembled_ = false; }
- void setVal(const QCString & s) { val_ = s; assembled_ = false; }
+ void setPar(const Q3CString & s) { par_ = s; assembled_ = false; }
+ void setVal(const Q3CString & s) { val_ = s; assembled_ = false; }
private:
SourceParamType type_;
// May be "VALUE = uri" or "CONTEXT = word" or "x-name = *SAFE-CHAR"
- QCString par_, val_; // Sub-parameter, value
+ Q3CString par_, val_; // Sub-parameter, value
};
}
diff --git a/kabc/vcard/include/VCardTelParam.h b/kabc/vcard/include/VCardTelParam.h
index 27d7dcc..0c45a3a 100644
--- a/kabc/vcard/include/VCardTelParam.h
+++ b/kabc/vcard/include/VCardTelParam.h
@@ -24,7 +24,9 @@
#ifndef TELPARAM_H
#define TELPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
#include <VCardParam.h>
@@ -43,7 +45,7 @@ class TelParam : public Param
private:
- QPtrList<TelType> types_;
+ Q3PtrList<TelType> types_;
};
}
diff --git a/kabc/vcard/include/VCardTelValue.h b/kabc/vcard/include/VCardTelValue.h
index 9cf5a98..a119e4a 100644
--- a/kabc/vcard/include/VCardTelValue.h
+++ b/kabc/vcard/include/VCardTelValue.h
@@ -24,7 +24,7 @@
#ifndef TELVALUE_H
#define TELVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardTextBinParam.h b/kabc/vcard/include/VCardTextBinParam.h
index 31dec86..d186995 100644
--- a/kabc/vcard/include/VCardTextBinParam.h
+++ b/kabc/vcard/include/VCardTextBinParam.h
@@ -24,7 +24,7 @@
#ifndef TEXTBINPARAM_H
#define TEXTBINPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardParam.h>
diff --git a/kabc/vcard/include/VCardTextBinValue.h b/kabc/vcard/include/VCardTextBinValue.h
index 8d44fdf..3924f2a 100644
--- a/kabc/vcard/include/VCardTextBinValue.h
+++ b/kabc/vcard/include/VCardTextBinValue.h
@@ -24,7 +24,7 @@
#ifndef TEXTBINVALUE_H
#define TEXTBINVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardTextListValue.h b/kabc/vcard/include/VCardTextListValue.h
index 8e47af5..ac42a29 100644
--- a/kabc/vcard/include/VCardTextListValue.h
+++ b/kabc/vcard/include/VCardTextListValue.h
@@ -24,9 +24,9 @@
#ifndef TEXTLISTVALUE_H
#define TEXTLISTVALUE_H
-#include <qstrlist.h>
+#include <q3strlist.h>
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
@@ -39,11 +39,11 @@ class TextListValue : public Value
#include "TextListValue-generated.h"
unsigned int numValues();
- QCString value(unsigned int);
+ Q3CString value(unsigned int);
private:
- QStrList valueList_;
+ Q3StrList valueList_;
};
}
diff --git a/kabc/vcard/include/VCardTextParam.h b/kabc/vcard/include/VCardTextParam.h
index 08b5f57..2503337 100644
--- a/kabc/vcard/include/VCardTextParam.h
+++ b/kabc/vcard/include/VCardTextParam.h
@@ -24,7 +24,7 @@
#ifndef TEXTPARAM_H
#define TEXTPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardParam.h>
diff --git a/kabc/vcard/include/VCardURIValue.h b/kabc/vcard/include/VCardURIValue.h
index 5fd7184..116e4c8 100644
--- a/kabc/vcard/include/VCardURIValue.h
+++ b/kabc/vcard/include/VCardURIValue.h
@@ -25,6 +25,8 @@
#define URIVALUE_H
#include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
namespace VCARD
{
@@ -33,18 +35,18 @@ class URIValue : public Value
{
#include "URIValue-generated.h"
- URIValue(const QCString & scheme, const QCString & schemeSpecificPart);
+ URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart);
- QCString scheme();
- QCString schemeSpecificPart();
+ Q3CString scheme();
+ Q3CString schemeSpecificPart();
- void setScheme (const QCString &);
- void setSchemeSpecificPart (const QCString &);
+ void setScheme (const Q3CString &);
+ void setSchemeSpecificPart (const Q3CString &);
private:
- QCString scheme_;
- QCString schemeSpecificPart_;
+ Q3CString scheme_;
+ Q3CString schemeSpecificPart_;
};
}
diff --git a/kabc/vcard/include/VCardUTCValue.h b/kabc/vcard/include/VCardUTCValue.h
index ff695e0..eb69829 100644
--- a/kabc/vcard/include/VCardUTCValue.h
+++ b/kabc/vcard/include/VCardUTCValue.h
@@ -24,7 +24,7 @@
#ifndef UTCVALUE_H
#define UTCVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardVCard.h b/kabc/vcard/include/VCardVCard.h
index 5dec166..5b66074 100644
--- a/kabc/vcard/include/VCardVCard.h
+++ b/kabc/vcard/include/VCardVCard.h
@@ -25,7 +25,9 @@
#define VCARD_VCARD_H
#include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
#include <VCardEnum.h>
#include <VCardEntity.h>
@@ -40,22 +42,22 @@ class VCard : public Entity
#include "VCard-generated.h"
bool has(EntityType);
- bool has(const QCString &);
+ bool has(const Q3CString &);
void add(const ContentLine &);
- void add(const QCString &);
+ void add(const Q3CString &);
ContentLine * contentLine(EntityType);
- ContentLine * contentLine(const QCString &);
+ ContentLine * contentLine(const Q3CString &);
- QCString group() { parse(); return group_; }
+ Q3CString group() { parse(); return group_; }
- QPtrList<ContentLine> contentLineList() { parse(); return contentLineList_; }
+ Q3PtrList<ContentLine> contentLineList() { parse(); return contentLineList_; }
private:
- QCString group_;
- QPtrList<ContentLine> contentLineList_;
+ Q3CString group_;
+ Q3PtrList<ContentLine> contentLineList_;
};
}
diff --git a/kabc/vcard/include/VCardVCardEntity.h b/kabc/vcard/include/VCardVCardEntity.h
index 47ba370..8c824e7 100644
--- a/kabc/vcard/include/VCardVCardEntity.h
+++ b/kabc/vcard/include/VCardVCardEntity.h
@@ -25,7 +25,7 @@
#define VCARD_ENTITY_H
#include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
#include <VCardEnum.h>
#include <VCardVCard.h>
@@ -34,8 +34,8 @@
namespace VCARD
{
-typedef QPtrList<VCard> VCardList;
-typedef QPtrListIterator<VCard> VCardListIterator;
+typedef Q3PtrList<VCard> VCardList;
+typedef Q3PtrListIterator<VCard> VCardListIterator;
class VCardEntity : public Entity
{
diff --git a/kabc/vcard/include/VCardValue.h b/kabc/vcard/include/VCardValue.h
index 7cfe4a0..024397c 100644
--- a/kabc/vcard/include/VCardValue.h
+++ b/kabc/vcard/include/VCardValue.h
@@ -24,7 +24,7 @@
#ifndef VALUE_H
#define VALUE_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
#include <VCardEntity.h>
@@ -38,8 +38,8 @@ class Value : public Entity
virtual Value *clone() { return new Value( *this ); }
};
-typedef QPtrList<Value> ValueList;
-typedef QPtrListIterator<Value> ValueListIterator;
+typedef Q3PtrList<Value> ValueList;
+typedef Q3PtrListIterator<Value> ValueListIterator;
}
diff --git a/kabc/vcard/include/generated/AdrParam-generated.h b/kabc/vcard/include/generated/AdrParam-generated.h
index 3e265d8..a11d142 100644
--- a/kabc/vcard/include/generated/AdrParam-generated.h
+++ b/kabc/vcard/include/generated/AdrParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
AdrParam();
AdrParam(const AdrParam&);
-AdrParam(const QCString&);
+AdrParam(const Q3CString&);
AdrParam & operator = (AdrParam&);
-AdrParam & operator = (const QCString&);
+AdrParam & operator = (const Q3CString&);
bool operator ==(AdrParam&);
bool operator !=(AdrParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AdrParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AdrParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~AdrParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/AdrValue-generated.h b/kabc/vcard/include/generated/AdrValue-generated.h
index e1d93e4..c0a33a3 100644
--- a/kabc/vcard/include/generated/AdrValue-generated.h
+++ b/kabc/vcard/include/generated/AdrValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
AdrValue();
AdrValue(const AdrValue&);
-AdrValue(const QCString&);
+AdrValue(const Q3CString&);
AdrValue & operator = (AdrValue&);
-AdrValue & operator = (const QCString&);
+AdrValue & operator = (const Q3CString&);
bool operator ==(AdrValue&);
bool operator !=(AdrValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AdrValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AdrValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~AdrValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/AgentParam-generated.h b/kabc/vcard/include/generated/AgentParam-generated.h
index 6423867..d5ed988 100644
--- a/kabc/vcard/include/generated/AgentParam-generated.h
+++ b/kabc/vcard/include/generated/AgentParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
AgentParam();
AgentParam(const AgentParam&);
-AgentParam(const QCString&);
+AgentParam(const Q3CString&);
AgentParam & operator = (AgentParam&);
-AgentParam & operator = (const QCString&);
+AgentParam & operator = (const Q3CString&);
bool operator ==(AgentParam&);
bool operator !=(AgentParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AgentParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AgentParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~AgentParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/AgentValue-generated.h b/kabc/vcard/include/generated/AgentValue-generated.h
index 76bb81c..eef5277 100644
--- a/kabc/vcard/include/generated/AgentValue-generated.h
+++ b/kabc/vcard/include/generated/AgentValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
AgentValue();
AgentValue(const AgentValue&);
-AgentValue(const QCString&);
+AgentValue(const Q3CString&);
AgentValue & operator = (AgentValue&);
-AgentValue & operator = (const QCString&);
+AgentValue & operator = (const Q3CString&);
bool operator ==(AgentValue&);
bool operator !=(AgentValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AgentValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AgentValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~AgentValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/ClassValue-generated.h b/kabc/vcard/include/generated/ClassValue-generated.h
index df4ed5f..b84c98f 100644
--- a/kabc/vcard/include/generated/ClassValue-generated.h
+++ b/kabc/vcard/include/generated/ClassValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
ClassValue();
ClassValue(const ClassValue&);
-ClassValue(const QCString&);
+ClassValue(const Q3CString&);
ClassValue & operator = (ClassValue&);
-ClassValue & operator = (const QCString&);
+ClassValue & operator = (const Q3CString&);
bool operator ==(ClassValue&);
bool operator !=(ClassValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ClassValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ClassValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~ClassValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/ContentLine-generated.h b/kabc/vcard/include/generated/ContentLine-generated.h
index 9efe273..84d0822 100644
--- a/kabc/vcard/include/generated/ContentLine-generated.h
+++ b/kabc/vcard/include/generated/ContentLine-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
ContentLine();
ContentLine(const ContentLine&);
-ContentLine(const QCString&);
+ContentLine(const Q3CString&);
ContentLine & operator = (ContentLine&);
-ContentLine & operator = (const QCString&);
+ContentLine & operator = (const Q3CString&);
bool operator ==(ContentLine&);
bool operator !=(ContentLine& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ContentLine a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ContentLine a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~ContentLine();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/DateParam-generated.h b/kabc/vcard/include/generated/DateParam-generated.h
index ff1da58..029c1da 100644
--- a/kabc/vcard/include/generated/DateParam-generated.h
+++ b/kabc/vcard/include/generated/DateParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
DateParam();
DateParam(const DateParam&);
-DateParam(const QCString&);
+DateParam(const Q3CString&);
DateParam & operator = (DateParam&);
-DateParam & operator = (const QCString&);
+DateParam & operator = (const Q3CString&);
bool operator ==(DateParam&);
bool operator !=(DateParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {DateParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {DateParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~DateParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/DateValue-generated.h b/kabc/vcard/include/generated/DateValue-generated.h
index a382823..70eecce 100644
--- a/kabc/vcard/include/generated/DateValue-generated.h
+++ b/kabc/vcard/include/generated/DateValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
DateValue();
DateValue(const DateValue&);
-DateValue(const QCString&);
+DateValue(const Q3CString&);
DateValue & operator = (DateValue&);
-DateValue & operator = (const QCString&);
+DateValue & operator = (const Q3CString&);
bool operator ==(DateValue&);
bool operator !=(DateValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {DateValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {DateValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~DateValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/EmailParam-generated.h b/kabc/vcard/include/generated/EmailParam-generated.h
index 428a6fc..f498931 100644
--- a/kabc/vcard/include/generated/EmailParam-generated.h
+++ b/kabc/vcard/include/generated/EmailParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
EmailParam();
EmailParam(const EmailParam&);
-EmailParam(const QCString&);
+EmailParam(const Q3CString&);
EmailParam & operator = (EmailParam&);
-EmailParam & operator = (const QCString&);
+EmailParam & operator = (const Q3CString&);
bool operator ==(EmailParam&);
bool operator !=(EmailParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {EmailParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {EmailParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~EmailParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/FloatValue-generated.h b/kabc/vcard/include/generated/FloatValue-generated.h
index cac55cf..c04b85f 100644
--- a/kabc/vcard/include/generated/FloatValue-generated.h
+++ b/kabc/vcard/include/generated/FloatValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
FloatValue();
FloatValue(const FloatValue&);
-FloatValue(const QCString&);
+FloatValue(const Q3CString&);
FloatValue & operator = (FloatValue&);
-FloatValue & operator = (const QCString&);
+FloatValue & operator = (const Q3CString&);
bool operator ==(FloatValue&);
bool operator !=(FloatValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {FloatValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {FloatValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~FloatValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/GeoValue-generated.h b/kabc/vcard/include/generated/GeoValue-generated.h
index 594f3ad..ab659bf 100644
--- a/kabc/vcard/include/generated/GeoValue-generated.h
+++ b/kabc/vcard/include/generated/GeoValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
GeoValue();
GeoValue(const GeoValue&);
-GeoValue(const QCString&);
+GeoValue(const Q3CString&);
GeoValue & operator = (GeoValue&);
-GeoValue & operator = (const QCString&);
+GeoValue & operator = (const Q3CString&);
bool operator ==(GeoValue&);
bool operator !=(GeoValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {GeoValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {GeoValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~GeoValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/Group-generated.h b/kabc/vcard/include/generated/Group-generated.h
index f39302d..ae16e3d 100644
--- a/kabc/vcard/include/generated/Group-generated.h
+++ b/kabc/vcard/include/generated/Group-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
Group();
Group(const Group&);
-Group(const QCString&);
+Group(const Q3CString&);
Group & operator = (Group&);
-Group & operator = (const QCString&);
+Group & operator = (const Q3CString&);
bool operator ==(Group&);
bool operator !=(Group& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Group a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Group a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~Group();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/ImageParam-generated.h b/kabc/vcard/include/generated/ImageParam-generated.h
index 81edfd2..91b09a4 100644
--- a/kabc/vcard/include/generated/ImageParam-generated.h
+++ b/kabc/vcard/include/generated/ImageParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
ImageParam();
ImageParam(const ImageParam&);
-ImageParam(const QCString&);
+ImageParam(const Q3CString&);
ImageParam & operator = (ImageParam&);
-ImageParam & operator = (const QCString&);
+ImageParam & operator = (const Q3CString&);
bool operator ==(ImageParam&);
bool operator !=(ImageParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImageParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImageParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~ImageParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/ImageValue-generated.h b/kabc/vcard/include/generated/ImageValue-generated.h
index 5a2c493..d71282e 100644
--- a/kabc/vcard/include/generated/ImageValue-generated.h
+++ b/kabc/vcard/include/generated/ImageValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
ImageValue();
ImageValue(const ImageValue&);
-ImageValue(const QCString&);
+ImageValue(const Q3CString&);
ImageValue & operator = (ImageValue&);
-ImageValue & operator = (const QCString&);
+ImageValue & operator = (const Q3CString&);
bool operator ==(ImageValue&);
bool operator !=(ImageValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImageValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImageValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~ImageValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/ImgParam-generated.h b/kabc/vcard/include/generated/ImgParam-generated.h
index 46a6ca0..461ca6d 100644
--- a/kabc/vcard/include/generated/ImgParam-generated.h
+++ b/kabc/vcard/include/generated/ImgParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
ImgParam();
ImgParam(const ImgParam&);
-ImgParam(const QCString&);
+ImgParam(const Q3CString&);
ImgParam & operator = (ImgParam&);
-ImgParam & operator = (const QCString&);
+ImgParam & operator = (const Q3CString&);
bool operator ==(ImgParam&);
bool operator !=(ImgParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImgParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImgParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~ImgParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/ImgValue-generated.h b/kabc/vcard/include/generated/ImgValue-generated.h
index d75d545..80ee646 100644
--- a/kabc/vcard/include/generated/ImgValue-generated.h
+++ b/kabc/vcard/include/generated/ImgValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
ImgValue();
ImgValue(const ImgValue&);
-ImgValue(const QCString&);
+ImgValue(const Q3CString&);
ImgValue & operator = (ImgValue&);
-ImgValue & operator = (const QCString&);
+ImgValue & operator = (const Q3CString&);
bool operator ==(ImgValue&);
bool operator !=(ImgValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImgValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImgValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~ImgValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/LangValue-generated.h b/kabc/vcard/include/generated/LangValue-generated.h
index 23e138b..434f762 100644
--- a/kabc/vcard/include/generated/LangValue-generated.h
+++ b/kabc/vcard/include/generated/LangValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
LangValue();
LangValue(const LangValue&);
-LangValue(const QCString&);
+LangValue(const Q3CString&);
LangValue & operator = (LangValue&);
-LangValue & operator = (const QCString&);
+LangValue & operator = (const Q3CString&);
bool operator ==(LangValue&);
bool operator !=(LangValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {LangValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {LangValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~LangValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/NValue-generated.h b/kabc/vcard/include/generated/NValue-generated.h
index 082c253..086810f 100644
--- a/kabc/vcard/include/generated/NValue-generated.h
+++ b/kabc/vcard/include/generated/NValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
NValue();
NValue(const NValue&);
-NValue(const QCString&);
+NValue(const Q3CString&);
NValue & operator = (NValue&);
-NValue & operator = (const QCString&);
+NValue & operator = (const Q3CString&);
bool operator ==(NValue&);
bool operator !=(NValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {NValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {NValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~NValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/Name-generated.h b/kabc/vcard/include/generated/Name-generated.h
index 0e69abd..a3bcb25 100644
--- a/kabc/vcard/include/generated/Name-generated.h
+++ b/kabc/vcard/include/generated/Name-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
V_Name();
V_Name(const V_Name&);
-V_Name(const QCString&);
+V_Name(const Q3CString&);
V_Name & operator = (V_Name&);
-V_Name & operator = (const QCString&);
+V_Name & operator = (const Q3CString&);
bool operator ==(V_Name&);
bool operator !=(V_Name& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_Name a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_Name a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~V_Name();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/OrgValue-generated.h b/kabc/vcard/include/generated/OrgValue-generated.h
index 51eb1b7..275f56f 100644
--- a/kabc/vcard/include/generated/OrgValue-generated.h
+++ b/kabc/vcard/include/generated/OrgValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
OrgValue();
OrgValue(const OrgValue&);
-OrgValue(const QCString&);
+OrgValue(const Q3CString&);
OrgValue & operator = (OrgValue&);
-OrgValue & operator = (const QCString&);
+OrgValue & operator = (const Q3CString&);
bool operator ==(OrgValue&);
bool operator !=(OrgValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {OrgValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {OrgValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~OrgValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/Param-generated.h b/kabc/vcard/include/generated/Param-generated.h
index cf4666a..1a35166 100644
--- a/kabc/vcard/include/generated/Param-generated.h
+++ b/kabc/vcard/include/generated/Param-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
Param();
Param(const Param&);
-Param(const QCString&);
+Param(const Q3CString&);
Param & operator = (Param&);
-Param & operator = (const QCString&);
+Param & operator = (const Q3CString&);
bool operator ==(Param&);
bool operator !=(Param& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Param a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Param a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~Param();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/ParamName-generated.h b/kabc/vcard/include/generated/ParamName-generated.h
index ef673c3..b45022e 100644
--- a/kabc/vcard/include/generated/ParamName-generated.h
+++ b/kabc/vcard/include/generated/ParamName-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
V_ParamName();
V_ParamName(const V_ParamName&);
-V_ParamName(const QCString&);
+V_ParamName(const Q3CString&);
V_ParamName & operator = (V_ParamName&);
-V_ParamName & operator = (const QCString&);
+V_ParamName & operator = (const Q3CString&);
bool operator ==(V_ParamName&);
bool operator !=(V_ParamName& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_ParamName a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_ParamName a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~V_ParamName();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/ParamValue-generated.h b/kabc/vcard/include/generated/ParamValue-generated.h
index e73500f..956c8da 100644
--- a/kabc/vcard/include/generated/ParamValue-generated.h
+++ b/kabc/vcard/include/generated/ParamValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
V_ParamValue();
V_ParamValue(const V_ParamValue&);
-V_ParamValue(const QCString&);
+V_ParamValue(const Q3CString&);
V_ParamValue & operator = (V_ParamValue&);
-V_ParamValue & operator = (const QCString&);
+V_ParamValue & operator = (const Q3CString&);
bool operator ==(V_ParamValue&);
bool operator !=(V_ParamValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_ParamValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_ParamValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~V_ParamValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/PhoneNumberValue-generated.h b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
index 1320f18..0d206f4 100644
--- a/kabc/vcard/include/generated/PhoneNumberValue-generated.h
+++ b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
PhoneNumberValue();
PhoneNumberValue(const PhoneNumberValue&);
-PhoneNumberValue(const QCString&);
+PhoneNumberValue(const Q3CString&);
PhoneNumberValue & operator = (PhoneNumberValue&);
-PhoneNumberValue & operator = (const QCString&);
+PhoneNumberValue & operator = (const Q3CString&);
bool operator ==(PhoneNumberValue&);
bool operator !=(PhoneNumberValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {PhoneNumberValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {PhoneNumberValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~PhoneNumberValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/SoundValue-generated.h b/kabc/vcard/include/generated/SoundValue-generated.h
index a9ab2e8..2cc9c0d 100644
--- a/kabc/vcard/include/generated/SoundValue-generated.h
+++ b/kabc/vcard/include/generated/SoundValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
SoundValue();
SoundValue(const SoundValue&);
-SoundValue(const QCString&);
+SoundValue(const Q3CString&);
SoundValue & operator = (SoundValue&);
-SoundValue & operator = (const QCString&);
+SoundValue & operator = (const Q3CString&);
bool operator ==(SoundValue&);
bool operator !=(SoundValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {SoundValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {SoundValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~SoundValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/SourceParam-generated.h b/kabc/vcard/include/generated/SourceParam-generated.h
index 75fefb8..537e093 100644
--- a/kabc/vcard/include/generated/SourceParam-generated.h
+++ b/kabc/vcard/include/generated/SourceParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
SourceParam();
SourceParam(const SourceParam&);
-SourceParam(const QCString&);
+SourceParam(const Q3CString&);
SourceParam & operator = (SourceParam&);
-SourceParam & operator = (const QCString&);
+SourceParam & operator = (const Q3CString&);
bool operator ==(SourceParam&);
bool operator !=(SourceParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {SourceParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {SourceParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~SourceParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/TelParam-generated.h b/kabc/vcard/include/generated/TelParam-generated.h
index 3ee77cc..8d9ba0f 100644
--- a/kabc/vcard/include/generated/TelParam-generated.h
+++ b/kabc/vcard/include/generated/TelParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
TelParam();
TelParam(const TelParam&);
-TelParam(const QCString&);
+TelParam(const Q3CString&);
TelParam & operator = (TelParam&);
-TelParam & operator = (const QCString&);
+TelParam & operator = (const Q3CString&);
bool operator ==(TelParam&);
bool operator !=(TelParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TelParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TelParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~TelParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/TelValue-generated.h b/kabc/vcard/include/generated/TelValue-generated.h
index 3213e1c..b72fa7d 100644
--- a/kabc/vcard/include/generated/TelValue-generated.h
+++ b/kabc/vcard/include/generated/TelValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
TelValue();
TelValue(const TelValue&);
-TelValue(const QCString&);
+TelValue(const Q3CString&);
TelValue & operator = (TelValue&);
-TelValue & operator = (const QCString&);
+TelValue & operator = (const Q3CString&);
bool operator ==(TelValue&);
bool operator !=(TelValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TelValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TelValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~TelValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/TextBinParam-generated.h b/kabc/vcard/include/generated/TextBinParam-generated.h
index d075c10..2e433b0 100644
--- a/kabc/vcard/include/generated/TextBinParam-generated.h
+++ b/kabc/vcard/include/generated/TextBinParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
TextBinParam();
TextBinParam(const TextBinParam&);
-TextBinParam(const QCString&);
+TextBinParam(const Q3CString&);
TextBinParam & operator = (TextBinParam&);
-TextBinParam & operator = (const QCString&);
+TextBinParam & operator = (const Q3CString&);
bool operator ==(TextBinParam&);
bool operator !=(TextBinParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextBinParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextBinParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~TextBinParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/TextBinValue-generated.h b/kabc/vcard/include/generated/TextBinValue-generated.h
index e9553ac..bc3ad61 100644
--- a/kabc/vcard/include/generated/TextBinValue-generated.h
+++ b/kabc/vcard/include/generated/TextBinValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
TextBinValue();
TextBinValue(const TextBinValue&);
-TextBinValue(const QCString&);
+TextBinValue(const Q3CString&);
TextBinValue & operator = (TextBinValue&);
-TextBinValue & operator = (const QCString&);
+TextBinValue & operator = (const Q3CString&);
bool operator ==(TextBinValue&);
bool operator !=(TextBinValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextBinValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextBinValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~TextBinValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/TextListValue-generated.h b/kabc/vcard/include/generated/TextListValue-generated.h
index 9f46124..9df8a46 100644
--- a/kabc/vcard/include/generated/TextListValue-generated.h
+++ b/kabc/vcard/include/generated/TextListValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
TextListValue();
TextListValue(const TextListValue&);
-TextListValue(const QCString&);
+TextListValue(const Q3CString&);
TextListValue & operator = (TextListValue&);
-TextListValue & operator = (const QCString&);
+TextListValue & operator = (const Q3CString&);
bool operator ==(TextListValue&);
bool operator !=(TextListValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextListValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextListValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~TextListValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/TextNSParam-generated.h b/kabc/vcard/include/generated/TextNSParam-generated.h
index d7f58ca..8842bd6 100644
--- a/kabc/vcard/include/generated/TextNSParam-generated.h
+++ b/kabc/vcard/include/generated/TextNSParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
TextNSParam();
TextNSParam(const TextNSParam&);
-TextNSParam(const QCString&);
+TextNSParam(const Q3CString&);
TextNSParam & operator = (TextNSParam&);
-TextNSParam & operator = (const QCString&);
+TextNSParam & operator = (const Q3CString&);
bool operator ==(TextNSParam&);
bool operator !=(TextNSParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextNSParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextNSParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~TextNSParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/TextParam-generated.h b/kabc/vcard/include/generated/TextParam-generated.h
index 154e1bf..e56a8a5 100644
--- a/kabc/vcard/include/generated/TextParam-generated.h
+++ b/kabc/vcard/include/generated/TextParam-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
TextParam();
TextParam(const TextParam&);
-TextParam(const QCString&);
+TextParam(const Q3CString&);
TextParam & operator = (TextParam&);
-TextParam & operator = (const QCString&);
+TextParam & operator = (const Q3CString&);
bool operator ==(TextParam&);
bool operator !=(TextParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextParam a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextParam a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~TextParam();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/TextValue-generated.h b/kabc/vcard/include/generated/TextValue-generated.h
index e1c4dcc..3f205e0 100644
--- a/kabc/vcard/include/generated/TextValue-generated.h
+++ b/kabc/vcard/include/generated/TextValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
TextValue();
TextValue(const TextValue&);
-TextValue(const QCString&);
+TextValue(const Q3CString&);
TextValue & operator = (TextValue&);
-TextValue & operator = (const QCString&);
+TextValue & operator = (const Q3CString&);
bool operator ==(TextValue&);
bool operator !=(TextValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~TextValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/URIValue-generated.h b/kabc/vcard/include/generated/URIValue-generated.h
index dbcb5c1..464178f 100644
--- a/kabc/vcard/include/generated/URIValue-generated.h
+++ b/kabc/vcard/include/generated/URIValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
URIValue();
URIValue(const URIValue&);
-URIValue(const QCString&);
+URIValue(const Q3CString&);
URIValue & operator = (URIValue&);
-URIValue & operator = (const QCString&);
+URIValue & operator = (const Q3CString&);
bool operator ==(URIValue&);
bool operator !=(URIValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {URIValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {URIValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~URIValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/UTCValue-generated.h b/kabc/vcard/include/generated/UTCValue-generated.h
index 46e447b..1a34b5c 100644
--- a/kabc/vcard/include/generated/UTCValue-generated.h
+++ b/kabc/vcard/include/generated/UTCValue-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
UTCValue();
UTCValue(const UTCValue&);
-UTCValue(const QCString&);
+UTCValue(const Q3CString&);
UTCValue & operator = (UTCValue&);
-UTCValue & operator = (const QCString&);
+UTCValue & operator = (const Q3CString&);
bool operator ==(UTCValue&);
bool operator !=(UTCValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {UTCValue a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {UTCValue a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~UTCValue();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/VCard-generated.h b/kabc/vcard/include/generated/VCard-generated.h
index 4d7d96d..d09c789 100644
--- a/kabc/vcard/include/generated/VCard-generated.h
+++ b/kabc/vcard/include/generated/VCard-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
VCard();
VCard(const VCard&);
-VCard(const QCString&);
+VCard(const Q3CString&);
VCard & operator = (VCard&);
-VCard & operator = (const QCString&);
+VCard & operator = (const Q3CString&);
bool operator ==(VCard&);
bool operator !=(VCard& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {VCard a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {VCard a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~VCard();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/VCardEntity-generated.h b/kabc/vcard/include/generated/VCardEntity-generated.h
index 9f2dfbc..cbbe8e1 100644
--- a/kabc/vcard/include/generated/VCardEntity-generated.h
+++ b/kabc/vcard/include/generated/VCardEntity-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
VCardEntity();
VCardEntity(const VCardEntity&);
-VCardEntity(const QCString&);
+VCardEntity(const Q3CString&);
VCardEntity & operator = (VCardEntity&);
-VCardEntity & operator = (const QCString&);
+VCardEntity & operator = (const Q3CString&);
bool operator ==(VCardEntity&);
bool operator !=(VCardEntity& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {VCardEntity a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {VCardEntity a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~VCardEntity();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/include/generated/Value-generated.h b/kabc/vcard/include/generated/Value-generated.h
index 7afac34..142e720 100644
--- a/kabc/vcard/include/generated/Value-generated.h
+++ b/kabc/vcard/include/generated/Value-generated.h
@@ -1,15 +1,17 @@
+//Added by qt3to4:
+#include <Q3CString>
// XXX Automatically generated. DO NOT EDIT! XXX //
public:
Value();
Value(const Value&);
-Value(const QCString&);
+Value(const Q3CString&);
Value & operator = (Value&);
-Value & operator = (const QCString&);
+Value & operator = (const Q3CString&);
bool operator ==(Value&);
bool operator !=(Value& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Value a(s);return(*this==a);}
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Value a(s);return(*this==a);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
virtual ~Value();
void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
diff --git a/kabc/vcard/testread.cpp b/kabc/vcard/testread.cpp
index 919c661..4d66aaf 100644
--- a/kabc/vcard/testread.cpp
+++ b/kabc/vcard/testread.cpp
@@ -3,7 +3,9 @@
#include <assert.h>
#include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3CString>
#include <VCard.h>
@@ -18,14 +20,14 @@ int main(int argc, char * argv[])
QFile f(argv[1]);
- QCString str;
+ Q3CString str;
- if (!f.open(IO_ReadOnly)) {
+ if (!f.open(QIODevice::ReadOnly)) {
cerr << "Couldn't open file \"" << argv[1] << endl;
exit(1);
}
- QTextStream t(&f);
+ Q3TextStream t(&f);
while (!t.eof())
str += t.readLine().utf8() + '\n';
@@ -52,7 +54,7 @@ int main(int argc, char * argv[])
if (v.has(EntityEmail)) {
cerr << "Email parameter found" << endl;
- QCString s = v.contentLine(EntityEmail)->value()->asString();
+ Q3CString s = v.contentLine(EntityEmail)->value()->asString();
cerr << "Email value == " << s << endl;
}
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index e4bbe7b..846e51a 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -5,6 +5,8 @@
#include <kcmdlineargs.h>
#include <VCard.h>
+//Added by qt3to4:
+#include <Q3CString>
int main(int argc,char **argv)
{
@@ -33,7 +35,7 @@ int main(int argc,char **argv)
cl2.setParamList( p );
v.add(cl2);
- QCString str = v.asString();
+ Q3CString str = v.asString();
kdDebug() << "--- VCard begin ---" << endl
<< str
diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index 60d02b8..e24a9dc 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -27,6 +27,8 @@ $Id$
#include <qmap.h>
#include <qregexp.h>
+//Added by qt3to4:
+#include <Q3ValueList>
#include <kmdcodec.h>
#include "vcard21parser.h"
@@ -45,7 +47,7 @@ bool VCardLineX::isValid() const
// This is long but it makes it a bit faster (and saves me from using
// a tree which is probably the ideal situation, but a bit memory heavy)
- switch( name[0] ) {
+ switch( name[0].unicode() ) {
case 'a':
if ( name == VCARD_ADR && qualified &&
(qualifiers.contains(VCARD_ADR_DOM) ||
@@ -269,7 +271,7 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
addressee.setBirthday(VCardStringToDate(tmpStr));
//set the addressee's phone numbers
- for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
+ for ( Q3ValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
if ( (*i).name == VCARD_TEL ) {
int type = 0;
if ( (*i).qualified ) {
@@ -308,7 +310,7 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
}
addressee.makePhoneNumbersOLcompatible();
//set the addressee's addresses
- for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
+ for ( Q3ValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
if ( (*i).name == VCARD_ADR ) {
int type = 0;
if ( (*i).qualified ) {
@@ -327,7 +329,10 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
if ( (*i).qualifiers.contains( VCARD_ADR_PREF ) )
type |= Address::Pref;
}
- addressee.insertAddress( readAddressFromQStringList( (*i).parameters, type ) );
+ QStringList tmp;
+ for(Q3ValueList<QString>::const_iterator ii=(*i).parameters.begin();ii!=(*i).parameters.end();++ii)
+ tmp.push_back(*ii);
+ addressee.insertAddress( readAddressFromQStringList( tmp, type ) );
}
}
@@ -408,10 +413,10 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
int _err = 0;
int _state = VC_STATE_BEGIN;
- QValueList<VCardLineX> *_vcdata;
- QValueList<QString> lines;
+ Q3ValueList<VCardLineX> *_vcdata;
+ QStringList lines;
- _vcdata = new QValueList<VCardLineX>;
+ _vcdata = new Q3ValueList<VCardLineX>;
lines = QStringList::split( QRegExp( "[\x0d\x0a]" ), vc );
@@ -501,8 +506,8 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
}
_vcl.parameters = QStringList::split( ';', value, true );
if ( qp ) { // decode the quoted printable
- for ( QStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
- *z = KCodecs::quotedPrintableDecode( (*z).latin1() );
+ for ( QLinkedList<QString>::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
+ *z = KCodecs::quotedPrintableDecode( (Q3CString)(*z).latin1() );
}
}
} else {
@@ -543,7 +548,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
return new VCard21ParserImpl( _vcdata );
}
-VCard21ParserImpl::VCard21ParserImpl(QValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
+VCard21ParserImpl::VCard21ParserImpl(Q3ValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
{
}
@@ -554,7 +559,7 @@ QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifie
const QString lowname = name.lower();
const QString lowqualifier = qualifier.lower();
- for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+ for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier)) {
if ((*i).parameters.count() > 0)
return (*i).parameters[0];
@@ -570,7 +575,7 @@ QString VCard21ParserImpl::getValue(const QString& name)
QString failed;
const QString lowname = name.lower();
- for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+ for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && !(*i).qualified) {
if ((*i).parameters.count() > 0)
return (*i).parameters[0];
@@ -584,9 +589,10 @@ QString VCard21ParserImpl::getValue(const QString& name)
QStringList VCard21ParserImpl::getValues(const QString& name)
{
const QString lowname = name.lower();
- for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
- if ((*i).name == lowname && !(*i).qualified)
- return (*i).parameters;
+ for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+ if ((*i).name == lowname && !(*i).qualified) {
+ return QStringList( (*i).parameters );
+ }
}
// failed.
return QStringList();
@@ -596,9 +602,9 @@ QStringList VCard21ParserImpl::getValues(const QString& name, const QString& qua
{
const QString lowname = name.lower();
const QString lowqualifier = qualifier.lower();
- for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+ for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier))
- return (*i).parameters;
+ return QStringList( (*i).parameters );
}
// failed.
return QStringList();
diff --git a/kabc/vcard21parser.h b/kabc/vcard21parser.h
index 77e69b6..80ba6ef 100644
--- a/kabc/vcard21parser.h
+++ b/kabc/vcard21parser.h
@@ -34,7 +34,7 @@ $Id$
#include <qregexp.h>
#include <qstring.h>
#include <kurl.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
#include "addressee.h"
#include "addressbook.h"
@@ -196,8 +196,8 @@ class VCardLineX
public:
QString name;
bool qualified;
- QValueList<QString> qualifiers;
- QValueList<QString> parameters;
+ Q3ValueList<QString> qualifiers;
+ Q3ValueList<QString> parameters;
bool isValid() const;
};
@@ -217,10 +217,10 @@ public:
QStringList getValues(const QString& name, const QString& qualifier);
QStringList getValues(const QString& name);
- QValueList<VCardLineX> *_vcdata;
+ Q3ValueList<VCardLineX> *_vcdata;
private:
- VCard21ParserImpl (QValueList<VCardLineX> *_vcd);
+ VCard21ParserImpl (Q3ValueList<VCardLineX> *_vcd);
};
#endif
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index 580c28b..2417874 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -28,6 +28,9 @@ $Id$
#include <qfile.h>
#include <qregexp.h>
#include <qapplication.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
#include <kdebug.h>
#include <kmdcodec.h>
@@ -54,7 +57,7 @@ bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
kdDebug(5700) << "VCardFormat::load()" << endl;
QByteArray fdata = file->readAll();
- QCString data(fdata.data(), fdata.size()+1);
+ Q3CString data(fdata.data(), fdata.size()+1);
VCardEntity e( data );
@@ -75,7 +78,7 @@ bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
{
- QCString data(file->readAll().data(), file->size()+1);
+ Q3CString data(file->readAll().data(), file->size()+1);
VCardEntity e( data );
VCardListIterator it( e.cardList() );
@@ -108,7 +111,7 @@ void VCardFormatImpl::save( const Addressee &addressee, QFile *file )
vcardlist.append( v );
vcards.setCardList( vcardlist );
- QCString vcardData = vcards.asString();
+ Q3CString vcardData = vcards.asString();
file->writeBlock( (const char*)vcardData, vcardData.length() );
}
@@ -129,11 +132,11 @@ void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file
bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
{
- QPtrList<ContentLine> contentLines = v->contentLineList();
+ Q3PtrList<ContentLine> contentLines = v->contentLineList();
ContentLine *cl;
for( cl = contentLines.first(); cl; cl = contentLines.next() ) {
- QCString n = cl->name();
+ Q3CString n = cl->name();
if ( n.left( 2 ) == "X-" ) {
n = n.mid( 2 );
int posDash = n.find( "-" );
@@ -219,7 +222,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
break;
case EntityBirthday:
- addressee.setBirthday( readDateValue( cl ) );
+ addressee.setBirthday( (QDateTime) readDateValue( cl ) );
break;
case EntityRevision:
@@ -530,7 +533,7 @@ int VCardFormatImpl::readAddressParam( ContentLine *cl )
int type = 0;
ParamList params = cl->paramList();
ParamListIterator it( params );
- QCString tmpStr;
+ Q3CString tmpStr;
for( ; it.current(); ++it ) {
if ( (*it)->name().upper() == "TYPE" ) {
tmpStr = (*it)->value().lower();
@@ -609,7 +612,7 @@ PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
int type = 0;
ParamList params = cl->paramList();
ParamListIterator it( params );
- QCString tmpStr;
+ Q3CString tmpStr;
for( ; it.current(); ++it ) {
if ( (*it)->name() == "TYPE" ) {
tmpStr = (*it)->value().lower();
@@ -870,7 +873,7 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty
QImage img = pic.data();
if ( intern ) { // only for vCard export we really write the data inline
QByteArray data;
- QDataStream s( data, IO_WriteOnly );
+ QDataStream s( &data, QIODevice::WriteOnly );
s.setVersion( 4 ); // to produce valid png files
s << img;
cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
@@ -959,7 +962,7 @@ void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, co
cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
} else { // save sound in cache
QFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
- if ( file.open( IO_WriteOnly ) ) {
+ if ( file.open( QIODevice::WriteOnly ) ) {
file.writeBlock( data );
}
cl.setValue( new TextValue( "<dummy>" ) );
@@ -991,7 +994,7 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
QByteArray data;
if ( v->asString() == "<dummy>" ) { // no sound inline stored => sound is in cache
QFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
- if ( file.open( IO_ReadOnly ) ) {
+ if ( file.open( QIODevice::ReadOnly ) ) {
data = file.readAll();
file.close();
}
diff --git a/kabc/vcardformatplugin.cpp b/kabc/vcardformatplugin.cpp
index 8db8c11..0b97a08 100644
--- a/kabc/vcardformatplugin.cpp
+++ b/kabc/vcardformatplugin.cpp
@@ -61,7 +61,7 @@ bool VCardFormatPlugin::checkFormat( QFile *file ) const
{
QString line;
- file->readLine( line, 1024 );
+ char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp;
line = line.stripWhiteSpace();
if ( line == "BEGIN:VCARD" )
return true;
diff --git a/kabc/vcardparser/vcard.h b/kabc/vcardparser/vcard.h
index 0bee441..85b50e4 100644
--- a/kabc/vcardparser/vcard.h
+++ b/kabc/vcardparser/vcard.h
@@ -24,14 +24,14 @@
#include "vcardline.h"
#include <qmap.h>
#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
namespace KABC {
class VCard
{
public:
- typedef QValueList<VCard> List;
+ typedef Q3ValueList<VCard> List;
typedef QMap< QString, VCardLine::List > LineMap;
enum Version { v2_1, v3_0 };
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index 8df2d32..c7254a0 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -19,6 +19,8 @@
*/
#include "vcardline.h"
+//Added by qt3to4:
+#include <Q3CString>
using namespace KABC;
@@ -43,7 +45,7 @@ VCardLine::VCardLine( const QString &identifier, const QString &value )
: d( 0 )
{
mIdentifier = identifier;
- mValue.assign( value.data(), value.length() );
+ mValue = value;
}
VCardLine::VCardLine( const VCardLine& line )
@@ -86,7 +88,7 @@ void VCardLine::setValueString( const QString& value )
{
setValueCString( value.utf8() );
}
-void VCardLine::setValueCString( const QCString& value )
+void VCardLine::setValueCString( const Q3CString& value )
{
mValue.duplicate( value.data(), value.length() );
}
diff --git a/kabc/vcardparser/vcardline.h b/kabc/vcardparser/vcardline.h
index 8dc9322..dc4bdec 100644
--- a/kabc/vcardparser/vcardline.h
+++ b/kabc/vcardparser/vcardline.h
@@ -22,8 +22,8 @@
#define VCARDLINE_H
#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qcstring.h>
+#include <q3valuelist.h>
+#include <q3cstring.h>
#include <qvariant.h>
#include <qmap.h>
#include <qstring.h>
@@ -33,7 +33,7 @@ namespace KABC {
class VCardLine
{
public:
- typedef QValueList<VCardLine> List;
+ typedef Q3ValueList<VCardLine> List;
typedef QMap<QString, QStringList> ParamMap;
VCardLine();
@@ -59,7 +59,7 @@ class VCardLine
* Sets the value of of this line.
*/
void setValueString( const QString& value );
- void setValueCString( const QCString& value );
+ void setValueCString( const Q3CString& value );
void setValueBytes( const QByteArray& value );
/**
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 11622a0..a319531 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -218,7 +218,7 @@ QString VCardParser::createVCards( const VCard::List& list )
if ( encodingType == "b" )
KCodecs::base64Encode( input, output );
else if ( encodingType == "quoted-printable" )
- KCodecs::quotedPrintableEncode( input, output );
+ KCodecs::quotedPrintableEncode( input, output, true );
textLine.append( ":" + QString( output ) );
} else
textLine.append( ":" + (*lineIt).valueString().replace( QRegExp("\n"), "\\n" ) );
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp
index 204326e..435c3b0 100644
--- a/kabc/vcardparser/vcardtool.cpp
+++ b/kabc/vcardparser/vcardtool.cpp
@@ -652,7 +652,7 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi
if ( pic.isIntern() ) {
if ( !pic.data().isNull() ) {
QByteArray input;
- QDataStream s( input, IO_WriteOnly );
+ QDataStream s( &input, QIODevice::WriteOnly );
s.setVersion( 4 );
s << pic.data();
line.setValueBytes( input );