summaryrefslogtreecommitdiffstats
path: root/kabc
diff options
context:
space:
mode:
Diffstat (limited to 'kabc')
-rw-r--r--kabc/address.cpp142
-rw-r--r--kabc/address.h148
-rw-r--r--kabc/addressbook.cpp92
-rw-r--r--kabc/addressbook.h40
-rw-r--r--kabc/addresseedialog.cpp90
-rw-r--r--kabc/addresseedialog.h26
-rw-r--r--kabc/addresseehelper.cpp16
-rw-r--r--kabc/addresseehelper.h22
-rw-r--r--kabc/addresseelist.cpp38
-rw-r--r--kabc/addresseelist.h14
-rw-r--r--kabc/addresslineedit.cpp136
-rw-r--r--kabc/addresslineedit.h38
-rw-r--r--kabc/agent.cpp12
-rw-r--r--kabc/agent.h20
-rw-r--r--kabc/distributionlist.cpp58
-rw-r--r--kabc/distributionlist.h28
-rw-r--r--kabc/distributionlistdialog.cpp128
-rw-r--r--kabc/distributionlistdialog.h30
-rw-r--r--kabc/distributionlisteditor.cpp94
-rw-r--r--kabc/distributionlisteditor.h26
-rw-r--r--kabc/errorhandler.cpp10
-rw-r--r--kabc/errorhandler.h14
-rw-r--r--kabc/field.h30
-rw-r--r--kabc/format.h6
-rw-r--r--kabc/formatfactory.cpp26
-rw-r--r--kabc/formatfactory.h24
-rw-r--r--kabc/formatplugin.h12
-rw-r--r--kabc/formats/binaryformat.cpp46
-rw-r--r--kabc/formats/binaryformat.h18
-rw-r--r--kabc/geo.cpp10
-rw-r--r--kabc/geo.h12
-rw-r--r--kabc/kab2kabc.cpp58
-rw-r--r--kabc/key.cpp24
-rw-r--r--kabc/key.h42
-rw-r--r--kabc/ldapclient.cpp128
-rw-r--r--kabc/ldapclient.h104
-rw-r--r--kabc/ldapconfigwidget.cpp198
-rw-r--r--kabc/ldapconfigwidget.h80
-rw-r--r--kabc/ldapurl.cpp44
-rw-r--r--kabc/ldapurl.h40
-rw-r--r--kabc/ldif.cpp62
-rw-r--r--kabc/ldif.h48
-rw-r--r--kabc/ldifconverter.cpp182
-rw-r--r--kabc/ldifconverter.h18
-rw-r--r--kabc/lock.cpp48
-rw-r--r--kabc/lock.h22
-rw-r--r--kabc/locknull.cpp4
-rw-r--r--kabc/locknull.h4
-rw-r--r--kabc/phonenumber.cpp26
-rw-r--r--kabc/phonenumber.h40
-rw-r--r--kabc/picture.cpp22
-rw-r--r--kabc/picture.h34
-rw-r--r--kabc/plugin.cpp12
-rw-r--r--kabc/plugin.h20
-rw-r--r--kabc/plugins/dir/resourcedir.cpp42
-rw-r--r--kabc/plugins/dir/resourcedir.h16
-rw-r--r--kabc/plugins/dir/resourcedirconfig.cpp16
-rw-r--r--kabc/plugins/dir/resourcedirconfig.h4
-rw-r--r--kabc/plugins/evolution/dbwrapper.cpp44
-rw-r--r--kabc/plugins/evolution/dbwrapper.h22
-rw-r--r--kabc/plugins/evolution/resourceevo.cpp12
-rw-r--r--kabc/plugins/file/resourcefile.cpp78
-rw-r--r--kabc/plugins/file/resourcefile.h20
-rw-r--r--kabc/plugins/file/resourcefileconfig.cpp26
-rw-r--r--kabc/plugins/file/resourcefileconfig.h6
-rw-r--r--kabc/plugins/ldapkio/resourceldapkio.cpp218
-rw-r--r--kabc/plugins/ldapkio/resourceldapkio.h66
-rw-r--r--kabc/plugins/ldapkio/resourceldapkioconfig.cpp140
-rw-r--r--kabc/plugins/ldapkio/resourceldapkioconfig.h40
-rw-r--r--kabc/plugins/net/resourcenet.cpp36
-rw-r--r--kabc/plugins/net/resourcenet.h14
-rw-r--r--kabc/plugins/net/resourcenetconfig.cpp16
-rw-r--r--kabc/plugins/net/resourcenetconfig.h4
-rw-r--r--kabc/plugins/sql/resourcesql.cpp74
-rw-r--r--kabc/plugins/sql/resourcesql.h20
-rw-r--r--kabc/plugins/sql/resourcesqlconfig.cpp30
-rw-r--r--kabc/plugins/sql/resourcesqlconfig.h4
-rw-r--r--kabc/resource.cpp14
-rw-r--r--kabc/resource.h14
-rw-r--r--kabc/resourceselectdialog.cpp20
-rw-r--r--kabc/resourceselectdialog.h8
-rw-r--r--kabc/scripts/addressee.src.cpp192
-rw-r--r--kabc/scripts/addressee.src.h90
-rw-r--r--kabc/scripts/field.src.cpp70
-rw-r--r--kabc/secrecy.cpp8
-rw-r--r--kabc/secrecy.h16
-rw-r--r--kabc/sortmode.cpp8
-rw-r--r--kabc/sound.cpp20
-rw-r--r--kabc/sound.h32
-rw-r--r--kabc/stdaddressbook.cpp24
-rw-r--r--kabc/stdaddressbook.h4
-rw-r--r--kabc/tests/bigwrite.cpp4
-rw-r--r--kabc/tests/kabcargl.cpp22
-rw-r--r--kabc/tests/testaddresslineedit.cpp2
-rw-r--r--kabc/tests/testdistlist.cpp6
-rw-r--r--kabc/tests/testkabc.cpp10
-rw-r--r--kabc/tests/testkabcdlg.cpp2
-rw-r--r--kabc/tests/testldapclient.cpp50
-rw-r--r--kabc/tests/testldapclient.h6
-rw-r--r--kabc/tests/testlock.cpp64
-rw-r--r--kabc/tests/testlock.h8
-rw-r--r--kabc/timezone.cpp10
-rw-r--r--kabc/timezone.h12
-rw-r--r--kabc/vcard/AdrParam.cpp8
-rw-r--r--kabc/vcard/AdrValue.cpp6
-rw-r--r--kabc/vcard/AgentParam.cpp4
-rw-r--r--kabc/vcard/AgentValue.cpp4
-rw-r--r--kabc/vcard/ClassValue.cpp4
-rw-r--r--kabc/vcard/ContentLine.cpp36
-rw-r--r--kabc/vcard/DateParam.cpp4
-rw-r--r--kabc/vcard/DateValue.cpp40
-rw-r--r--kabc/vcard/EmailParam.cpp4
-rw-r--r--kabc/vcard/Entity.cpp8
-rw-r--r--kabc/vcard/Enum.cpp4
-rw-r--r--kabc/vcard/FloatValue.cpp6
-rw-r--r--kabc/vcard/GeoValue.cpp4
-rw-r--r--kabc/vcard/ImageParam.cpp4
-rw-r--r--kabc/vcard/ImageValue.cpp4
-rw-r--r--kabc/vcard/ImgValue.cpp4
-rw-r--r--kabc/vcard/LangValue.cpp14
-rw-r--r--kabc/vcard/NValue.cpp8
-rw-r--r--kabc/vcard/OrgValue.cpp6
-rw-r--r--kabc/vcard/Param.cpp10
-rw-r--r--kabc/vcard/PhoneNumberValue.cpp4
-rw-r--r--kabc/vcard/RToken.cpp6
-rw-r--r--kabc/vcard/SoundValue.cpp4
-rw-r--r--kabc/vcard/SourceParam.cpp4
-rw-r--r--kabc/vcard/TelParam.cpp4
-rw-r--r--kabc/vcard/TelValue.cpp4
-rw-r--r--kabc/vcard/TextBinParam.cpp4
-rw-r--r--kabc/vcard/TextBinValue.cpp4
-rw-r--r--kabc/vcard/TextListValue.cpp6
-rw-r--r--kabc/vcard/TextParam.cpp4
-rw-r--r--kabc/vcard/TextValue.cpp4
-rw-r--r--kabc/vcard/URIValue.cpp10
-rw-r--r--kabc/vcard/UTCValue.cpp4
-rw-r--r--kabc/vcard/VCard.cpp42
-rw-r--r--kabc/vcard/VCardEntity.cpp14
-rw-r--r--kabc/vcard/Value.cpp4
-rw-r--r--kabc/vcard/include/VCardAdrParam.h12
-rw-r--r--kabc/vcard/include/VCardAdrValue.h44
-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.h8
-rw-r--r--kabc/vcard/include/VCardDateParam.h2
-rw-r--r--kabc/vcard/include/VCardDateValue.h14
-rw-r--r--kabc/vcard/include/VCardDefines.h6
-rw-r--r--kabc/vcard/include/VCardEmailParam.h4
-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.h4
-rw-r--r--kabc/vcard/include/VCardTelValue.h2
-rw-r--r--kabc/vcard/include/VCardTextBinParam.h2
-rw-r--r--kabc/vcard/include/VCardTextBinValue.h14
-rw-r--r--kabc/vcard/include/VCardTextListValue.h8
-rw-r--r--kabc/vcard/include/VCardTextParam.h2
-rw-r--r--kabc/vcard/include/VCardURIValue.h14
-rw-r--r--kabc/vcard/include/VCardUTCValue.h2
-rw-r--r--kabc/vcard/include/VCardVCard.h16
-rw-r--r--kabc/vcard/include/VCardVCardEntity.h8
-rw-r--r--kabc/vcard/include/VCardValue.h6
-rw-r--r--kabc/vcard/include/generated/AdrParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/AdrValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/AgentParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/AgentValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/ClassValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/ContentLine-generated.h8
-rw-r--r--kabc/vcard/include/generated/DateParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/DateValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/EmailParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/FloatValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/GeoValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/Group-generated.h8
-rw-r--r--kabc/vcard/include/generated/ImageParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/ImageValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/ImgParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/ImgValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/LangValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/NValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/Name-generated.h8
-rw-r--r--kabc/vcard/include/generated/OrgValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/Param-generated.h8
-rw-r--r--kabc/vcard/include/generated/ParamName-generated.h8
-rw-r--r--kabc/vcard/include/generated/ParamValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/PhoneNumberValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/SoundValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/SourceParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/TelParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/TelValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/TextBinParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/TextBinValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/TextListValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/TextNSParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/TextParam-generated.h8
-rw-r--r--kabc/vcard/include/generated/TextValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/URIValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/UTCValue-generated.h8
-rw-r--r--kabc/vcard/include/generated/VCard-generated.h8
-rw-r--r--kabc/vcard/include/generated/VCardEntity-generated.h8
-rw-r--r--kabc/vcard/include/generated/Value-generated.h8
-rw-r--r--kabc/vcard/testread.cpp12
-rw-r--r--kabc/vcard/testwrite.cpp2
-rw-r--r--kabc/vcard21parser.cpp84
-rw-r--r--kabc/vcard21parser.h36
-rw-r--r--kabc/vcardconverter.cpp30
-rw-r--r--kabc/vcardconverter.h36
-rw-r--r--kabc/vcardformat.cpp8
-rw-r--r--kabc/vcardformat.h6
-rw-r--r--kabc/vcardformatimpl.cpp146
-rw-r--r--kabc/vcardformatimpl.h30
-rw-r--r--kabc/vcardformatplugin.cpp34
-rw-r--r--kabc/vcardformatplugin.h10
-rw-r--r--kabc/vcardparser/testread.cpp14
-rw-r--r--kabc/vcardparser/testread2.cpp2
-rw-r--r--kabc/vcardparser/testutils.cpp12
-rw-r--r--kabc/vcardparser/testutils.h6
-rw-r--r--kabc/vcardparser/testwrite.cpp28
-rw-r--r--kabc/vcardparser/vcard.cpp6
-rw-r--r--kabc/vcardparser/vcard.h16
-rw-r--r--kabc/vcardparser/vcardline.cpp36
-rw-r--r--kabc/vcardparser/vcardline.h42
-rw-r--r--kabc/vcardparser/vcardparser.cpp94
-rw-r--r--kabc/vcardparser/vcardparser.h4
-rw-r--r--kabc/vcardtool.cpp130
-rw-r--r--kabc/vcardtool.h16
236 files changed, 3039 insertions, 3039 deletions
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 0db0f8236..0787bcc4e 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -27,12 +27,12 @@
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
-#include <qfile.h>
+#include <tqfile.h>
using namespace KABC;
-QMap<QString, QString> *Address::mISOMap = 0;
-static KStaticDeleter< QMap<QString, QString> > isoMapDeleter;
+TQMap<TQString, TQString> *Address::mISOMap = 0;
+static KStaticDeleter< TQMap<TQString, TQString> > isoMapDeleter;
Address::Address() :
mEmpty( true ), mType( 0 )
@@ -85,14 +85,14 @@ void Address::clear()
*this = Address();
}
-void Address::setId( const QString &id )
+void Address::setId( const TQString &id )
{
mEmpty = false;
mId = id;
}
-QString Address::id() const
+TQString Address::id() const
{
return mId;
}
@@ -109,9 +109,9 @@ int Address::type() const
return mType;
}
-QString Address::typeLabel() const
+TQString Address::typeLabel() const
{
- QString label;
+ TQString label;
bool first = true;
const TypeList list = typeList();
@@ -128,145 +128,145 @@ QString Address::typeLabel() const
return label;
}
-void Address::setPostOfficeBox( const QString &s )
+void Address::setPostOfficeBox( const TQString &s )
{
mEmpty = false;
mPostOfficeBox = s;
}
-QString Address::postOfficeBox() const
+TQString Address::postOfficeBox() const
{
return mPostOfficeBox;
}
-QString Address::postOfficeBoxLabel()
+TQString Address::postOfficeBoxLabel()
{
return i18n("Post Office Box");
}
-void Address::setExtended( const QString &s )
+void Address::setExtended( const TQString &s )
{
mEmpty = false;
mExtended = s;
}
-QString Address::extended() const
+TQString Address::extended() const
{
return mExtended;
}
-QString Address::extendedLabel()
+TQString Address::extendedLabel()
{
return i18n("Extended Address Information");
}
-void Address::setStreet( const QString &s )
+void Address::setStreet( const TQString &s )
{
mEmpty = false;
mStreet = s;
}
-QString Address::street() const
+TQString Address::street() const
{
return mStreet;
}
-QString Address::streetLabel()
+TQString Address::streetLabel()
{
return i18n("Street");
}
-void Address::setLocality( const QString &s )
+void Address::setLocality( const TQString &s )
{
mEmpty = false;
mLocality = s;
}
-QString Address::locality() const
+TQString Address::locality() const
{
return mLocality;
}
-QString Address::localityLabel()
+TQString Address::localityLabel()
{
return i18n("Locality");
}
-void Address::setRegion( const QString &s )
+void Address::setRegion( const TQString &s )
{
mEmpty = false;
mRegion = s;
}
-QString Address::region() const
+TQString Address::region() const
{
return mRegion;
}
-QString Address::regionLabel()
+TQString Address::regionLabel()
{
return i18n("Region");
}
-void Address::setPostalCode( const QString &s )
+void Address::setPostalCode( const TQString &s )
{
mEmpty = false;
mPostalCode = s;
}
-QString Address::postalCode() const
+TQString Address::postalCode() const
{
return mPostalCode;
}
-QString Address::postalCodeLabel()
+TQString Address::postalCodeLabel()
{
return i18n("Postal Code");
}
-void Address::setCountry( const QString &s )
+void Address::setCountry( const TQString &s )
{
mEmpty = false;
mCountry = s;
}
-QString Address::country() const
+TQString Address::country() const
{
return mCountry;
}
-QString Address::countryLabel()
+TQString Address::countryLabel()
{
return i18n("Country");
}
-void Address::setLabel( const QString &s )
+void Address::setLabel( const TQString &s )
{
mEmpty = false;
mLabel = s;
}
-QString Address::label() const
+TQString Address::label() const
{
return mLabel;
}
-QString Address::labelLabel()
+TQString Address::labelLabel()
{
return i18n("Delivery Label");
}
@@ -281,7 +281,7 @@ Address::TypeList Address::typeList()
return list;
}
-QString Address::typeLabel( int type )
+TQString Address::typeLabel( int type )
{
if ( type & Pref )
return i18n( "Preferred address", "Preferred" );
@@ -326,12 +326,12 @@ void Address::dump() const
}
-QString Address::formattedAddress( const QString &realName,
- const QString &orgaName ) const
+TQString Address::formattedAddress( const TQString &realName,
+ const TQString &orgaName ) const
{
- QString ciso;
- QString addrTemplate;
- QString ret;
+ TQString ciso;
+ TQString addrTemplate;
+ TQString ret;
// FIXME: first check for iso-country-field and prefer that one
if ( !country().isEmpty() ) {
@@ -341,7 +341,7 @@ QString Address::formattedAddress( const QString &realName,
ciso = KGlobal::locale()->country();
}
KSimpleConfig entry( locate( "locale",
- QString( "l10n/" ) + ciso + QString( "/entry.desktop" ) ) );
+ TQString( "l10n/" ) + ciso + TQString( "/entry.desktop" ) ) );
entry.setGroup( "KCM Locale" );
// decide whether this needs special business address formatting
@@ -368,10 +368,10 @@ QString Address::formattedAddress( const QString &realName,
// now add the country line if needed (formatting this time according to
// the rules of our own system country )
if ( !country().isEmpty() ) {
- KSimpleConfig entry( locate( "locale", QString( "l10n/" )
- + KGlobal::locale()->country() + QString( "/entry.desktop" ) ) );
+ KSimpleConfig entry( locate( "locale", TQString( "l10n/" )
+ + KGlobal::locale()->country() + TQString( "/entry.desktop" ) ) );
entry.setGroup( "KCM Locale" );
- QString cpos = entry.readEntry( "AddressCountryPosition" );
+ TQString cpos = entry.readEntry( "AddressCountryPosition" );
if ( "BELOW" == cpos || cpos.isEmpty() ) {
ret = ret + "\n\n" + country().upper();
} else if ( "below" == cpos ) {
@@ -386,8 +386,8 @@ QString Address::formattedAddress( const QString &realName,
return ret;
}
-bool Address::parseAddressTemplateSection( const QString &tsection,
- QString &result, const QString &realName, const QString &orgaName ) const
+bool Address::parseAddressTemplateSection( const TQString &tsection,
+ TQString &result, const TQString &realName, const TQString &orgaName ) const
{
// This method first parses and substitutes any bracketed sections and
// after that replaces any tags with their values. If a bracketed section
@@ -409,7 +409,7 @@ bool Address::parseAddressTemplateSection( const QString &tsection,
bpos2 = findBalancedBracket( result, bpos1 );
if ( -1 != bpos2 ) {
// we have balanced brackets, recursively parse:
- QString rplstr;
+ TQString rplstr;
bool purge = !parseAddressTemplateSection( result.mid( bpos1+1,
bpos2-bpos1-1 ), rplstr,
realName, orgaName );
@@ -435,11 +435,11 @@ bool Address::parseAddressTemplateSection( const QString &tsection,
// after sorting out all purge tags, we just search'n'replace the rest,
// keeping track of whether at least one tag evaluates to something.
- // The following macro needs QString for R_FIELD
+ // The following macro needs TQString for R_FIELD
// It substitutes !_P_! for empty fields so conditional tags work later
#define REPLTAG(R_TAG,R_FIELD) \
if ( result.find(R_TAG, false) != -1 ) { \
- QString rpl = R_FIELD.isEmpty() ? QString("!_P_!") : R_FIELD; \
+ TQString rpl = R_FIELD.isEmpty() ? TQString("!_P_!") : R_FIELD; \
result.replace( R_TAG, rpl ); \
if ( !R_FIELD.isEmpty() ) { \
ret = true; \
@@ -463,8 +463,8 @@ bool Address::parseAddressTemplateSection( const QString &tsection,
// conditional comma
fpos = result.find( KABC_FMTTAG_condcomma, 0 );
while ( -1 != fpos ) {
- QString str1 = result.mid( fpos - 5, 5 );
- QString str2 = result.mid( fpos + 2, 5 );
+ TQString str1 = result.mid( fpos - 5, 5 );
+ TQString str2 = result.mid( fpos + 2, 5 );
if ( str1 != "!_P_!" && str2 != "!_P_!" ) {
result.replace( fpos, 2, ", " );
} else {
@@ -475,8 +475,8 @@ bool Address::parseAddressTemplateSection( const QString &tsection,
// conditional whitespace
fpos = result.find( KABC_FMTTAG_condwhite, 0 );
while ( -1 != fpos ) {
- QString str1 = result.mid( fpos - 5, 5 );
- QString str2 = result.mid( fpos + 2, 5 );
+ TQString str1 = result.mid( fpos - 5, 5 );
+ TQString str2 = result.mid( fpos + 2, 5 );
if ( str1 != "!_P_!" && str2 != "!_P_!" ) {
result.replace( fpos, 2, " " );
} else {
@@ -491,7 +491,7 @@ bool Address::parseAddressTemplateSection( const QString &tsection,
return ret;
}
-int Address::findBalancedBracket( const QString &tsection, int pos ) const
+int Address::findBalancedBracket( const TQString &tsection, int pos ) const
{
int balancecounter = 0;
for( unsigned int i = pos + 1; i < tsection.length(); i++ ) {
@@ -507,28 +507,28 @@ int Address::findBalancedBracket( const QString &tsection, int pos ) const
return -1;
}
-QString Address::countryToISO( const QString &cname )
+TQString Address::countryToISO( const TQString &cname )
{
// we search a map file for translations from country names to
- // iso codes, storing caching things in a QMap for faster future
+ // iso codes, storing caching things in a TQMap for faster future
// access.
if ( !mISOMap )
- isoMapDeleter.setObject( mISOMap, new QMap<QString, QString>() );
+ isoMapDeleter.setObject( mISOMap, new TQMap<TQString, TQString>() );
- QMap<QString, QString>::ConstIterator it;
+ TQMap<TQString, TQString>::ConstIterator it;
it = mISOMap->find( cname );
if ( it != mISOMap->end() )
return it.data();
- QString mapfile = KGlobal::dirs()->findResource( "data",
- QString::fromLatin1( "kabc/countrytransl.map" ) );
+ TQString mapfile = KGlobal::dirs()->findResource( "data",
+ TQString::fromLatin1( "kabc/countrytransl.map" ) );
- QFile file( mapfile );
+ TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
- QTextStream s( &file );
- QString strbuf = s.readLine();
+ TQTextStream s( &file );
+ TQString strbuf = s.readLine();
while( !strbuf.isEmpty() ) {
- QStringList countryInfo = QStringList::split( '\t', strbuf, true );
+ TQStringList countryInfo = TQStringList::split( '\t', strbuf, true );
if ( countryInfo[ 0 ] == cname ) {
file.close();
mISOMap->insert( cname, countryInfo[ 1 ] );
@@ -544,20 +544,20 @@ QString Address::countryToISO( const QString &cname )
return KGlobal::locale()->country();
}
-QString Address::ISOtoCountry( const QString &ISOname )
+TQString Address::ISOtoCountry( const TQString &ISOname )
{
// get country name from ISO country code (e.g. "no" -> i18n("Norway"))
if ( ISOname.simplifyWhiteSpace().isEmpty() )
- return QString::null;
+ return TQString::null;
- QString mapfile = KGlobal::dirs()->findResource( "data",
- QString::fromLatin1( "kabc/countrytransl.map" ) );
+ TQString mapfile = KGlobal::dirs()->findResource( "data",
+ TQString::fromLatin1( "kabc/countrytransl.map" ) );
- QFile file( mapfile );
+ TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
- QTextStream s( &file );
- QString searchStr = "\t" + ISOname.simplifyWhiteSpace().lower();
- QString strbuf = s.readLine();
+ TQTextStream s( &file );
+ TQString searchStr = "\t" + ISOname.simplifyWhiteSpace().lower();
+ TQString strbuf = s.readLine();
int pos;
while ( !strbuf.isEmpty() ) {
if ( (pos = strbuf.find( searchStr )) != -1 ) {
@@ -572,7 +572,7 @@ QString Address::ISOtoCountry( const QString &ISOname )
return ISOname;
}
-QDataStream &KABC::operator<<( QDataStream &s, const Address &addr )
+TQDataStream &KABC::operator<<( TQDataStream &s, const Address &addr )
{
return s << addr.mId << addr.mType << addr.mPostOfficeBox <<
addr.mExtended << addr.mStreet << addr.mLocality <<
@@ -580,7 +580,7 @@ QDataStream &KABC::operator<<( QDataStream &s, const Address &addr )
addr.mLabel;
}
-QDataStream &KABC::operator>>( QDataStream &s, Address &addr )
+TQDataStream &KABC::operator>>( TQDataStream &s, Address &addr )
{
s >> addr.mId >> addr.mType >> addr.mPostOfficeBox >> addr.mExtended >>
addr.mStreet >> addr.mLocality >> addr.mRegion >>
diff --git a/kabc/address.h b/kabc/address.h
index 9125c71be..a7c597a40 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -21,29 +21,29 @@
#ifndef KABC_ADDRESS_H
#define KABC_ADDRESS_H
-#include <qmap.h>
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
#include <kdelibs_export.h>
// template tags for address formatting localization
-#define KABC_FMTTAG_realname QString("%n")
-#define KABC_FMTTAG_REALNAME QString("%N")
-#define KABC_FMTTAG_company QString("%cm")
-#define KABC_FMTTAG_COMPANY QString("%CM")
-#define KABC_FMTTAG_pobox QString("%p")
-#define KABC_FMTTAG_street QString("%s")
-#define KABC_FMTTAG_STREET QString("%S")
-#define KABC_FMTTAG_zipcode QString("%z")
-#define KABC_FMTTAG_location QString("%l")
-#define KABC_FMTTAG_LOCATION QString("%L")
-#define KABC_FMTTAG_region QString("%r")
-#define KABC_FMTTAG_REGION QString("%R")
-#define KABC_FMTTAG_newline QString("\\n")
-#define KABC_FMTTAG_condcomma QString("%,")
-#define KABC_FMTTAG_condwhite QString("%w")
-#define KABC_FMTTAG_purgeempty QString("%0")
+#define KABC_FMTTAG_realname TQString("%n")
+#define KABC_FMTTAG_REALNAME TQString("%N")
+#define KABC_FMTTAG_company TQString("%cm")
+#define KABC_FMTTAG_COMPANY TQString("%CM")
+#define KABC_FMTTAG_pobox TQString("%p")
+#define KABC_FMTTAG_street TQString("%s")
+#define KABC_FMTTAG_STREET TQString("%S")
+#define KABC_FMTTAG_zipcode TQString("%z")
+#define KABC_FMTTAG_location TQString("%l")
+#define KABC_FMTTAG_LOCATION TQString("%L")
+#define KABC_FMTTAG_region TQString("%r")
+#define KABC_FMTTAG_REGION TQString("%R")
+#define KABC_FMTTAG_newline TQString("\\n")
+#define KABC_FMTTAG_condcomma TQString("%,")
+#define KABC_FMTTAG_condwhite TQString("%w")
+#define KABC_FMTTAG_purgeempty TQString("%0")
namespace KABC {
@@ -54,15 +54,15 @@ namespace KABC {
*/
class KABC_EXPORT Address
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Address & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Address & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Address & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Address & );
public:
/**
List of addresses.
*/
- typedef QValueList<Address> List;
- typedef QValueList<int> TypeList;
+ typedef TQValueList<Address> List;
+ typedef TQValueList<int> TypeList;
/**
Address types:
@@ -106,12 +106,12 @@ class KABC_EXPORT Address
/**
Sets the unique id.
*/
- void setId( const QString & );
+ void setId( const TQString & );
/*
Returns the unique id.
*/
- QString id() const;
+ TQString id() const;
/**
Sets the type of address. See enum for definiton of types.
@@ -128,127 +128,127 @@ class KABC_EXPORT Address
/**
Returns a translated string of all types the address has.
*/
- QString typeLabel() const;
+ TQString typeLabel() const;
/**
Sets the post office box.
*/
- void setPostOfficeBox( const QString & );
+ void setPostOfficeBox( const TQString & );
/**
Returns the post office box.
*/
- QString postOfficeBox() const;
+ TQString postOfficeBox() const;
/**
Returns the translated label for post office box field.
*/
- static QString postOfficeBoxLabel();
+ static TQString postOfficeBoxLabel();
/**
Sets the extended address information.
*/
- void setExtended( const QString & );
+ void setExtended( const TQString & );
/**
Returns the extended address information.
*/
- QString extended() const;
+ TQString extended() const;
/**
Returns the translated label for extended field.
*/
- static QString extendedLabel();
+ static TQString extendedLabel();
/**
Sets the street (including number).
*/
- void setStreet( const QString & );
+ void setStreet( const TQString & );
/**
Returns the street.
*/
- QString street() const;
+ TQString street() const;
/**
Returns the translated label for street field.
*/
- static QString streetLabel();
+ static TQString streetLabel();
/**
Sets the locality, e.g. city.
*/
- void setLocality( const QString & );
+ void setLocality( const TQString & );
/**
Returns the locality.
*/
- QString locality() const;
+ TQString locality() const;
/**
Returns the translated label for locality field.
*/
- static QString localityLabel();
+ static TQString localityLabel();
/**
Sets the region, e.g. state.
*/
- void setRegion( const QString & );
+ void setRegion( const TQString & );
/**
Returns the region.
*/
- QString region() const;
+ TQString region() const;
/**
Returns the translated label for region field.
*/
- static QString regionLabel();
+ static TQString regionLabel();
/**
Sets the postal code.
*/
- void setPostalCode( const QString & );
+ void setPostalCode( const TQString & );
/**
Returns the postal code.
*/
- QString postalCode() const;
+ TQString postalCode() const;
/**
Returns the translated label for postal code field.
*/
- static QString postalCodeLabel();
+ static TQString postalCodeLabel();
/**
Sets the country.
*/
- void setCountry( const QString & );
+ void setCountry( const TQString & );
/**
Returns the country.
*/
- QString country() const;
+ TQString country() const;
/**
Returns the translated label for country field.
*/
- static QString countryLabel();
+ static TQString countryLabel();
/**
Sets the delivery label. This is the literal text to be used as label.
*/
- void setLabel( const QString & );
+ void setLabel( const TQString & );
/**
Returns the delivery label.
*/
- QString label() const;
+ TQString label() const;
/**
Returns the translated label for delivery label field.
*/
- static QString labelLabel();
+ static TQString labelLabel();
/**
Returns the list of available types.
@@ -258,7 +258,7 @@ class KABC_EXPORT Address
/**
Returns the translated label for a special type.
*/
- static QString typeLabel( int type );
+ static TQString typeLabel( int type );
/**
Used for debug output.
@@ -276,8 +276,8 @@ class KABC_EXPORT Address
@param orgaName the name of the organization or company
@return the formatted address (containing newline characters)
*/
- QString formattedAddress( const QString &realName=QString::null
- , const QString &orgaName=QString::null ) const;
+ TQString formattedAddress( const TQString &realName=TQString::null
+ , const TQString &orgaName=TQString::null ) const;
/**
Returns ISO code for a localized country name. Only localized country
@@ -286,7 +286,7 @@ class KABC_EXPORT Address
@param cname name of the country
@return two digit ISO code
*/
- static QString countryToISO( const QString &cname );
+ static TQString countryToISO( const TQString &cname );
/**
Returns a localized country name for a ISO code.
@@ -295,46 +295,46 @@ class KABC_EXPORT Address
@return localized name of the country
@since 3.2
*/
- static QString ISOtoCountry( const QString &ISOname );
+ static TQString ISOtoCountry( const TQString &ISOname );
private:
/**
Parses a snippet of an address template
@param tsection the template string to be parsed
- @param result QString reference in which the result will be stored
+ @param result TQString reference in which the result will be stored
@return true if at least one tag evaluated positively, else false
*/
- bool parseAddressTemplateSection( const QString &tsection
- , QString &result
- , const QString &realName
- , const QString &orgaName ) const;
+ bool parseAddressTemplateSection( const TQString &tsection
+ , TQString &result
+ , const TQString &realName
+ , const TQString &orgaName ) const;
/**
Finds the balanced closing bracket starting from the opening bracket at
pos in tsection.
@return position of closing bracket, -1 for unbalanced brackets
*/
- int findBalancedBracket( const QString &tsection, int pos ) const;
+ int findBalancedBracket( const TQString &tsection, int pos ) const;
bool mEmpty;
- QString mId;
+ TQString mId;
int mType;
- QString mPostOfficeBox;
- QString mExtended;
- QString mStreet;
- QString mLocality;
- QString mRegion;
- QString mPostalCode;
- QString mCountry;
- QString mLabel;
-
- static QMap<QString, QString> *mISOMap;
+ TQString mPostOfficeBox;
+ TQString mExtended;
+ TQString mStreet;
+ TQString mLocality;
+ TQString mRegion;
+ TQString mPostalCode;
+ TQString mCountry;
+ TQString mLabel;
+
+ static TQMap<TQString, TQString> *mISOMap;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const Address & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, Address & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Address & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Address & );
}
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 474975344..bf6d0d17a 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qregexp.h>
-#include <qtimer.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -43,22 +43,22 @@ struct AddressBook::AddressBookData
ErrorHandler *mErrorHandler;
KConfig *mConfig;
KRES::Manager<Resource> *mManager;
- QPtrList<Resource> mPendingLoadResources;
- QPtrList<Resource> mPendingSaveResources;
+ TQPtrList<Resource> mPendingLoadResources;
+ TQPtrList<Resource> mPendingSaveResources;
Iterator end;
};
struct AddressBook::Iterator::IteratorData
{
Resource::Iterator mIt;
- QValueList<Resource*> mResources;
+ TQValueList<Resource*> mResources;
int mCurrRes;
};
struct AddressBook::ConstIterator::ConstIteratorData
{
Resource::ConstIterator mIt;
- QValueList<Resource*> mResources;
+ TQValueList<Resource*> mResources;
int mCurrRes;
};
@@ -307,11 +307,11 @@ AddressBook::AddressBook()
d->mErrorHandler = 0;
d->mConfig = 0;
d->mManager = new KRES::Manager<Resource>( "contact" );
- d->end.d->mResources = QValueList<Resource*>();
+ d->end.d->mResources = TQValueList<Resource*>();
d->end.d->mCurrRes = -1;
}
-AddressBook::AddressBook( const QString &config )
+AddressBook::AddressBook( const TQString &config )
: d( new AddressBookData )
{
d->mErrorHandler = 0;
@@ -321,7 +321,7 @@ AddressBook::AddressBook( const QString &config )
d->mConfig = new KConfig( config );
d->mManager = new KRES::Manager<Resource>( "contact" );
d->mManager->readConfig( d->mConfig );
- d->end.d->mResources = QValueList<Resource*>();
+ d->end.d->mResources = TQValueList<Resource*>();
d->end.d->mCurrRes = -1;
}
@@ -400,7 +400,7 @@ bool AddressBook::asyncSave( Ticket *ticket )
AddressBook::Iterator AddressBook::begin()
{
- QValueList<Resource*> list;
+ TQValueList<Resource*> list;
KRES::Manager<Resource>::ActiveIterator resIt;
for ( resIt = d->mManager->activeBegin(); resIt != d->mManager->activeEnd(); ++resIt )
list.append( *resIt );
@@ -427,7 +427,7 @@ AddressBook::Iterator AddressBook::begin()
AddressBook::ConstIterator AddressBook::begin() const
{
- QValueList<Resource*> list;
+ TQValueList<Resource*> list;
KRES::Manager<Resource>::ActiveIterator resIt;
for ( resIt = d->mManager->activeBegin(); resIt != d->mManager->activeEnd(); ++resIt )
list.append( *resIt );
@@ -527,7 +527,7 @@ void AddressBook::insertAddressee( const Addressee &a )
Addressee addr( a );
if ( !fAddr.isEmpty() ) {
if ( fAddr != a )
- addr.setRevision( QDateTime::currentDateTime() );
+ addr.setRevision( TQDateTime::currentDateTime() );
else {
if ( fAddr.resource() == 0 ) {
fAddr.setResource( resource );
@@ -566,7 +566,7 @@ AddressBook::Iterator AddressBook::find( const Addressee &a )
return end();
}
-Addressee AddressBook::findByUid( const QString &uid )
+Addressee AddressBook::findByUid( const TQString &uid )
{
KRES::Manager<Resource>::ActiveIterator it;
for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
@@ -589,7 +589,7 @@ Addressee::List AddressBook::allAddressees()
return list;
}
-Addressee::List AddressBook::findByName( const QString &name )
+Addressee::List AddressBook::findByName( const TQString &name )
{
Addressee::List results;
@@ -600,7 +600,7 @@ Addressee::List AddressBook::findByName( const QString &name )
return results;
}
-Addressee::List AddressBook::findByEmail( const QString &email )
+Addressee::List AddressBook::findByEmail( const TQString &email )
{
Addressee::List results;
@@ -611,7 +611,7 @@ Addressee::List AddressBook::findByEmail( const QString &email )
return results;
}
-Addressee::List AddressBook::findByCategory( const QString &category )
+Addressee::List AddressBook::findByCategory( const TQString &category )
{
Addressee::List results;
@@ -634,9 +634,9 @@ void AddressBook::dump() const
kdDebug(5700) << "AddressBook::dump() --- end ---" << endl;
}
-QString AddressBook::identifier()
+TQString AddressBook::identifier()
{
- QStringList identifier;
+ TQStringList identifier;
KRES::Manager<Resource>::ActiveIterator it;
@@ -666,15 +666,15 @@ Field::List AddressBook::fields( int category )
return result;
}
-bool AddressBook::addCustomField( const QString &label, int category,
- const QString &key, const QString &app )
+bool AddressBook::addCustomField( const TQString &label, int category,
+ const TQString &key, const TQString &app )
{
if ( d->mAllFields.isEmpty() ) {
d->mAllFields = Field::allFields();
}
- QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
- QString k = key.isNull() ? label : key;
+ TQString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
+ TQString k = key.isNull() ? label : key;
Field *field = Field::createCustomField( label, category, k, a );
@@ -685,14 +685,14 @@ bool AddressBook::addCustomField( const QString &label, int category,
return true;
}
-QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab )
+TQDataStream &KABC::operator<<( TQDataStream &s, const AddressBook &ab )
{
if (!ab.d) return s;
return s;// << ab.d->mAddressees;
}
-QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab )
+TQDataStream &KABC::operator>>( TQDataStream &s, AddressBook &ab )
{
if (!ab.d) return s;
@@ -711,15 +711,15 @@ bool AddressBook::addResource( Resource *resource )
d->mManager->add( resource );
resource->setAddressBook( this );
- connect( resource, SIGNAL( loadingFinished( Resource* ) ),
- this, SLOT( resourceLoadingFinished( Resource* ) ) );
- connect( resource, SIGNAL( savingFinished( Resource* ) ),
- this, SLOT( resourceSavingFinished( Resource* ) ) );
+ connect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ),
+ this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
+ connect( resource, TQT_SIGNAL( savingFinished( Resource* ) ),
+ this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
- connect( resource, SIGNAL( loadingError( Resource*, const QString& ) ),
- this, SLOT( resourceLoadingError( Resource*, const QString& ) ) );
- connect( resource, SIGNAL( savingError( Resource*, const QString& ) ),
- this, SLOT( resourceSavingError( Resource*, const QString& ) ) );
+ connect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
+ this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+ connect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
+ this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
return true;
}
@@ -733,24 +733,24 @@ bool AddressBook::removeResource( Resource *resource )
resource->setAddressBook( 0 );
- disconnect( resource, SIGNAL( loadingFinished( Resource* ) ),
- this, SLOT( resourceLoadingFinished( Resource* ) ) );
- disconnect( resource, SIGNAL( savingFinished( Resource* ) ),
- this, SLOT( resourceSavingFinished( Resource* ) ) );
+ disconnect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ),
+ this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
+ disconnect( resource, TQT_SIGNAL( savingFinished( Resource* ) ),
+ this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
- disconnect( resource, SIGNAL( loadingError( Resource*, const QString& ) ),
- this, SLOT( resourceLoadingError( Resource*, const QString& ) ) );
- disconnect( resource, SIGNAL( savingError( Resource*, const QString& ) ),
- this, SLOT( resourceLoadingError( Resource*, const QString& ) ) );
+ disconnect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
+ this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+ disconnect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
+ this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
d->mManager->remove( resource );
return true;
}
-QPtrList<Resource> AddressBook::resources()
+TQPtrList<Resource> AddressBook::resources()
{
- QPtrList<Resource> list;
+ TQPtrList<Resource> list;
KRES::Manager<Resource>::ActiveIterator it;
for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
@@ -769,7 +769,7 @@ void AddressBook::setErrorHandler( ErrorHandler *handler )
d->mErrorHandler = handler;
}
-void AddressBook::error( const QString& msg )
+void AddressBook::error( const TQString& msg )
{
if ( !d->mErrorHandler ) // create default error handler
d->mErrorHandler = new ConsoleErrorHandler;
@@ -825,7 +825,7 @@ void AddressBook::resourceSavingFinished( Resource *res )
emit savingFinished( res );
}
-void AddressBook::resourceLoadingError( Resource *res, const QString &errMsg )
+void AddressBook::resourceLoadingError( Resource *res, const TQString &errMsg )
{
error( errMsg );
@@ -834,7 +834,7 @@ void AddressBook::resourceLoadingError( Resource *res, const QString &errMsg )
emit addressBookChanged( this );
}
-void AddressBook::resourceSavingError( Resource *res, const QString &errMsg )
+void AddressBook::resourceSavingError( Resource *res, const TQString &errMsg )
{
error( errMsg );
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index d12130201..0da25b30e 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -21,8 +21,8 @@
#ifndef KABC_ADDRESSBOOK_H
#define KABC_ADDRESSBOOK_H
-#include <qobject.h>
-#include <qptrlist.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
#include <kresources/manager.h>
@@ -44,8 +44,8 @@ class KABC_EXPORT AddressBook : public QObject
{
Q_OBJECT
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const AddressBook & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, AddressBook & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const AddressBook & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, AddressBook & );
friend class StdAddressBook;
public:
@@ -115,7 +115,7 @@ class KABC_EXPORT AddressBook : public QObject
@param config The config file which contains the resource settings.
*/
- AddressBook( const QString &config );
+ AddressBook( const TQString &config );
/**
Destructor.
@@ -244,7 +244,7 @@ class KABC_EXPORT AddressBook : public QObject
@return The addressee with the specified unique identifier or an
empty addressee.
*/
- Addressee findByUid( const QString &uid ); // KDE4: const
+ Addressee findByUid( const TQString &uid ); // KDE4: const
/**
Returns a list of all addressees in the address book.
@@ -257,7 +257,7 @@ class KABC_EXPORT AddressBook : public QObject
@param name The name you are looking for.
@return A list of all matching addressees.
*/
- Addressee::List findByName( const QString &name ); // KDE4: const
+ Addressee::List findByName( const TQString &name ); // KDE4: const
/**
Searches all addressees which match the specified email address.
@@ -265,7 +265,7 @@ class KABC_EXPORT AddressBook : public QObject
@param email The email address you are looking for.
@return A list of all matching addressees.
*/
- Addressee::List findByEmail( const QString &email ); // KDE4: const
+ Addressee::List findByEmail( const TQString &email ); // KDE4: const
/**
Searches all addressees which belongs to the specified category.
@@ -273,13 +273,13 @@ class KABC_EXPORT AddressBook : public QObject
@param category The category you are looking for.
@return A list of all matching addressees.
*/
- Addressee::List findByCategory( const QString &category ); // KDE4: const
+ Addressee::List findByCategory( const TQString &category ); // KDE4: const
/**
Returns a string identifying this addressbook. The identifier is
created by concatenation of the resource identifiers.
*/
- virtual QString identifier(); // KDE4: const
+ virtual TQString identifier(); // KDE4: const
/**
Returns a list of all Fields known to the address book which are associated
@@ -296,9 +296,9 @@ class KABC_EXPORT AddressBook : public QObject
@param app String used as application key for reading and writing
the field.
*/
- bool addCustomField( const QString &label, int category = Field::All,
- const QString &key = QString::null,
- const QString &app = QString::null );
+ bool addCustomField( const TQString &label, int category = Field::All,
+ const TQString &key = TQString::null,
+ const TQString &app = TQString::null );
/**
Adds a resource to the address book.
@@ -319,7 +319,7 @@ class KABC_EXPORT AddressBook : public QObject
/**
Returns a list of all resources.
*/
- QPtrList<Resource> resources(); // KDE4: const
+ TQPtrList<Resource> resources(); // KDE4: const
/**
Sets the @p ErrorHandler, that is used by error() to
@@ -334,7 +334,7 @@ class KABC_EXPORT AddressBook : public QObject
@param msg The error message that shall be displayed.
*/
- void error( const QString &msg );
+ void error( const TQString &msg );
/**
@deprecated There is no need to call this function anymore.
@@ -408,8 +408,8 @@ class KABC_EXPORT AddressBook : public QObject
protected slots:
void resourceLoadingFinished( Resource* );
void resourceSavingFinished( Resource* );
- void resourceLoadingError( Resource*, const QString& );
- void resourceSavingError( Resource*, const QString& );
+ void resourceLoadingError( Resource*, const TQString& );
+ void resourceSavingError( Resource*, const TQString& );
protected:
void deleteRemovedAddressees();
@@ -418,13 +418,13 @@ class KABC_EXPORT AddressBook : public QObject
KRES::Manager<Resource> *resourceManager();
private:
- QPtrList<Resource> mDummy; // Remove in KDE 4
+ TQPtrList<Resource> mDummy; // Remove in KDE 4
struct AddressBookData;
AddressBookData *d;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const AddressBook & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, AddressBook & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const AddressBook & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, AddressBook & );
}
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index c7d353d3a..160df026b 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -18,10 +18,10 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
-#include <qregexp.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqgroupbox.h>
+#include <tqregexp.h>
#include <klocale.h>
#include <kdebug.h>
@@ -33,19 +33,19 @@
using namespace KABC;
-AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
- QListViewItem( parent ),
+AddresseeItem::AddresseeItem( TQListView *parent, const Addressee &addressee ) :
+ TQListViewItem( parent ),
mAddressee( addressee )
{
setText( Name, addressee.realName() );
setText( Email, addressee.preferredEmail() );
}
-QString AddresseeItem::key( int column, bool ) const
+TQString AddresseeItem::key( int column, bool ) const
{
if (column == Email) {
- QString value = text(Email);
- QRegExp emailRe("<\\S*>");
+ TQString value = text(Email);
+ TQRegExp emailRe("<\\S*>");
int match = emailRe.search(value);
if (match > -1)
value = value.mid(match + 1, emailRe.matchedLength() - 2);
@@ -56,14 +56,14 @@ QString AddresseeItem::key( int column, bool ) const
return text(column).lower();
}
-AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
+AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
Ok|Cancel, Ok, parent ), mMultiple( multiple )
{
- QWidget *topWidget = plainPage();
+ TQWidget *topWidget = plainPage();
- QBoxLayout *topLayout = new QHBoxLayout( topWidget );
- QBoxLayout *listLayout = new QVBoxLayout;
+ TQBoxLayout *topLayout = new TQHBoxLayout( topWidget );
+ TQBoxLayout *listLayout = new QVBoxLayout;
topLayout->addLayout( listLayout );
mAddresseeList = new KListView( topWidget );
@@ -72,27 +72,27 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
mAddresseeList->setAllColumnsShowFocus( true );
mAddresseeList->setFullWidth( true );
listLayout->addWidget( mAddresseeList );
- connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
- SLOT( slotOk() ) );
- connect( mAddresseeList, SIGNAL( selectionChanged( QListViewItem * ) ),
- SLOT( updateEdit( QListViewItem * ) ) );
+ connect( mAddresseeList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ TQT_SLOT( slotOk() ) );
+ connect( mAddresseeList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
+ TQT_SLOT( updateEdit( TQListViewItem * ) ) );
mAddresseeEdit = new KLineEdit( topWidget );
mAddresseeEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
- connect( mAddresseeEdit->completionObject(), SIGNAL( match( const QString & ) ),
- SLOT( selectItem( const QString & ) ) );
+ connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ),
+ TQT_SLOT( selectItem( const TQString & ) ) );
mAddresseeEdit->setFocus();
mAddresseeEdit->completionObject()->setIgnoreCase( true );
listLayout->addWidget( mAddresseeEdit );
- setInitialSize( QSize( 450, 300 ) );
+ setInitialSize( TQSize( 450, 300 ) );
if ( mMultiple ) {
- QBoxLayout *selectedLayout = new QVBoxLayout;
+ TQBoxLayout *selectedLayout = new QVBoxLayout;
topLayout->addLayout( selectedLayout );
topLayout->setSpacing( spacingHint() );
- QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"),
+ TQGroupBox *selectedGroup = new TQGroupBox( 1, Horizontal, i18n("Selected"),
topWidget );
selectedLayout->addWidget( selectedGroup );
@@ -101,23 +101,23 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
mSelectedList->addColumn( i18n("Email") );
mSelectedList->setAllColumnsShowFocus( true );
mSelectedList->setFullWidth( true );
- connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
- SLOT( removeSelected() ) );
+ connect( mSelectedList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ TQT_SLOT( removeSelected() ) );
- QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup );
- connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
+ TQPushButton *unselectButton = new TQPushButton( i18n("Unselect"), selectedGroup );
+ connect ( unselectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelected() ) );
- connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
- SLOT( addSelected( QListViewItem * ) ) );
+ connect( mAddresseeList, TQT_SIGNAL( clicked( TQListViewItem * ) ),
+ TQT_SLOT( addSelected( TQListViewItem * ) ) );
- setInitialSize( QSize( 650, 350 ) );
+ setInitialSize( TQSize( 650, 350 ) );
}
mAddressBook = StdAddressBook::self( true );
- connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
- SLOT( addressBookChanged() ) );
- connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
- SLOT( addressBookChanged() ) );
+ connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
+ TQT_SLOT( addressBookChanged() ) );
+ connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ),
+ TQT_SLOT( addressBookChanged() ) );
loadAddressBook();
}
@@ -140,7 +140,7 @@ void AddresseeDialog::loadAddressBook()
}
}
-void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
+void AddresseeDialog::addCompletionItem( const TQString &str, TQListViewItem *item )
{
if ( str.isEmpty() ) return;
@@ -148,11 +148,11 @@ void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item
mAddresseeEdit->completionObject()->addItem( str );
}
-void AddresseeDialog::selectItem( const QString &str )
+void AddresseeDialog::selectItem( const TQString &str )
{
if ( str.isEmpty() ) return;
- QListViewItem *item = mItemDict.find( str );
+ TQListViewItem *item = mItemDict.find( str );
if ( item ) {
mAddresseeList->blockSignals( true );
mAddresseeList->setSelected( item, true );
@@ -161,20 +161,20 @@ void AddresseeDialog::selectItem( const QString &str )
}
}
-void AddresseeDialog::updateEdit( QListViewItem *item )
+void AddresseeDialog::updateEdit( TQListViewItem *item )
{
mAddresseeEdit->setText( item->text( 0 ) );
mAddresseeEdit->setSelection( 0, item->text( 0 ).length() );
}
-void AddresseeDialog::addSelected( QListViewItem *item )
+void AddresseeDialog::addSelected( TQListViewItem *item )
{
AddresseeItem *addrItem = dynamic_cast<AddresseeItem *>( item );
if ( !addrItem ) return;
Addressee a = addrItem->addressee();
- QListViewItem *selectedItem = mSelectedDict.find( a.uid() );
+ TQListViewItem *selectedItem = mSelectedDict.find( a.uid() );
if ( !selectedItem ) {
selectedItem = new AddresseeItem( mSelectedList, a );
mSelectedDict.insert( a.uid(), selectedItem );
@@ -183,7 +183,7 @@ void AddresseeDialog::addSelected( QListViewItem *item )
void AddresseeDialog::removeSelected()
{
- QListViewItem *item = mSelectedList->selectedItem();
+ TQListViewItem *item = mSelectedList->selectedItem();
AddresseeItem *addrItem = dynamic_cast<AddresseeItem *>( item );
if ( !addrItem ) return;
@@ -210,7 +210,7 @@ Addressee::List AddresseeDialog::addressees()
AddresseeItem *aItem = 0;
if ( mMultiple ) {
- QListViewItem *item = mSelectedList->firstChild();
+ TQListViewItem *item = mSelectedList->firstChild();
while( item ) {
aItem = dynamic_cast<AddresseeItem *>( item );
if ( aItem ) al.append( aItem->addressee() );
@@ -226,13 +226,13 @@ Addressee::List AddresseeDialog::addressees()
return al;
}
-Addressee AddresseeDialog::getAddressee( QWidget *parent )
+Addressee AddresseeDialog::getAddressee( TQWidget *parent )
{
AddresseeDialog *dlg = new AddresseeDialog( parent );
Addressee addressee;
int result = dlg->exec();
- if ( result == QDialog::Accepted ) {
+ if ( result == TQDialog::Accepted ) {
addressee = dlg->addressee();
}
@@ -240,12 +240,12 @@ Addressee AddresseeDialog::getAddressee( QWidget *parent )
return addressee;
}
-Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
+Addressee::List AddresseeDialog::getAddressees( TQWidget *parent )
{
AddresseeDialog *dlg = new AddresseeDialog( parent, true );
Addressee::List addressees;
int result = dlg->exec();
- if ( result == QDialog::Accepted ) {
+ if ( result == TQDialog::Accepted ) {
addressees = dlg->addressees();
}
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 2d15804b1..51dbc98b6 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 <tqdict.h>
#include <kdialogbase.h>
#include <klineedit.h>
@@ -51,7 +51,7 @@ class KABC_EXPORT AddresseeItem : public QListViewItem
@param parent The parent listview.
@param addressee The associated addressee.
*/
- AddresseeItem( QListView *parent, const Addressee &addressee );
+ AddresseeItem( TQListView *parent, const Addressee &addressee );
/**
Returns the addressee.
@@ -59,9 +59,9 @@ class KABC_EXPORT AddresseeItem : public QListViewItem
Addressee addressee() const { return mAddressee; }
/**
- Method used by QListView to sort the items.
+ Method used by TQListView to sort the items.
*/
- virtual QString key( int column, bool ascending ) const;
+ virtual TQString key( int column, bool ascending ) const;
private:
Addressee mAddressee;
@@ -91,7 +91,7 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
@param parent parent widget
@param multiple if true, indicates a multiple selection.
*/
- AddresseeDialog( QWidget *parent=0, bool multiple=false );
+ AddresseeDialog( TQWidget *parent=0, bool multiple=false );
/**
Destructor.
@@ -117,7 +117,7 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
If the user doesn't select an entry or presses cancel, the returned
addressee is empty.
*/
- static Addressee getAddressee( QWidget *parent );
+ static Addressee getAddressee( TQWidget *parent );
/**
Select multiple address book entries.
@@ -126,12 +126,12 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
If the user doesn't select an entry or presses cancel, the returned
addressee list is empty.
*/
- static Addressee::List getAddressees( QWidget *parent );
+ static Addressee::List getAddressees( TQWidget *parent );
private slots:
- void selectItem( const QString & );
- void updateEdit( QListViewItem *item );
- void addSelected( QListViewItem *item );
+ void selectItem( const TQString & );
+ void updateEdit( TQListViewItem *item );
+ void addSelected( TQListViewItem *item );
void removeSelected();
protected slots:
@@ -139,7 +139,7 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
private:
void loadAddressBook();
- void addCompletionItem( const QString &str, QListViewItem *item );
+ void addCompletionItem( const TQString &str, TQListViewItem *item );
bool mMultiple;
@@ -150,8 +150,8 @@ class KABC_EXPORT AddresseeDialog : public KDialogBase
AddressBook *mAddressBook;
- QDict<QListViewItem> mItemDict;
- QDict<QListViewItem> mSelectedDict;
+ TQDict<TQListViewItem> mItemDict;
+ TQDict<TQListViewItem> mSelectedDict;
class AddresseeDialogPrivate;
AddresseeDialogPrivate *d;
diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp
index 96ab62578..df4085a02 100644
--- a/kabc/addresseehelper.cpp
+++ b/kabc/addresseehelper.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kconfig.h>
#include <klocale.h>
@@ -38,7 +38,7 @@ AddresseeHelper *AddresseeHelper::self()
}
AddresseeHelper::AddresseeHelper()
- : QObject( qApp ),
+ : TQObject( qApp ),
DCOPObject( "KABC::AddresseeHelper" )
{
initSettings();
@@ -48,10 +48,10 @@ AddresseeHelper::AddresseeHelper()
}
// static
-void AddresseeHelper::addToSet( const QStringList& list,
- std::set<QString>& container )
+void AddresseeHelper::addToSet( const TQStringList& list,
+ std::set<TQString>& container )
{
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
if ( !(*it).isEmpty() )
container.insert( *it );
@@ -90,17 +90,17 @@ void AddresseeHelper::initSettings()
mTradeAsFamilyName = config.readBoolEntry( "TradeAsFamilyName", true );
}
-bool AddresseeHelper::containsTitle( const QString& title ) const
+bool AddresseeHelper::containsTitle( const TQString& title ) const
{
return mTitles.find( title ) != mTitles.end();
}
-bool AddresseeHelper::containsPrefix( const QString& prefix ) const
+bool AddresseeHelper::containsPrefix( const TQString& prefix ) const
{
return mPrefixes.find( prefix ) != mPrefixes.end();
}
-bool AddresseeHelper::containsSuffix( const QString& suffix ) const
+bool AddresseeHelper::containsSuffix( const TQString& suffix ) const
{
return mSuffixes.find( suffix ) != mSuffixes.end();
}
diff --git a/kabc/addresseehelper.h b/kabc/addresseehelper.h
index 8e58f5988..5280e6b2d 100644
--- a/kabc/addresseehelper.h
+++ b/kabc/addresseehelper.h
@@ -20,8 +20,8 @@
#ifndef KABC_ADDRESSEEHELPER_H
#define KABC_ADDRESSEEHELPER_H
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
#include <dcopobject.h>
@@ -33,16 +33,16 @@
namespace KABC {
-class KABC_EXPORT AddresseeHelper : public QObject, public DCOPObject
+class KABC_EXPORT AddresseeHelper : public TQObject, public DCOPObject
{
K_DCOP
public:
static AddresseeHelper *self();
- bool containsTitle( const QString& title ) const;
- bool containsPrefix( const QString& prefix ) const;
- bool containsSuffix( const QString& suffix ) const;
+ bool containsTitle( const TQString& title ) const;
+ bool containsPrefix( const TQString& prefix ) const;
+ bool containsSuffix( const TQString& suffix ) const;
bool tradeAsFamilyName() const;
k_dcop:
@@ -51,11 +51,11 @@ class KABC_EXPORT AddresseeHelper : public QObject, public DCOPObject
private:
AddresseeHelper();
- static void addToSet( const QStringList& list,
- std::set<QString>& container );
- std::set<QString> mTitles;
- std::set<QString> mPrefixes;
- std::set<QString> mSuffixes;
+ static void addToSet( const TQStringList& list,
+ std::set<TQString>& container );
+ std::set<TQString> mTitles;
+ std::set<TQString> mPrefixes;
+ std::set<TQString> mSuffixes;
bool mTradeAsFamilyName;
static AddresseeHelper *s_self;
diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp
index 361364881..cb9446927 100644
--- a/kabc/addresseelist.cpp
+++ b/kabc/addresseelist.cpp
@@ -37,46 +37,46 @@ using namespace KABC;
bool SortingTraits::Uid::eq( const Addressee &a1, const Addressee &a2 )
{
// locale awareness doesn't make sense sorting ids
- return ( QString::compare( a1.uid(), a2.uid() ) == 0 );
+ return ( TQString::compare( a1.uid(), a2.uid() ) == 0 );
}
bool SortingTraits::Uid::lt( const Addressee &a1, const Addressee &a2 )
{
// locale awareness doesn't make sense sorting ids
- return ( QString::compare( a1.uid(), a2.uid() ) < 0 );
+ return ( TQString::compare( a1.uid(), a2.uid() ) < 0 );
}
bool SortingTraits::Name::eq( const Addressee &a1, const Addressee &a2 )
{
- return ( QString::localeAwareCompare( a1.name(), a2.name() ) == 0 );
+ return ( TQString::localeAwareCompare( a1.name(), a2.name() ) == 0 );
}
bool SortingTraits::Name::lt( const Addressee &a1, const Addressee &a2 )
{
- return ( QString::localeAwareCompare( a1.name(), a2.name() ) < 0 );
+ return ( TQString::localeAwareCompare( a1.name(), a2.name() ) < 0 );
}
bool SortingTraits::FormattedName::eq( const Addressee &a1, const Addressee &a2 )
{
- return ( QString::localeAwareCompare( a1.formattedName(), a2.formattedName() ) == 0 );
+ return ( TQString::localeAwareCompare( a1.formattedName(), a2.formattedName() ) == 0 );
}
bool SortingTraits::FormattedName::lt( const Addressee &a1, const Addressee &a2 )
{
- return ( QString::localeAwareCompare( a1.formattedName(), a2.formattedName() ) < 0 );
+ return ( TQString::localeAwareCompare( a1.formattedName(), a2.formattedName() ) < 0 );
}
bool SortingTraits::FamilyName::eq( const Addressee &a1, const Addressee &a2 )
{
- return ( QString::localeAwareCompare( a1.familyName(), a2.familyName() ) == 0
- && QString::localeAwareCompare( a1.givenName(), a2.givenName() ) == 0 );
+ return ( TQString::localeAwareCompare( a1.familyName(), a2.familyName() ) == 0
+ && TQString::localeAwareCompare( a1.givenName(), a2.givenName() ) == 0 );
}
bool SortingTraits::FamilyName::lt( const Addressee &a1, const Addressee &a2 )
{
- int family = QString::localeAwareCompare( a1.familyName(), a2.familyName() );
+ int family = TQString::localeAwareCompare( a1.familyName(), a2.familyName() );
if ( 0 == family ) {
- return ( QString::localeAwareCompare( a1.givenName(), a2.givenName() ) < 0 );
+ return ( TQString::localeAwareCompare( a1.givenName(), a2.givenName() ) < 0 );
} else {
return family < 0;
}
@@ -84,15 +84,15 @@ bool SortingTraits::FamilyName::lt( const Addressee &a1, const Addressee &a2 )
bool SortingTraits::GivenName::eq( const Addressee &a1, const Addressee &a2 )
{
- return ( QString::localeAwareCompare( a1.givenName(), a2.givenName() ) == 0
- && QString::localeAwareCompare( a1.familyName(), a2.familyName() ) == 0 );
+ return ( TQString::localeAwareCompare( a1.givenName(), a2.givenName() ) == 0
+ && TQString::localeAwareCompare( a1.familyName(), a2.familyName() ) == 0 );
}
bool SortingTraits::GivenName::lt( const Addressee &a1, const Addressee &a2 )
{
- int given = QString::localeAwareCompare( a1.givenName(), a2.givenName() );
+ int given = TQString::localeAwareCompare( a1.givenName(), a2.givenName() );
if ( 0 == given ) {
- return ( QString::localeAwareCompare( a1.familyName(), a2.familyName() ) < 0 );
+ return ( TQString::localeAwareCompare( a1.familyName(), a2.familyName() ) < 0 );
} else {
return given < 0;
}
@@ -107,7 +107,7 @@ bool SortingTraits::GivenName::lt( const Addressee &a1, const Addressee &a2 )
static Field *sActiveField=0;
AddresseeList::AddresseeList()
- : QValueList<Addressee>()
+ : TQValueList<Addressee>()
{
mReverseSorting = false;
mActiveSortingCriterion = FormattedName;
@@ -118,14 +118,14 @@ AddresseeList::~AddresseeList()
}
AddresseeList::AddresseeList( const AddresseeList &l )
- : QValueList<Addressee>( l )
+ : TQValueList<Addressee>( l )
{
mReverseSorting = l.reverseSorting();
mActiveSortingCriterion = l.sortingCriterion();
}
-AddresseeList::AddresseeList( const QValueList<Addressee> &l )
- : QValueList<Addressee>( l )
+AddresseeList::AddresseeList( const TQValueList<Addressee> &l )
+ : TQValueList<Addressee>( l )
{
mReverseSorting = false;
}
@@ -135,7 +135,7 @@ void AddresseeList::dump() const
kdDebug(5700) << "AddresseeList {" << endl;
kdDebug(5700) << "reverse order: " << ( mReverseSorting ? "true" : "false" ) << endl;
- QString crit;
+ TQString crit;
if ( Uid == mActiveSortingCriterion ) {
crit = "Uid";
} else if ( Name == mActiveSortingCriterion ) {
diff --git a/kabc/addresseelist.h b/kabc/addresseelist.h
index 2e6df06e4..7c9df0275 100644
--- a/kabc/addresseelist.h
+++ b/kabc/addresseelist.h
@@ -22,7 +22,7 @@
#ifndef KABC_ADDRESSEELIST_H
#define KABC_ADDRESSEELIST_H
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include "addressee.h"
@@ -87,11 +87,11 @@ class KABC_EXPORT GivenName // fallback to family name
typedef enum { Uid, Name, FormattedName, FamilyName, GivenName } SortingCriterion;
/**
- * @short a QValueList of Addressee, with sorting functionality
+ * @short a TQValueList of Addressee, with sorting functionality
*
- * This class extends the functionality of QValueList with
+ * This class extends the functionality of TQValueList with
* sorting methods specific to the Addressee class. It can be used
- * just like any other QValueList but is no template class.
+ * just like any other TQValueList but is no template class.
*
* An AddresseeList does not automatically keep sorted when addressees
* are added or removed or the sorting order is changed, as this would
@@ -99,7 +99,7 @@ typedef enum { Uid, Name, FormattedName, FamilyName, GivenName } SortingCriterio
* such operations you have to call {@link #sort} or {@link #sortBy} to
* create a defined order again.
*
- * Iterator usage is inherited by QValueList and extensively documented
+ * Iterator usage is inherited by TQValueList and extensively documented
* there. Please remember that the state of an iterator is undefined
* after any sorting operation.
*
@@ -109,13 +109,13 @@ typedef enum { Uid, Name, FormattedName, FamilyName, GivenName } SortingCriterio
*
* @author Jost Schenck jost@schenck.de
*/
-class KABC_EXPORT AddresseeList : public QValueList<Addressee>
+class KABC_EXPORT AddresseeList : public TQValueList<Addressee>
{
public:
AddresseeList();
~AddresseeList();
AddresseeList( const AddresseeList & );
- AddresseeList( const QValueList<Addressee> & );
+ AddresseeList( const TQValueList<Addressee> & );
/**
* Debug output.
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index 8e20c7975..b048d9f96 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -25,12 +25,12 @@
#include "addresslineedit.h"
-#include <qapplication.h>
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qregexp.h>
-#include <qevent.h>
-#include <qdragobject.h>
+#include <tqapplication.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
+#include <tqregexp.h>
+#include <tqevent.h>
+#include <tqdragobject.h>
#include <kcompletionbox.h>
#include <kconfig.h>
@@ -57,19 +57,19 @@ using namespace KABC;
KCompletion * AddressLineEdit::s_completion = 0L;
bool AddressLineEdit::s_addressesDirty = false;
-QTimer* AddressLineEdit::s_LDAPTimer = 0L;
+TQTimer* AddressLineEdit::s_LDAPTimer = 0L;
LdapSearch* AddressLineEdit::s_LDAPSearch = 0L;
-QString* AddressLineEdit::s_LDAPText = 0L;
+TQString* AddressLineEdit::s_LDAPText = 0L;
AddressLineEdit* AddressLineEdit::s_LDAPLineEdit = 0L;
KConfig *AddressLineEdit::s_config = 0L;
static KStaticDeleter<KCompletion> completionDeleter;
-static KStaticDeleter<QTimer> ldapTimerDeleter;
+static KStaticDeleter<TQTimer> ldapTimerDeleter;
static KStaticDeleter<LdapSearch> ldapSearchDeleter;
-static KStaticDeleter<QString> ldapTextDeleter;
+static KStaticDeleter<TQString> ldapTextDeleter;
static KStaticDeleter<KConfig> configDeleter;
-AddressLineEdit::AddressLineEdit(QWidget* parent,
+AddressLineEdit::AddressLineEdit(TQWidget* parent,
bool useCompletion,
const char *name)
: KLineEdit(parent,name)
@@ -100,26 +100,26 @@ void AddressLineEdit::init()
if( m_useCompletion ) {
if( !s_LDAPTimer ) {
- ldapTimerDeleter.setObject( s_LDAPTimer, new QTimer );
+ ldapTimerDeleter.setObject( s_LDAPTimer, new TQTimer );
ldapSearchDeleter.setObject( s_LDAPSearch, new LdapSearch );
- ldapTextDeleter.setObject( s_LDAPText, new QString );
+ ldapTextDeleter.setObject( s_LDAPText, new TQString );
}
- connect( s_LDAPTimer, SIGNAL( timeout()), SLOT( slotStartLDAPLookup()));
- connect( s_LDAPSearch, SIGNAL( searchData( const QStringList& )),
- SLOT( slotLDAPSearchData( const QStringList& )));
+ connect( s_LDAPTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotStartLDAPLookup()));
+ connect( s_LDAPSearch, TQT_SIGNAL( searchData( const TQStringList& )),
+ TQT_SLOT( slotLDAPSearchData( const TQStringList& )));
}
if ( m_useCompletion && !m_completionInitialized )
{
setCompletionObject( s_completion, false ); // we handle it ourself
- connect( this, SIGNAL( completion(const QString&)),
- this, SLOT(slotCompletion() ));
+ connect( this, TQT_SIGNAL( completion(const TQString&)),
+ this, TQT_SLOT(slotCompletion() ));
KCompletionBox *box = completionBox();
- connect( box, SIGNAL( highlighted( const QString& )),
- this, SLOT( slotPopupCompletion( const QString& ) ));
- connect( box, SIGNAL( userCancelled( const QString& )),
- SLOT( userCancelled( const QString& )));
+ connect( box, TQT_SIGNAL( highlighted( const TQString& )),
+ this, TQT_SLOT( slotPopupCompletion( const TQString& ) ));
+ connect( box, TQT_SIGNAL( userCancelled( const TQString& )),
+ TQT_SLOT( userCancelled( const TQString& )));
m_completionInitialized = true; // don't connect muliple times. That's
// ugly, tho, better have completionBox()
@@ -144,7 +144,7 @@ KConfig* AddressLineEdit::config()
return s_config;
}
-void AddressLineEdit::setFont( const QFont& font )
+void AddressLineEdit::setFont( const TQFont& font )
{
KLineEdit::setFont( font );
if ( m_useCompletion )
@@ -152,7 +152,7 @@ void AddressLineEdit::setFont( const QFont& font )
}
//-----------------------------------------------------------------------------
-void AddressLineEdit::keyPressEvent(QKeyEvent *e)
+void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
{
bool accept = false;
@@ -188,7 +188,7 @@ void AddressLineEdit::keyPressEvent(QKeyEvent *e)
}
}
-void AddressLineEdit::mouseReleaseEvent( QMouseEvent * e )
+void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e )
{
if (m_useCompletion && (e->button() == MidButton))
{
@@ -200,20 +200,20 @@ void AddressLineEdit::mouseReleaseEvent( QMouseEvent * e )
KLineEdit::mouseReleaseEvent(e);
}
-void AddressLineEdit::insert(const QString &t)
+void AddressLineEdit::insert(const TQString &t)
{
if (!m_smartPaste)
{
KLineEdit::insert(t);
return;
}
- QString newText = t.stripWhiteSpace();
+ TQString newText = t.stripWhiteSpace();
if (newText.isEmpty())
return;
// remove newlines in the to-be-pasted string as well as an eventual
// mailto: protocol
- newText.replace( QRegExp("\r?\n"), ", " );
+ newText.replace( TQRegExp("\r?\n"), ", " );
if ( newText.startsWith( "mailto:" ) )
{
KURL u(newText);
@@ -227,10 +227,10 @@ void AddressLineEdit::insert(const QString &t)
}
else if (newText.find("(at)") != -1)
{
- newText.replace( QRegExp("\\s*\\(at\\)\\s*"), "@" );
+ newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
}
- QString contents = text();
+ TQString contents = text();
int start_sel = 0;
int end_sel = 0;
int pos = cursorPosition();
@@ -248,7 +248,7 @@ void AddressLineEdit::insert(const QString &t)
while ((eot > 0) && contents[eot-1].isSpace()) eot--;
if (eot == 0)
{
- contents = QString::null;
+ contents = TQString::null;
}
else if (pos >= eot)
{
@@ -290,9 +290,9 @@ void AddressLineEdit::doCompletion(bool ctrlT)
if ( !m_useCompletion )
return;
- QString prevAddr;
+ TQString prevAddr;
- QString s(text());
+ TQString s(text());
int n = s.findRev(',');
if (n >= 0)
@@ -314,7 +314,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
if ( ctrlT )
{
- QStringList completions = s_completion->substringCompletion( s );
+ TQStringList completions = s_completion->substringCompletion( s );
if (completions.count() > 1) {
m_previousAddresses = prevAddr;
setCompletedItems( completions );
@@ -338,7 +338,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
case KGlobalSettings::CompletionPopup:
{
m_previousAddresses = prevAddr;
- QStringList items = s_completion->allMatches( s );
+ TQStringList items = s_completion->allMatches( s );
items += s_completion->allMatches( "\"" + s );
items += s_completion->substringCompletion( '<' + s );
uint beforeDollarCompletionCount = items.count();
@@ -351,7 +351,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
if ( items.count() > beforeDollarCompletionCount )
{
// remove the '$$whatever$' part
- for( QStringList::Iterator it = items.begin();
+ for( TQStringList::Iterator it = items.begin();
it != items.end();
++it )
{
@@ -374,7 +374,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
if (!autoSuggest)
{
int index = items.first().find( s );
- QString newText = prevAddr + items.first().mid( index );
+ TQString newText = prevAddr + items.first().mid( index );
//kdDebug() << "OLD TEXT: " << text() << endl;
//kdDebug() << "NEW TEXT: " << newText << endl;
setUserSelection(false);
@@ -387,7 +387,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
case KGlobalSettings::CompletionShell:
{
- QString match = s_completion->makeCompletion( s );
+ TQString match = s_completion->makeCompletion( s );
if ( !match.isNull() && match != s )
{
setText( prevAddr + match );
@@ -401,10 +401,10 @@ void AddressLineEdit::doCompletion(bool ctrlT)
{
if (!s.isEmpty())
{
- QString match = s_completion->makeCompletion( s );
+ TQString match = s_completion->makeCompletion( s );
if ( !match.isNull() && match != s )
{
- QString adds = prevAddr + match;
+ TQString adds = prevAddr + match;
setCompletedText( adds );
}
break;
@@ -417,7 +417,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
}
//-----------------------------------------------------------------------------
-void AddressLineEdit::slotPopupCompletion( const QString& completion )
+void AddressLineEdit::slotPopupCompletion( const TQString& completion )
{
setText( m_previousAddresses + completion );
cursorAtEnd();
@@ -429,12 +429,12 @@ void AddressLineEdit::loadAddresses()
s_completion->clear();
s_addressesDirty = false;
- QStringList adrs = addresses();
- for( QStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it)
+ TQStringList adrs = addresses();
+ for( TQStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it)
addAddress( *it );
}
-void AddressLineEdit::addAddress( const QString& adr )
+void AddressLineEdit::addAddress( const TQString& adr )
{
s_completion->addItem( adr );
int pos = adr.find( '<' );
@@ -462,9 +462,9 @@ void AddressLineEdit::stopLDAPLookup()
void AddressLineEdit::startLoadingLDAPEntries()
{
- QString s( *s_LDAPText );
+ TQString s( *s_LDAPText );
// TODO cache last?
- QString prevAddr;
+ TQString prevAddr;
int n = s.findRev(',');
if (n>= 0)
{
@@ -478,12 +478,12 @@ void AddressLineEdit::startLoadingLDAPEntries()
s_LDAPSearch->startSearch( s );
}
-void AddressLineEdit::slotLDAPSearchData( const QStringList& adrs )
+void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs )
{
if( s_LDAPLineEdit != this )
return;
- for( QStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) {
- QString name(*it);
+ for( TQStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) {
+ TQString name(*it);
int pos = name.find( " <" );
int pos_comma = name.find( ',' );
// put name in quotes, if we have a comma in the name
@@ -503,12 +503,12 @@ void AddressLineEdit::slotLDAPSearchData( const QStringList& adrs )
}
}
-QStringList AddressLineEdit::removeMailDupes( const QStringList& adrs )
+TQStringList AddressLineEdit::removeMailDupes( const TQStringList& adrs )
{
- QStringList src = adrs;
+ TQStringList src = adrs;
qHeapSort( src );
- QString last;
- for( QStringList::Iterator it = src.begin(); it != src.end(); ) {
+ TQString last;
+ for( TQStringList::Iterator it = src.begin(); it != src.end(); ) {
if( *it == last )
{
it = src.remove( it );
@@ -521,12 +521,12 @@ QStringList AddressLineEdit::removeMailDupes( const QStringList& adrs )
}
//-----------------------------------------------------------------------------
-void AddressLineEdit::dropEvent(QDropEvent *e)
+void AddressLineEdit::dropEvent(TQDropEvent *e)
{
KURL::List uriList;
if(KURLDrag::canDecode(e) && KURLDrag::decode( e, uriList ))
{
- QString ct = text();
+ TQString ct = text();
KURL::List::Iterator it = uriList.begin();
for (; it != uriList.end(); ++it)
{
@@ -543,28 +543,28 @@ void AddressLineEdit::dropEvent(QDropEvent *e)
else {
if (m_useCompletion)
m_smartPaste = true;
- QLineEdit::dropEvent(e);
+ TQLineEdit::dropEvent(e);
m_smartPaste = false;
}
}
-QStringList AddressLineEdit::addresses()
+TQStringList AddressLineEdit::addresses()
{
- QApplication::setOverrideCursor( KCursor::waitCursor() ); // loading might take a while
+ TQApplication::setOverrideCursor( KCursor::waitCursor() ); // loading might take a while
- QStringList result;
- QString space(" ");
- QRegExp needQuotes("[^ 0-9A-Za-z\\x0080-\\xFFFF]");
- QString endQuote("\" ");
- QString addr, email;
+ TQStringList result;
+ TQString space(" ");
+ TQRegExp needQuotes("[^ 0-9A-Za-z\\x0080-\\xFFFF]");
+ TQString endQuote("\" ");
+ TQString addr, email;
KABC::AddressBook *addressBook = KABC::StdAddressBook::self();
KABC::AddressBook::Iterator it;
for( it = addressBook->begin(); it != addressBook->end(); ++it ) {
- QStringList emails = (*it).emails();
+ TQStringList emails = (*it).emails();
- QString n = (*it).prefix() + space +
+ TQString n = (*it).prefix() + space +
(*it).givenName() + space +
(*it).additionalName() + space +
(*it).familyName() + space +
@@ -572,13 +572,13 @@ QStringList AddressLineEdit::addresses()
n = n.simplifyWhiteSpace();
- QStringList::ConstIterator mit;
+ TQStringList::ConstIterator mit;
for ( mit = emails.begin(); mit != emails.end(); ++mit ) {
email = *mit;
if (!email.isEmpty()) {
if (n.isEmpty() || (email.find( '<' ) != -1))
- addr = QString::null;
+ addr = TQString::null;
else { /* do we really need quotes around this name ? */
if (n.find(needQuotes) != -1)
addr = '"' + n + endQuote;
@@ -602,7 +602,7 @@ QStringList AddressLineEdit::addresses()
manager.load();
result += manager.listNames();
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
return result;
}
diff --git a/kabc/addresslineedit.h b/kabc/addresslineedit.h
index 05a0a7c58..093acf97b 100644
--- a/kabc/addresslineedit.h
+++ b/kabc/addresslineedit.h
@@ -23,9 +23,9 @@
#define KABC_ADDRESSLINEEDIT_H
// $Id$
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqptrlist.h>
+#include <tqtimer.h>
#include "klineedit.h"
#include "kcompletion.h"
@@ -41,7 +41,7 @@ class LdapSearch;
*
* This lineedit is supposed to be used wherever the user types email addresses
* and might want a completion. You can simply use it as a replacement for
- * KLineEdit or QLineEdit.
+ * KLineEdit or TQLineEdit.
*
* You can enable or disable the lineedit at any time.
*
@@ -51,7 +51,7 @@ class KABC_EXPORT AddressLineEdit : public KLineEdit
{
Q_OBJECT
public:
- AddressLineEdit(QWidget* parent, bool useCompletion = true,
+ AddressLineEdit(TQWidget* parent, bool useCompletion = true,
const char *name = 0L);
virtual ~AddressLineEdit();
@@ -59,7 +59,7 @@ public:
* Reimplented for internal reasons.
* @ see KLineEdit::setFont()
*/
- virtual void setFont( const QFont& );
+ virtual void setFont( const TQFont& );
static KConfig *config();
@@ -79,38 +79,38 @@ protected:
* Use addAddress() to add addresses.
*/
virtual void loadAddresses();
- void addAddress( const QString& );
- virtual void keyPressEvent(QKeyEvent*);
- virtual void dropEvent(QDropEvent *e);
+ void addAddress( const TQString& );
+ virtual void keyPressEvent(TQKeyEvent*);
+ virtual void dropEvent(TQDropEvent *e);
virtual void paste();
- virtual void insert(const QString &t);
- virtual void mouseReleaseEvent( QMouseEvent * e );
+ virtual void insert(const TQString &t);
+ virtual void mouseReleaseEvent( TQMouseEvent * e );
void doCompletion(bool ctrlT);
private slots:
void slotCompletion() { doCompletion(false); }
- void slotPopupCompletion( const QString& );
+ void slotPopupCompletion( const TQString& );
void slotStartLDAPLookup();
- void slotLDAPSearchData( const QStringList& );
+ void slotLDAPSearchData( const TQStringList& );
private:
void init();
void startLoadingLDAPEntries();
void stopLDAPLookup();
- QStringList addresses();
- QStringList removeMailDupes( const QStringList& adrs );
+ TQStringList addresses();
+ TQStringList removeMailDupes( const TQStringList& adrs );
- QString m_previousAddresses;
+ TQString m_previousAddresses;
bool m_useCompletion;
bool m_completionInitialized;
bool m_smartPaste;
- QString m_typedText; // unused
+ TQString m_typedText; // unused
static bool s_addressesDirty;
static KCompletion *s_completion;
- static QTimer *s_LDAPTimer;
+ static TQTimer *s_LDAPTimer;
static LdapSearch *s_LDAPSearch;
- static QString *s_LDAPText;
+ static TQString *s_LDAPText;
static AddressLineEdit *s_LDAPLineEdit;
static KConfig *s_config;
diff --git a/kabc/agent.cpp b/kabc/agent.cpp
index 780beb4ae..d21fa2998 100644
--- a/kabc/agent.cpp
+++ b/kabc/agent.cpp
@@ -29,7 +29,7 @@ Agent::Agent()
{
}
-Agent::Agent( const QString &url )
+Agent::Agent( const TQString &url )
: mAddressee( 0 ),mUrl( url ), mIntern( false )
{
}
@@ -87,7 +87,7 @@ Agent &Agent::operator=( const Agent &addr )
return *this;
}
-void Agent::setUrl( const QString &url )
+void Agent::setUrl( const TQString &url )
{
mUrl = url;
mIntern = false;
@@ -104,7 +104,7 @@ bool Agent::isIntern() const
return mIntern;
}
-QString Agent::url() const
+TQString Agent::url() const
{
return mUrl;
}
@@ -114,7 +114,7 @@ Addressee *Agent::addressee() const
return mAddressee;
}
-QString Agent::asString() const
+TQString Agent::asString() const
{
if ( mIntern )
return "intern agent";
@@ -122,7 +122,7 @@ QString Agent::asString() const
return mUrl;
}
-QDataStream &KABC::operator<<( QDataStream &s, const Agent &agent )
+TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
{
Q_UINT32 hasAddressee = ( agent.mAddressee != 0 );
@@ -133,7 +133,7 @@ QDataStream &KABC::operator<<( QDataStream &s, const Agent &agent )
return s;
}
-QDataStream &KABC::operator>>( QDataStream &s, Agent &agent )
+TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent )
{
Q_UINT32 hasAddressee;
diff --git a/kabc/agent.h b/kabc/agent.h
index a235e0247..467ee6603 100644
--- a/kabc/agent.h
+++ b/kabc/agent.h
@@ -23,7 +23,7 @@
class QDataStream;
-#include <qstring.h>
+#include <tqstring.h>
#include <kdelibs_export.h>
@@ -39,8 +39,8 @@ class Addressee;
*/
class KABC_EXPORT Agent
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Agent & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Agent & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Agent & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Agent & );
public:
@@ -54,7 +54,7 @@ public:
*
* @param url A URL that describes the position of the agent file.
*/
- Agent( const QString &url );
+ Agent( const TQString &url );
/**
* Consturctor.
@@ -80,7 +80,7 @@ public:
*
* @param url The location URL of the agent file.
*/
- void setUrl( const QString &url );
+ void setUrl( const TQString &url );
/**
* Sets the addressee of the agent. When using this function,
@@ -102,7 +102,7 @@ public:
/**
* Returns the location URL of this agent.
*/
- QString url() const;
+ TQString url() const;
/**
* Returns the addressee object of this agent.
@@ -112,17 +112,17 @@ public:
/**
* Returns string representation of the agent.
*/
- QString asString() const;
+ TQString asString() const;
private:
Addressee *mAddressee;
- QString mUrl;
+ TQString mUrl;
int mIntern;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const Agent & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, Agent & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Agent & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Agent & );
}
#endif
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index ec363e414..ee2f2e30a 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qpair.h>
-#include <qvaluelist.h>
+#include <tqapplication.h>
+#include <tqpair.h>
+#include <tqvaluelist.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
@@ -31,7 +31,7 @@
using namespace KABC;
DistributionList::DistributionList( DistributionListManager *manager,
- const QString &name ) :
+ const TQString &name ) :
mManager( manager ), mName( name )
{
mManager->insert( this );
@@ -42,21 +42,21 @@ DistributionList::~DistributionList()
mManager->remove( this );
}
-void DistributionList::setName( const QString &name )
+void DistributionList::setName( const TQString &name )
{
mName = name;
}
-QString DistributionList::name() const
+TQString DistributionList::name() const
{
return mName;
}
-void DistributionList::insertEntry( const Addressee &a, const QString &email )
+void DistributionList::insertEntry( const Addressee &a, const TQString &email )
{
Entry e( a, email );
- QValueList<Entry>::Iterator it;
+ TQValueList<Entry>::Iterator it;
for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
if ( (*it).addressee.uid() == a.uid() ) {
/**
@@ -74,9 +74,9 @@ void DistributionList::insertEntry( const Addressee &a, const QString &email )
mEntries.append( e );
}
-void DistributionList::removeEntry( const Addressee &a, const QString &email )
+void DistributionList::removeEntry( const Addressee &a, const TQString &email )
{
- QValueList<Entry>::Iterator it;
+ TQValueList<Entry>::Iterator it;
for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
if ( (*it).addressee.uid() == a.uid() && (*it).email == email ) {
mEntries.remove( it );
@@ -85,14 +85,14 @@ void DistributionList::removeEntry( const Addressee &a, const QString &email )
}
}
-QStringList DistributionList::emails() const
+TQStringList DistributionList::emails() const
{
- QStringList emails;
+ TQStringList emails;
Entry::List::ConstIterator it;
for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
Addressee a = (*it).addressee;
- QString email = (*it).email.isEmpty() ? a.fullEmail() :
+ TQString email = (*it).email.isEmpty() ? a.fullEmail() :
a.fullEmail( (*it).email );
if ( !email.isEmpty() ) {
@@ -108,13 +108,13 @@ DistributionList::Entry::List DistributionList::entries() const
return mEntries;
}
-typedef QValueList< QPair<QString, QString> > MissingEntryList;
+typedef TQValueList< QPair<TQString, TQString> > MissingEntryList;
class DistributionListManager::DistributionListManagerPrivate
{
public:
AddressBook *mAddressBook;
- QMap< QString, MissingEntryList > mMissingEntries;
+ TQMap< TQString, MissingEntryList > mMissingEntries;
};
DistributionListManager::DistributionListManager( AddressBook *ab )
@@ -132,7 +132,7 @@ DistributionListManager::~DistributionListManager()
d = 0;
}
-DistributionList *DistributionListManager::list( const QString &name )
+DistributionList *DistributionListManager::list( const TQString &name )
{
DistributionList *list;
for( list = mLists.first(); list; list = mLists.next() ) {
@@ -171,9 +171,9 @@ void DistributionListManager::remove( DistributionList *l )
}
}
-QStringList DistributionListManager::listNames()
+TQStringList DistributionListManager::listNames()
{
- QStringList names;
+ TQStringList names;
DistributionList *list;
for( list = mLists.first(); list; list = mLists.next() ) {
@@ -187,27 +187,27 @@ bool DistributionListManager::load()
{
KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
- QMap<QString,QString> entryMap = cfg.entryMap( "DistributionLists" );
+ TQMap<TQString,TQString> entryMap = cfg.entryMap( "DistributionLists" );
cfg.setGroup( "DistributionLists" );
// clear old lists
mLists.clear();
d->mMissingEntries.clear();
- QMap<QString,QString>::ConstIterator it;
+ TQMap<TQString,TQString>::ConstIterator it;
for( it = entryMap.constBegin(); it != entryMap.constEnd(); ++it ) {
- QString name = it.key();
- QStringList value = cfg.readListEntry( name );
+ TQString name = it.key();
+ TQStringList value = cfg.readListEntry( name );
kdDebug(5700) << "DLM::load(): " << name << ": " << value.join(",") << endl;
DistributionList *list = new DistributionList( this, name );
MissingEntryList missingEntries;
- QStringList::ConstIterator entryIt = value.constBegin();
+ TQStringList::ConstIterator entryIt = value.constBegin();
while( entryIt != value.constEnd() ) {
- QString id = *entryIt++;
- QString email = *entryIt;
+ TQString id = *entryIt++;
+ TQString email = *entryIt;
kdDebug(5700) << "----- Entry " << id << endl;
@@ -242,7 +242,7 @@ bool DistributionListManager::save()
for( list = mLists.first(); list; list = mLists.next() ) {
kdDebug(5700) << " Saving '" << list->name() << "'" << endl;
- QStringList value;
+ TQStringList value;
const DistributionList::Entry::List entries = list->entries();
DistributionList::Entry::List::ConstIterator it;
for( it = entries.begin(); it != entries.end(); ++it ) {
@@ -270,12 +270,12 @@ bool DistributionListManager::save()
DistributionListWatcher* DistributionListWatcher::mSelf = 0;
DistributionListWatcher::DistributionListWatcher()
- : QObject( qApp, "DistributionListWatcher" )
+ : TQObject( qApp, "DistributionListWatcher" )
{
mDirWatch = new KDirWatch;
mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
- connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) );
+ connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) );
mDirWatch->startScan();
}
@@ -287,7 +287,7 @@ DistributionListWatcher::~DistributionListWatcher()
DistributionListWatcher *DistributionListWatcher::self()
{
- kdWarning( !qApp ) << "No QApplication object available, you'll get a memleak!" << endl;
+ kdWarning( !qApp ) << "No TQApplication object available, you'll get a memleak!" << endl;
if ( !mSelf )
mSelf = new DistributionListWatcher();
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index 2aab60094..7ad8dff81 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -48,14 +48,14 @@ class KABC_EXPORT DistributionList
*/
struct Entry
{
- typedef QValueList<Entry> List;
+ typedef TQValueList<Entry> List;
Entry() {}
- Entry( const Addressee &_addressee, const QString &_email ) :
+ Entry( const Addressee &_addressee, const TQString &_email ) :
addressee( _addressee ), email( _email ) {}
Addressee addressee;
- QString email;
+ TQString email;
};
/**
@@ -64,7 +64,7 @@ class KABC_EXPORT DistributionList
@param manager Managing object of this list.
@param name Name of this list.
*/
- DistributionList( DistributionListManager *manager, const QString &name );
+ DistributionList( DistributionListManager *manager, const TQString &name );
/**
Destructor.
@@ -75,30 +75,30 @@ class KABC_EXPORT DistributionList
Set name of this list. The name is used as key by the
DistributinListManager.
*/
- void setName( const QString & );
+ void setName( const TQString & );
/**
Get name of this list.
*/
- QString name() const;
+ TQString name() const;
/**
Insert an entry into this distribution list. If the entry already exists
nothing happens.
*/
- void insertEntry( const Addressee &, const QString &email=QString::null );
+ void insertEntry( const Addressee &, const TQString &email=TQString::null );
/**
Remove an entry from this distribution list. If the entry doesn't exist
nothing happens.
*/
- void removeEntry( const Addressee &, const QString &email=QString::null );
+ void removeEntry( const Addressee &, const TQString &email=TQString::null );
/**
Return list of email addresses, which belong to this distributon list.
These addresses can be directly used by e.g. a mail client.
*/
- QStringList emails() const;
+ TQStringList emails() const;
/**
Return list of entries belonging to this distribution list. This function
@@ -108,7 +108,7 @@ class KABC_EXPORT DistributionList
private:
DistributionListManager *mManager;
- QString mName;
+ TQString mName;
Entry::List mEntries;
};
@@ -135,7 +135,7 @@ class KABC_EXPORT DistributionListManager
/**
Return distribution list with given name.
*/
- DistributionList *list( const QString &name ); // KDE4: add bool caseSensitive = true
+ DistributionList *list( const TQString &name ); // KDE4: add bool caseSensitive = true
/**
Insert distribution list. If a list with this name already exists, nothing
@@ -152,7 +152,7 @@ class KABC_EXPORT DistributionListManager
/**
Return names of all distribution lists managed by this manager.
*/
- QStringList listNames();
+ TQStringList listNames();
/**
Load distribution lists form disk.
@@ -168,7 +168,7 @@ class KABC_EXPORT DistributionListManager
class DistributionListManagerPrivate;
DistributionListManagerPrivate *d;
- QPtrList<DistributionList> mLists;
+ TQPtrList<DistributionList> mLists;
};
/**
@@ -182,7 +182,7 @@ class KABC_EXPORT DistributionListManager
\code
KABC::DistributionListWatcher *watchdog = KABC::DistributionListWatcher::self()
- connect( watchdog, SIGNAL( changed() ), SLOT( doSomething() ) );
+ connect( watchdog, TQT_SIGNAL( changed() ), TQT_SLOT( doSomething() ) );
\endcode
*/
diff --git a/kabc/distributionlistdialog.cpp b/kabc/distributionlistdialog.cpp
index 4533734da..737984077 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/kabc/distributionlistdialog.cpp
@@ -18,14 +18,14 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlistview.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qcombobox.h>
+#include <tqlistview.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqcombobox.h>
#include <kinputdialog.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
#include <klocale.h>
#include <kdebug.h>
@@ -40,13 +40,13 @@
using namespace KABC;
-DistributionListDialog::DistributionListDialog( AddressBook *addressBook, QWidget *parent)
+DistributionListDialog::DistributionListDialog( AddressBook *addressBook, TQWidget *parent)
: KDialogBase( parent, "", true, i18n("Configure Distribution Lists"), Ok, Ok, true)
{
mEditor = new DistributionListEditorWidget( addressBook, this );
setMainWidget( mEditor );
- connect( this, SIGNAL( okClicked() ), mEditor, SLOT( save() ) );
+ connect( this, TQT_SIGNAL( okClicked() ), mEditor, TQT_SLOT( save() ) );
}
DistributionListDialog::~DistributionListDialog()
@@ -54,25 +54,25 @@ DistributionListDialog::~DistributionListDialog()
}
// TODO KDE4: Add d-pointer to EmailSelector, make sEmailMap a member variable
-static QMap<QWidget*,QString> *sEmailMap = 0;
+static TQMap<TQWidget*,TQString> *sEmailMap = 0;
-EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
- QWidget *parent ) :
+EmailSelector::EmailSelector( const TQStringList &emails, const TQString &current,
+ TQWidget *parent ) :
KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
parent )
{
if (!sEmailMap)
- sEmailMap = new QMap<QWidget*,QString>();
- QFrame *topFrame = plainPage();
- QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+ sEmailMap = new TQMap<TQWidget*,TQString>();
+ TQFrame *topFrame = plainPage();
+ TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
- mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+ mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"),
topFrame );
topLayout->addWidget( mButtonGroup );
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for( it = emails.begin(); it != emails.end(); ++it ) {
- QRadioButton *button = new QRadioButton( *it, mButtonGroup );
+ TQRadioButton *button = new TQRadioButton( *it, mButtonGroup );
sEmailMap->insert( button, *it );
if ( (*it) == current ) {
mButtonGroup->setButton(mButtonGroup->id(button));
@@ -80,20 +80,20 @@ EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
}
}
-QString EmailSelector::selected()
+TQString EmailSelector::selected()
{
- QButton *button = mButtonGroup->selected();
+ TQButton *button = mButtonGroup->selected();
if ( button ) return (*sEmailMap)[button];
- return QString::null;
+ return TQString::null;
}
-QString EmailSelector::getEmail( const QStringList &emails, const QString &current,
- QWidget *parent )
+TQString EmailSelector::getEmail( const TQStringList &emails, const TQString &current,
+ TQWidget *parent )
{
EmailSelector *dlg = new EmailSelector( emails, current, parent );
dlg->exec();
- QString result = dlg->selected();
+ TQString result = dlg->selected();
delete dlg;
@@ -103,9 +103,9 @@ QString EmailSelector::getEmail( const QStringList &emails, const QString &curre
class EntryItem : public QListViewItem
{
public:
- EntryItem( QListView *parent, const Addressee &addressee,
- const QString &email=QString::null ) :
- QListViewItem( parent ),
+ EntryItem( TQListView *parent, const Addressee &addressee,
+ const TQString &email=TQString::null ) :
+ TQListViewItem( parent ),
mAddressee( addressee ),
mEmail( email )
{
@@ -124,84 +124,84 @@ class EntryItem : public QListViewItem
return mAddressee;
}
- QString email() const
+ TQString email() const
{
return mEmail;
}
private:
Addressee mAddressee;
- QString mEmail;
+ TQString mEmail;
};
-DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *addressBook, QWidget *parent) :
- QWidget( parent ),
+DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *addressBook, TQWidget *parent) :
+ TQWidget( parent ),
mAddressBook( addressBook )
{
kdDebug(5700) << "DistributionListEditor()" << endl;
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->setSpacing( KDialog::spacingHint() );
- QBoxLayout *nameLayout = new QHBoxLayout( topLayout) ;
+ TQBoxLayout *nameLayout = new TQHBoxLayout( topLayout) ;
- mNameCombo = new QComboBox( this );
+ mNameCombo = new TQComboBox( this );
nameLayout->addWidget( mNameCombo );
- connect( mNameCombo, SIGNAL( activated( int ) ), SLOT( updateEntryView() ) );
+ connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) );
- mNewButton = new QPushButton( i18n("New List..."), this );
+ mNewButton = new TQPushButton( i18n("New List..."), this );
nameLayout->addWidget( mNewButton );
- connect( mNewButton, SIGNAL( clicked() ), SLOT( newList() ) );
+ connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) );
- mEditButton = new QPushButton( i18n("Rename List..."), this );
+ mEditButton = new TQPushButton( i18n("Rename List..."), this );
nameLayout->addWidget( mEditButton );
- connect( mEditButton, SIGNAL( clicked() ), SLOT( editList() ) );
+ connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) );
- mRemoveButton = new QPushButton( i18n("Remove List"), this );
+ mRemoveButton = new TQPushButton( i18n("Remove List"), this );
nameLayout->addWidget( mRemoveButton );
- connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeList() ) );
+ connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) );
- QGridLayout *gridLayout = new QGridLayout( topLayout, 3, 3 );
+ TQGridLayout *gridLayout = new TQGridLayout( topLayout, 3, 3 );
gridLayout->setColStretch(1, 1);
- QLabel *listLabel = new QLabel( i18n("Available addresses:"), this );
+ TQLabel *listLabel = new TQLabel( i18n("Available addresses:"), this );
gridLayout->addWidget( listLabel, 0, 0 );
- mListLabel = new QLabel( this );
+ mListLabel = new TQLabel( this );
gridLayout->addMultiCellWidget( mListLabel, 0, 0, 1, 2 );
- mAddresseeView = new QListView( this );
+ mAddresseeView = new TQListView( 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 * ) ),
- SLOT( addEntry() ) );
+ connect( mAddresseeView, TQT_SIGNAL( selectionChanged() ),
+ TQT_SLOT( slotSelectionAddresseeViewChanged() ) );
+ connect( mAddresseeView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ TQT_SLOT( addEntry() ) );
- mAddEntryButton = new QPushButton( i18n("Add Entry"), this );
+ mAddEntryButton = new TQPushButton( i18n("Add Entry"), this );
mAddEntryButton->setEnabled(false);
gridLayout->addWidget( mAddEntryButton, 2, 0 );
- connect( mAddEntryButton, SIGNAL( clicked() ), SLOT( addEntry() ) );
+ connect( mAddEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) );
- mEntryView = new QListView( this );
+ mEntryView = new TQListView( this );
mEntryView->addColumn( i18n("Name") );
mEntryView->addColumn( i18n("Email") );
mEntryView->addColumn( i18n("Use Preferred") );
mEntryView->setEnabled(false);
mEntryView->setAllColumnsShowFocus( true );
gridLayout->addMultiCellWidget( mEntryView, 1, 1, 1, 2 );
- connect( mEntryView, SIGNAL( selectionChanged() ),
- SLOT( slotSelectionEntryViewChanged() ) );
+ connect( mEntryView, TQT_SIGNAL( selectionChanged() ),
+ TQT_SLOT( slotSelectionEntryViewChanged() ) );
- mChangeEmailButton = new QPushButton( i18n("Change Email..."), this );
+ mChangeEmailButton = new TQPushButton( i18n("Change Email..."), this );
gridLayout->addWidget( mChangeEmailButton, 2, 1 );
- connect( mChangeEmailButton, SIGNAL( clicked() ), SLOT( changeEmail() ) );
+ connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) );
- mRemoveEntryButton = new QPushButton( i18n("Remove Entry"), this );
+ mRemoveEntryButton = new TQPushButton( i18n("Remove Entry"), this );
gridLayout->addWidget( mRemoveEntryButton, 2, 2 );
- connect( mRemoveEntryButton, SIGNAL( clicked() ), SLOT( removeEntry() ) );
+ connect( mRemoveEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) );
mManager = new DistributionListManager( mAddressBook );
mManager->load();
@@ -234,8 +234,8 @@ void DistributionListEditorWidget::slotSelectionEntryViewChanged()
void DistributionListEditorWidget::newList()
{
bool ok;
- QString name = KInputDialog::getText( i18n( "New Distribution List" ),
- i18n( "Please enter &name:" ), QString::null, &ok );
+ TQString name = KInputDialog::getText( i18n( "New Distribution List" ),
+ i18n( "Please enter &name:" ), TQString::null, &ok );
if (!ok) return;
new DistributionList( mManager, name );
@@ -250,9 +250,9 @@ void DistributionListEditorWidget::newList()
void DistributionListEditorWidget::editList()
{
- QString oldName = mNameCombo->currentText();
+ TQString oldName = mNameCombo->currentText();
bool ok;
- QString name = KInputDialog::getText( i18n( "Distribution List" ),
+ TQString name = KInputDialog::getText( i18n( "Distribution List" ),
i18n( "Please change &name:" ), oldName, &ok );
if (!ok) return;
@@ -271,7 +271,7 @@ void DistributionListEditorWidget::removeList()
{
int result = KMessageBox::warningContinueCancel( this,
i18n("Delete distribution list '%1'?") .arg( mNameCombo->currentText() ),
- QString::null, KStdGuiItem::del() );
+ TQString::null, KStdGuiItem::del() );
if ( result != KMessageBox::Continue ) return;
@@ -325,7 +325,7 @@ void DistributionListEditorWidget::changeEmail()
static_cast<EntryItem *>( mEntryView->selectedItem() );
if ( !entryItem ) return;
- QString email = EmailSelector::getEmail( entryItem->addressee().emails(),
+ TQString email = EmailSelector::getEmail( entryItem->addressee().emails(),
entryItem->email(), this );
list->removeEntry( entryItem->addressee(), entryItem->email() );
list->insertEntry( entryItem->addressee(), email );
diff --git a/kabc/distributionlistdialog.h b/kabc/distributionlistdialog.h
index 9a163ef7d..eb2e68e55 100644
--- a/kabc/distributionlistdialog.h
+++ b/kabc/distributionlistdialog.h
@@ -21,7 +21,7 @@
#ifndef KABC_DISTRIBUTIONLISTDIALOG_H
#define KABC_DISTRIBUTIONLISTDIALOG_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kdialogbase.h>
@@ -63,7 +63,7 @@ class KABC_EXPORT DistributionListDialog : public KDialogBase
@param ab The addressbook, the addressees should be used from
@param parent The parent widget
*/
- DistributionListDialog( AddressBook *ab, QWidget *parent );
+ DistributionListDialog( AddressBook *ab, TQWidget *parent );
/**
Destructor.
@@ -83,16 +83,16 @@ class KABC_EXPORT DistributionListDialog : public KDialogBase
class KABC_EXPORT EmailSelector : public KDialogBase
{
public:
- EmailSelector( const QStringList &emails, const QString &current,
- QWidget *parent );
+ EmailSelector( const TQStringList &emails, const TQString &current,
+ TQWidget *parent );
- QString selected();
+ TQString selected();
- static QString getEmail( const QStringList &emails, const QString &current,
- QWidget *parent );
+ static TQString getEmail( const TQStringList &emails, const TQString &current,
+ TQWidget *parent );
private:
- QButtonGroup *mButtonGroup;
+ TQButtonGroup *mButtonGroup;
};
/**
@@ -103,7 +103,7 @@ class KABC_EXPORT DistributionListEditorWidget : public QWidget
Q_OBJECT
public:
- DistributionListEditorWidget( AddressBook *, QWidget *parent );
+ DistributionListEditorWidget( AddressBook *, TQWidget *parent );
virtual ~DistributionListEditorWidget();
private slots:
@@ -121,15 +121,15 @@ class KABC_EXPORT DistributionListEditorWidget : public QWidget
void save();
private:
- QComboBox *mNameCombo;
- QLabel *mListLabel;
- QListView *mEntryView;
- QListView *mAddresseeView;
+ TQComboBox *mNameCombo;
+ TQLabel *mListLabel;
+ TQListView *mEntryView;
+ TQListView *mAddresseeView;
AddressBook *mAddressBook;
DistributionListManager *mManager;
- QPushButton *mNewButton, *mEditButton, *mRemoveButton;
- QPushButton *mChangeEmailButton, *mRemoveEntryButton, *mAddEntryButton;
+ TQPushButton *mNewButton, *mEditButton, *mRemoveButton;
+ TQPushButton *mChangeEmailButton, *mRemoveEntryButton, *mAddEntryButton;
struct Data;
Data *d;
diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp
index c0de3f137..ba4280515 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/kabc/distributionlisteditor.cpp
@@ -18,12 +18,12 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlistview.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qcombobox.h>
-#include <qbuttongroup.h>
-#include <qradiobutton.h>
+#include <tqlistview.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqcombobox.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
#include <kinputdialog.h>
#include <klocale.h>
@@ -38,42 +38,42 @@
using namespace KABC;
-EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString &current,
- QWidget *parent ) :
+EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString &current,
+ TQWidget *parent ) :
KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
parent )
{
- QFrame *topFrame = plainPage();
- QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+ TQFrame *topFrame = plainPage();
+ TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
- mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+ mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"),
topFrame );
mButtonGroup->setRadioButtonExclusive( true );
topLayout->addWidget( mButtonGroup );
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for( it = emails.begin(); it != emails.end(); ++it ) {
- QRadioButton *button = new QRadioButton( *it, mButtonGroup );
+ TQRadioButton *button = new TQRadioButton( *it, mButtonGroup );
if ( (*it) == current ) {
button->setDown( true );
}
}
}
-QString EmailSelectDialog::selected()
+TQString EmailSelectDialog::selected()
{
- QButton *button = mButtonGroup->selected();
+ TQButton *button = mButtonGroup->selected();
if ( button ) return button->text();
- return QString::null;
+ return TQString::null;
}
-QString EmailSelectDialog::getEmail( const QStringList &emails, const QString &current,
- QWidget *parent )
+TQString EmailSelectDialog::getEmail( const TQStringList &emails, const TQString &current,
+ TQWidget *parent )
{
EmailSelectDialog *dlg = new EmailSelectDialog( emails, current, parent );
dlg->exec();
- QString result = dlg->selected();
+ TQString result = dlg->selected();
delete dlg;
@@ -83,9 +83,9 @@ QString EmailSelectDialog::getEmail( const QStringList &emails, const QString &c
class EditEntryItem : public QListViewItem
{
public:
- EditEntryItem( QListView *parent, const Addressee &addressee,
- const QString &email=QString::null ) :
- QListViewItem( parent ),
+ EditEntryItem( TQListView *parent, const Addressee &addressee,
+ const TQString &email=TQString::null ) :
+ TQListViewItem( parent ),
mAddressee( addressee ),
mEmail( email )
{
@@ -104,66 +104,66 @@ class EditEntryItem : public QListViewItem
return mAddressee;
}
- QString email() const
+ TQString email() const
{
return mEmail;
}
private:
Addressee mAddressee;
- QString mEmail;
+ TQString mEmail;
};
-DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidget *parent) :
- QWidget( parent ),
+DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidget *parent) :
+ TQWidget( parent ),
mAddressBook( addressBook )
{
kdDebug(5700) << "DistributionListEditor()" << endl;
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->setMargin( KDialog::marginHint() );
topLayout->setSpacing( KDialog::spacingHint() );
- QBoxLayout *nameLayout = new QHBoxLayout( topLayout) ;
+ TQBoxLayout *nameLayout = new TQHBoxLayout( topLayout) ;
- mNameCombo = new QComboBox( this );
+ mNameCombo = new TQComboBox( this );
nameLayout->addWidget( mNameCombo );
- connect( mNameCombo, SIGNAL( activated( int ) ), SLOT( updateEntryView() ) );
+ connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) );
- newButton = new QPushButton( i18n("New List"), this );
+ newButton = new TQPushButton( i18n("New List"), this );
nameLayout->addWidget( newButton );
- connect( newButton, SIGNAL( clicked() ), SLOT( newList() ) );
+ connect( newButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) );
- removeButton = new QPushButton( i18n("Remove List"), this );
+ removeButton = new TQPushButton( i18n("Remove List"), this );
nameLayout->addWidget( removeButton );
- connect( removeButton, SIGNAL( clicked() ), SLOT( removeList() ) );
+ connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) );
- mEntryView = new QListView( this );
+ mEntryView = new TQListView( this );
mEntryView->addColumn( i18n("Name") );
mEntryView->addColumn( i18n("Email") );
mEntryView->addColumn( i18n("Use Preferred") );
topLayout->addWidget( mEntryView );
- connect(mEntryView,SIGNAL(selectionChanged ()),this, SLOT(slotSelectionEntryViewChanged()));
+ connect(mEntryView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionEntryViewChanged()));
- changeEmailButton = new QPushButton( i18n("Change Email"), this );
+ changeEmailButton = new TQPushButton( i18n("Change Email"), this );
topLayout->addWidget( changeEmailButton );
- connect( changeEmailButton, SIGNAL( clicked() ), SLOT( changeEmail() ) );
+ connect( changeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) );
- removeEntryButton = new QPushButton( i18n("Remove Entry"), this );
+ removeEntryButton = new TQPushButton( i18n("Remove Entry"), this );
topLayout->addWidget( removeEntryButton );
- connect( removeEntryButton, SIGNAL( clicked() ), SLOT( removeEntry() ) );
+ connect( removeEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) );
- addEntryButton = new QPushButton( i18n("Add Entry"), this );
+ addEntryButton = new TQPushButton( i18n("Add Entry"), this );
topLayout->addWidget( addEntryButton );
- connect( addEntryButton, SIGNAL( clicked() ), SLOT( addEntry() ) );
+ connect( addEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) );
- mAddresseeView = new QListView( this );
+ mAddresseeView = new TQListView( this );
mAddresseeView->addColumn( i18n("Name") );
mAddresseeView->addColumn( i18n("Preferred Email") );
topLayout->addWidget( mAddresseeView );
- connect(mAddresseeView,SIGNAL(selectionChanged ()),this, SLOT(slotSelectionAddresseeViewChanged()));
+ connect(mAddresseeView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionAddresseeViewChanged()));
mManager = new DistributionListManager( mAddressBook );
mManager->load();
@@ -193,9 +193,9 @@ void DistributionListEditor::slotSelectionEntryViewChanged()
void DistributionListEditor::newList()
{
bool ok = false;
- QString name = KInputDialog::getText( i18n("New Distribution List"),
+ TQString name = KInputDialog::getText( i18n("New Distribution List"),
i18n("Please enter name:"),
- QString::null, &ok, this );
+ TQString::null, &ok, this );
if ( !ok )
return;
@@ -258,7 +258,7 @@ void DistributionListEditor::changeEmail()
dynamic_cast<EditEntryItem *>( mEntryView->selectedItem() );
if ( !entryItem ) return;
- QString email = EmailSelectDialog::getEmail( entryItem->addressee().emails(),
+ TQString email = EmailSelectDialog::getEmail( entryItem->addressee().emails(),
entryItem->email(), this );
list->removeEntry( entryItem->addressee(), entryItem->email() );
list->insertEntry( entryItem->addressee(), email );
diff --git a/kabc/distributionlisteditor.h b/kabc/distributionlisteditor.h
index 68bd917de..d0d8f752a 100644
--- a/kabc/distributionlisteditor.h
+++ b/kabc/distributionlisteditor.h
@@ -20,7 +20,7 @@
#ifndef KABC_DISTRIBUTIONLISTEDITOR_H
#define KABC_DISTRIBUTIONLISTEDITOR_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kdialogbase.h>
@@ -36,16 +36,16 @@ class DistributionListManager;
class KABC_EXPORT EmailSelectDialog : public KDialogBase
{
public:
- EmailSelectDialog( const QStringList &emails, const QString &current,
- QWidget *parent );
+ EmailSelectDialog( const TQStringList &emails, const TQString &current,
+ TQWidget *parent );
- QString selected();
+ TQString selected();
- static QString getEmail( const QStringList &emails, const QString &current,
- QWidget *parent );
+ static TQString getEmail( const TQStringList &emails, const TQString &current,
+ TQWidget *parent );
private:
- QButtonGroup *mButtonGroup;
+ TQButtonGroup *mButtonGroup;
};
/**
@@ -55,7 +55,7 @@ class DistributionListEditor : public QWidget
{
Q_OBJECT
public:
- DistributionListEditor( AddressBook *, QWidget *parent );
+ DistributionListEditor( AddressBook *, TQWidget *parent );
virtual ~DistributionListEditor();
private slots:
@@ -71,14 +71,14 @@ class DistributionListEditor : public QWidget
void slotSelectionAddresseeViewChanged();
private:
- QComboBox *mNameCombo;
- QListView *mEntryView;
- QListView *mAddresseeView;
+ TQComboBox *mNameCombo;
+ TQListView *mEntryView;
+ TQListView *mAddresseeView;
AddressBook *mAddressBook;
DistributionListManager *mManager;
- QPushButton *newButton, *removeButton;
- QPushButton *changeEmailButton,*removeEntryButton,*addEntryButton;
+ TQPushButton *newButton, *removeButton;
+ TQPushButton *changeEmailButton,*removeEntryButton,*addEntryButton;
};
}
diff --git a/kabc/errorhandler.cpp b/kabc/errorhandler.cpp
index 1e3966ac8..55b0f459d 100644
--- a/kabc/errorhandler.cpp
+++ b/kabc/errorhandler.cpp
@@ -24,31 +24,31 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <qapplication.h>
+#include <tqapplication.h>
#include "errorhandler.h"
using namespace KABC;
-void ConsoleErrorHandler::error( const QString &msg )
+void ConsoleErrorHandler::error( const TQString &msg )
{
// no debug area is ok here
kdError() << msg << endl;
}
-void GUIErrorHandler::error( const QString &msg )
+void GUIErrorHandler::error( const TQString &msg )
{
KMessageBox::error( 0, msg, i18n( "Error in libkabc" ) );
}
-GuiErrorHandler::GuiErrorHandler( QWidget *parent )
+GuiErrorHandler::GuiErrorHandler( TQWidget *parent )
: mParent( parent )
{
}
-void GuiErrorHandler::error( const QString &msg )
+void GuiErrorHandler::error( const TQString &msg )
{
if (qApp)
KMessageBox::error( mParent, msg );
diff --git a/kabc/errorhandler.h b/kabc/errorhandler.h
index e112ed605..8f8246fc7 100644
--- a/kabc/errorhandler.h
+++ b/kabc/errorhandler.h
@@ -22,7 +22,7 @@
#ifndef KABC_ERRORHANDLER_H
#define KABC_ERRORHANDLER_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdelibs_export.h>
@@ -43,7 +43,7 @@ class KABC_EXPORT ErrorHandler
/**
Show error message.
*/
- virtual void error( const QString &msg ) = 0;
+ virtual void error( const TQString &msg ) = 0;
};
/**
@@ -52,7 +52,7 @@ class KABC_EXPORT ErrorHandler
class KABC_EXPORT ConsoleErrorHandler : public ErrorHandler
{
public:
- virtual void error( const QString &msg );
+ virtual void error( const TQString &msg );
};
/**
@@ -64,7 +64,7 @@ class KABC_EXPORT ConsoleErrorHandler : public ErrorHandler
class KABC_EXPORT GUIErrorHandler : public ErrorHandler
{
public:
- virtual void error( const QString &msg );
+ virtual void error( const TQString &msg );
};
/**
@@ -79,12 +79,12 @@ class KABC_EXPORT GuiErrorHandler : public ErrorHandler
\param parent Widget which is used as parent for the error dialogs.
*/
- GuiErrorHandler( QWidget *parent );
+ GuiErrorHandler( TQWidget *parent );
- virtual void error( const QString &msg );
+ virtual void error( const TQString &msg );
private:
- QWidget *mParent;
+ TQWidget *mParent;
class Private;
Private *d;
diff --git a/kabc/field.h b/kabc/field.h
index 6bc246a26..f1de43717 100644
--- a/kabc/field.h
+++ b/kabc/field.h
@@ -21,8 +21,8 @@
#ifndef KABC_FIELD_H
#define KABC_FIELD_H
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
#include "addressee.h"
@@ -36,7 +36,7 @@ class KABC_EXPORT Field
friend class FieldImpl;
public:
- typedef QValueList<Field *> List;
+ typedef TQValueList<Field *> List;
/**
* @li @p All -
@@ -61,7 +61,7 @@ public:
/**
* Returns the translated label for this field.
*/
- virtual QString label();
+ virtual TQString label();
/**
* Returns the ored categories the field belongs to.
@@ -71,25 +71,25 @@ public:
/**
* Returns the translated label for field category.
*/
- static QString categoryLabel( int category );
+ static TQString categoryLabel( int category );
/**
* Returns a string representation of the value the field has in the given
- * Addressee. Returns QString::null, if it is not possible to convert the
+ * Addressee. Returns TQString::null, if it is not possible to convert the
* value to a string.
*/
- virtual QString value( const KABC::Addressee & );
+ virtual TQString value( const KABC::Addressee & );
/**
* Sets the value of the field in the given Addressee. Returns true on success
* or false, if the given string couldn't be converted to a valid value.
*/
- virtual bool setValue( KABC::Addressee &, const QString & );
+ virtual bool setValue( KABC::Addressee &, const TQString & );
/**
* Returns a string, that can be used for sorting.
*/
- QString sortKey( const KABC::Addressee & );
+ TQString sortKey( const KABC::Addressee & );
/**
* Returns, if the field is a user-defined field.
@@ -119,8 +119,8 @@ public:
* @param key Unique key for this field
* @param app Unique app name for this field
*/
- static Field *createCustomField( const QString &label, int category,
- const QString &key, const QString &app );
+ static Field *createCustomField( const TQString &label, int category,
+ const TQString &key, const TQString &app );
/**
* Delete all fields from list.
@@ -134,13 +134,13 @@ public:
* @param identifier The unique identifier
* @param fields The list of the fields
*/
- static void saveFields( KConfig *cfg, const QString &identifier,
+ static void saveFields( KConfig *cfg, const TQString &identifier,
const Field::List &fields );
/**
* This is the same as above, with the difference, that
* the list is stored in KGlobal::config() in group "KABCFields".
*/
- static void saveFields( const QString &identifier,
+ static void saveFields( const TQString &identifier,
const Field::List &fields );
/**
@@ -149,13 +149,13 @@ public:
* @param cfg The config file object
* @param identifier The unique identifier
*/
- static Field::List restoreFields( KConfig *cfg, const QString &identifier );
+ static Field::List restoreFields( KConfig *cfg, const TQString &identifier );
/**
* This is the same as above, with the difference, that
* the list is loaded from KGlobal::config() from group "KABCFields".
*/
- static Field::List restoreFields( const QString &identifier );
+ static Field::List restoreFields( const TQString &identifier );
protected:
static void createField( int id, int category = 0 );
diff --git a/kabc/format.h b/kabc/format.h
index 7c6abfb6c..b7df6c539 100644
--- a/kabc/format.h
+++ b/kabc/format.h
@@ -20,7 +20,7 @@
#ifndef KABC_FORMAT_H
#define KABC_FORMAT_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdelibs_export.h>
@@ -37,11 +37,11 @@ class KABC_EXPORT_DEPRECATED Format
/**
Load addressbook from file.
*/
- virtual bool load( AddressBook *, const QString &fileName ) = 0;
+ virtual bool load( AddressBook *, const TQString &fileName ) = 0;
/**
Save addressbook to file.
*/
- virtual bool save( AddressBook *, const QString &fileName ) = 0;
+ virtual bool save( AddressBook *, const TQString &fileName ) = 0;
};
}
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp
index 13524e21d..fe599b901 100644
--- a/kabc/formatfactory.cpp
+++ b/kabc/formatfactory.cpp
@@ -24,7 +24,7 @@
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "vcardformatplugin.h"
@@ -56,8 +56,8 @@ FormatFactory::FormatFactory()
info->descriptionLabel = i18n( "vCard Format" );
mFormatList.insert( "vcard", info );
- const QStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
- for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
+ const TQStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
+ for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
{
KSimpleConfig config( *it, true );
@@ -67,7 +67,7 @@ FormatFactory::FormatFactory()
info = new FormatInfo;
config.setGroup( "Plugin" );
- QString type = config.readEntry( "Type" );
+ TQString type = config.readEntry( "Type" );
info->library = config.readEntry( "X-KDE-Library" );
config.setGroup( "Misc" );
@@ -83,14 +83,14 @@ FormatFactory::~FormatFactory()
mFormatList.clear();
}
-QStringList FormatFactory::formats()
+TQStringList FormatFactory::formats()
{
- QStringList retval;
+ TQStringList retval;
// make sure 'vcard' is the first entry
retval << "vcard";
- QDictIterator<FormatInfo> it( mFormatList );
+ TQDictIterator<FormatInfo> it( mFormatList );
for ( ; it.current(); ++it )
if ( it.currentKey() != "vcard" )
retval << it.currentKey();
@@ -98,7 +98,7 @@ QStringList FormatFactory::formats()
return retval;
}
-FormatInfo *FormatFactory::info( const QString &type )
+FormatInfo *FormatFactory::info( const TQString &type )
{
if ( type.isEmpty() )
return 0;
@@ -106,7 +106,7 @@ FormatInfo *FormatFactory::info( const QString &type )
return mFormatList[ type ];
}
-FormatPlugin *FormatFactory::format( const QString& type )
+FormatPlugin *FormatFactory::format( const TQString& type )
{
FormatPlugin *format = 0;
@@ -124,7 +124,7 @@ FormatPlugin *FormatFactory::format( const QString& type )
FormatInfo *fi = mFormatList[ type ];
if (!fi)
return 0;
- QString libName = fi->library;
+ TQString libName = fi->library;
KLibrary *library = openLibrary( libName );
if ( !library )
@@ -146,18 +146,18 @@ FormatPlugin *FormatFactory::format( const QString& type )
}
-KLibrary *FormatFactory::openLibrary( const QString& libName )
+KLibrary *FormatFactory::openLibrary( const TQString& libName )
{
KLibrary *library = 0;
- QString path = KLibLoader::findLibrary( QFile::encodeName( libName ) );
+ TQString path = KLibLoader::findLibrary( TQFile::encodeName( libName ) );
if ( path.isEmpty() ) {
kdDebug( 5700 ) << "No format plugin library was found!" << endl;
return 0;
}
- library = KLibLoader::self()->library( QFile::encodeName( path ) );
+ library = KLibLoader::self()->library( TQFile::encodeName( path ) );
if ( !library ) {
kdDebug( 5700 ) << "Could not load library '" << libName << "'" << endl;
diff --git a/kabc/formatfactory.h b/kabc/formatfactory.h
index f3e270a4b..76a3704d5 100644
--- a/kabc/formatfactory.h
+++ b/kabc/formatfactory.h
@@ -21,8 +21,8 @@
#ifndef KABC_FORMATFACTORY_H
#define KABC_FORMATFACTORY_H
-#include <qdict.h>
-#include <qstring.h>
+#include <tqdict.h>
+#include <tqstring.h>
#include <kconfig.h>
#include <klibloader.h>
@@ -33,9 +33,9 @@ namespace KABC {
struct FormatInfo
{
- QString library;
- QString nameLabel;
- QString descriptionLabel;
+ TQString library;
+ TQString nameLabel;
+ TQString descriptionLabel;
};
/**
@@ -46,8 +46,8 @@ struct FormatInfo
* \code
* KABC::FormatFactory *factory = KABC::FormatFactory::self();
*
- * QStringList list = factory->formats();
- * QStringList::Iterator it;
+ * TQStringList list = factory->formats();
+ * TQStringList::Iterator it;
* for ( it = list.begin(); it != list.end(); ++it ) {
* KABC::FormatPlugin *format = factory->format( (*it) );
* // do something with format
@@ -74,27 +74,27 @@ class KABC_EXPORT FormatFactory
*
* @param type The type of the format, returned by formats()
*/
- FormatPlugin *format( const QString &type );
+ FormatPlugin *format( const TQString &type );
/**
* Returns a list of all available format types.
*/
- QStringList formats();
+ TQStringList formats();
/**
* Returns the info structure for a special type.
*/
- FormatInfo *info( const QString &type );
+ FormatInfo *info( const TQString &type );
protected:
FormatFactory();
private:
- KLibrary *openLibrary( const QString& libName );
+ KLibrary *openLibrary( const TQString& libName );
static FormatFactory *mSelf;
- QDict<FormatInfo> mFormatList;
+ TQDict<FormatInfo> mFormatList;
};
}
diff --git a/kabc/formatplugin.h b/kabc/formatplugin.h
index 4a2e980d8..33f4beea0 100644
--- a/kabc/formatplugin.h
+++ b/kabc/formatplugin.h
@@ -21,7 +21,7 @@
#ifndef KABC_FORMATPLUGIN_H
#define KABC_FORMATPLUGIN_H
-#include <qfile.h>
+#include <tqfile.h>
#include "plugin.h"
#include "resource.h"
@@ -46,27 +46,27 @@ public:
/**
* Load single addressee from file.
*/
- virtual bool load( Addressee &, QFile *file ) = 0;
+ virtual bool load( Addressee &, TQFile *file ) = 0;
/**
* Load whole addressbook from file.
*/
- virtual bool loadAll( AddressBook *, Resource *, QFile *file ) = 0;
+ virtual bool loadAll( AddressBook *, Resource *, TQFile *file ) = 0;
/**
* Save a single Addressee to file.
*/
- virtual void save( const Addressee &, QFile *file ) = 0;
+ virtual void save( const Addressee &, TQFile *file ) = 0;
/**
* Save whole addressbook to file.
*/
- virtual void saveAll( AddressBook *, Resource *, QFile *file ) = 0;
+ virtual void saveAll( AddressBook *, Resource *, TQFile *file ) = 0;
/**
* Checks if given file contains the right format
*/
- virtual bool checkFormat( QFile *file ) const = 0;
+ virtual bool checkFormat( TQFile *file ) const = 0;
};
}
diff --git a/kabc/formats/binaryformat.cpp b/kabc/formats/binaryformat.cpp
index 82cfc0a2f..d5e3cf499 100644
--- a/kabc/formats/binaryformat.cpp
+++ b/kabc/formats/binaryformat.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qdatastream.h>
-#include <qimage.h>
+#include <tqdatastream.h>
+#include <tqimage.h>
#include <kdebug.h>
#include <klocale.h>
@@ -44,10 +44,10 @@ extern "C"
}
}
-bool BinaryFormat::load( Addressee &addressee, QFile *file )
+bool BinaryFormat::load( Addressee &addressee, TQFile *file )
{
kdDebug(5700) << "BinaryFormat::load()" << endl;
- QDataStream stream( file );
+ TQDataStream stream( file );
if ( !checkHeader( stream ) )
return false;
@@ -57,11 +57,11 @@ bool BinaryFormat::load( Addressee &addressee, QFile *file )
return true;
}
-bool BinaryFormat::loadAll( AddressBook*, Resource *resource, QFile *file )
+bool BinaryFormat::loadAll( AddressBook*, Resource *resource, TQFile *file )
{
kdDebug(5700) << "BinaryFormat::loadAll()" << endl;
- QDataStream stream( file );
+ TQDataStream stream( file );
if ( !checkHeader( stream ) )
return false;
@@ -81,11 +81,11 @@ bool BinaryFormat::loadAll( AddressBook*, Resource *resource, QFile *file )
return true;
}
-void BinaryFormat::save( const Addressee &addressee, QFile *file )
+void BinaryFormat::save( const Addressee &addressee, TQFile *file )
{
kdDebug(5700) << "BinaryFormat::save()" << endl;
- QDataStream stream( file );
+ TQDataStream stream( file );
writeHeader( stream );
@@ -94,12 +94,12 @@ void BinaryFormat::save( const Addressee &addressee, QFile *file )
saveAddressee( addressee, stream );
}
-void BinaryFormat::saveAll( AddressBook*, Resource *resource, QFile *file )
+void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
{
kdDebug(5700) << "BinaryFormat::saveAll()" << endl;
Q_UINT32 counter = 0;
- QDataStream stream( file );
+ TQDataStream stream( file );
writeHeader( stream );
// set dummy number of entries
@@ -117,22 +117,22 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, QFile *file )
stream << counter;
}
-bool BinaryFormat::checkFormat( QFile *file ) const
+bool BinaryFormat::checkFormat( TQFile *file ) const
{
kdDebug(5700) << "BinaryFormat::checkFormat()" << endl;
- QDataStream stream( file );
+ TQDataStream stream( file );
return checkHeader( stream );
}
-bool BinaryFormat::checkHeader( QDataStream &stream ) const
+bool BinaryFormat::checkHeader( TQDataStream &stream ) const
{
Q_UINT32 magic, version;
stream >> magic >> version;
- QFile *file = dynamic_cast<QFile*>( stream.device() );
+ TQFile *file = dynamic_cast<TQFile*>( stream.device() );
if ( !file ) {
kdError() << i18n("Not a file?") << endl;
@@ -152,7 +152,7 @@ bool BinaryFormat::checkHeader( QDataStream &stream ) const
return true;
}
-void BinaryFormat::writeHeader( QDataStream &stream )
+void BinaryFormat::writeHeader( TQDataStream &stream )
{
Q_UINT32 magic, version;
@@ -162,7 +162,7 @@ void BinaryFormat::writeHeader( QDataStream &stream )
stream << magic << version;
}
-void BinaryFormat::loadAddressee( Addressee &addressee, QDataStream &stream )
+void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
{
stream >> addressee;
/*
@@ -171,7 +171,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, QDataStream &stream )
Picture logo = addressee.logo();
if ( photo.isIntern() ) {
- QImage img;
+ TQImage img;
if ( !img.load( locateLocal( "data", "kabc/photos/" ) + addressee.uid() ) )
kdDebug(5700) << "No photo available for '" << addressee.uid() << "'." << endl;
@@ -179,7 +179,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, QDataStream &stream )
}
if ( logo.isIntern() ) {
- QImage img;
+ TQImage img;
if ( !img.load( locateLocal( "data", "kabc/logos/" ) + addressee.uid() ) )
kdDebug(5700) << "No logo available for '" << addressee.uid() << "'." << endl;
@@ -191,7 +191,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, QDataStream &stream )
*/
}
-void BinaryFormat::saveAddressee( const Addressee &addressee, QDataStream &stream )
+void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stream )
{
stream << addressee;
/*
@@ -200,16 +200,16 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, QDataStream &strea
Picture logo = addressee.logo();
if ( photo.isIntern() ) {
- QImage img = photo.data();
- QString fileName = locateLocal( "data", "kabc/photos/" ) + addressee.uid();
+ TQImage img = photo.data();
+ TQString fileName = locateLocal( "data", "kabc/photos/" ) + addressee.uid();
if ( !img.save( fileName, "PNG" ) )
kdDebug(5700) << "Unable to save photo for '" << addressee.uid() << "'." << endl;
}
if ( logo.isIntern() ) {
- QImage img = logo.data();
- QString fileName = locateLocal( "data", "kabc/logos/" ) + addressee.uid();
+ TQImage img = logo.data();
+ TQString fileName = locateLocal( "data", "kabc/logos/" ) + addressee.uid();
if ( !img.save( fileName, "PNG" ) )
kdDebug(5700) << "Unable to save logo for '" << addressee.uid() << "'." << endl;
diff --git a/kabc/formats/binaryformat.h b/kabc/formats/binaryformat.h
index af4df48bd..09efde41a 100644
--- a/kabc/formats/binaryformat.h
+++ b/kabc/formats/binaryformat.h
@@ -36,33 +36,33 @@ public:
/**
* Load single addressee from file.
*/
- bool load( Addressee &, QFile *file );
+ bool load( Addressee &, TQFile *file );
/**
* Load whole addressee from file.
*/
- bool loadAll( AddressBook *, Resource *, QFile *file );
+ bool loadAll( AddressBook *, Resource *, TQFile *file );
/**
* Save single addressee to file.
*/
- void save( const Addressee &, QFile *file );
+ void save( const Addressee &, TQFile *file );
/**
* Save all addressees to file.
*/
- void saveAll( AddressBook *, Resource *, QFile *file );
+ void saveAll( AddressBook *, Resource *, TQFile *file );
/**
* Check for valid format of a file.
*/
- bool checkFormat( QFile *file ) const;
+ bool checkFormat( TQFile *file ) const;
private:
- void loadAddressee( Addressee &, QDataStream & );
- void saveAddressee( const Addressee &, QDataStream & );
- bool checkHeader( QDataStream & ) const;
- void writeHeader( QDataStream & );
+ void loadAddressee( Addressee &, TQDataStream & );
+ void saveAddressee( const Addressee &, TQDataStream & );
+ bool checkHeader( TQDataStream & ) const;
+ void writeHeader( TQDataStream & );
};
}
diff --git a/kabc/geo.cpp b/kabc/geo.cpp
index 2380f2061..44f9851e4 100644
--- a/kabc/geo.cpp
+++ b/kabc/geo.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qdatastream.h>
+#include <tqdatastream.h>
#include "geo.h"
@@ -88,17 +88,17 @@ bool Geo::operator!=( const Geo &g ) const
return true;
}
-QString Geo::asString() const
+TQString Geo::asString() const
{
- return "(" + QString::number(mLatitude) + "," + QString::number(mLongitude) + ")";
+ return "(" + TQString::number(mLatitude) + "," + TQString::number(mLongitude) + ")";
}
-QDataStream &KABC::operator<<( QDataStream &s, const Geo &geo )
+TQDataStream &KABC::operator<<( TQDataStream &s, const Geo &geo )
{
return s << (float)geo.mLatitude << (float)geo.mLongitude;
}
-QDataStream &KABC::operator>>( QDataStream &s, Geo &geo )
+TQDataStream &KABC::operator>>( TQDataStream &s, Geo &geo )
{
s >> geo.mLatitude >> geo.mLongitude;
diff --git a/kabc/geo.h b/kabc/geo.h
index 318f348d0..019e18199 100644
--- a/kabc/geo.h
+++ b/kabc/geo.h
@@ -21,7 +21,7 @@
#ifndef KABC_GEO_H
#define KABC_GEO_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdelibs_export.h>
@@ -34,8 +34,8 @@ namespace KABC {
*/
class KABC_EXPORT Geo
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Geo & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Geo & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Geo & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Geo & );
public:
/**
@@ -82,7 +82,7 @@ class KABC_EXPORT Geo
/**
Returns string representation of geographical position.
*/
- QString asString() const;
+ TQString asString() const;
private:
float mLatitude;
@@ -93,8 +93,8 @@ class KABC_EXPORT Geo
bool mValidLong;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const Geo & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, Geo & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Geo & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Geo & );
}
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 2f88218ad..9d8ea75ee 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kabapi.h>
#include <kaboutdata.h>
@@ -46,16 +46,16 @@ static const KCmdLineOptions options[] =
KCmdLineLastOption
};
-void readKMailEntry( const QString &kmailEntry, KABC::AddressBook *ab )
+void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
{
kdDebug() << "KMAILENTRY: " << kmailEntry << endl;
- QString entry = kmailEntry.simplifyWhiteSpace();
+ TQString entry = kmailEntry.simplifyWhiteSpace();
if ( entry.isEmpty() ) return;
- QString email;
- QString name;
- QString comment;
+ TQString email;
+ TQString name;
+ TQString comment;
if ( entry.at( entry.length() -1 ) == ')' ) {
int br = entry.findRev( '(' );
@@ -120,8 +120,8 @@ void readKMailEntry( const QString &kmailEntry, KABC::AddressBook *ab )
void importKMailAddressBook( KABC::AddressBook *ab )
{
- QString fileName = locateLocal( "data", "kmail/addressbook" );
- QString kmailConfigName = locate( "config", "kmailrc" );
+ TQString fileName = locateLocal( "data", "kmail/addressbook" );
+ TQString kmailConfigName = locate( "config", "kmailrc" );
if ( !kmailConfigName.isEmpty() ) {
KConfig cfg( kmailConfigName );
cfg.setGroup( "Addressbook" );
@@ -132,21 +132,21 @@ void importKMailAddressBook( KABC::AddressBook *ab )
return;
}
- QFile f( fileName );
+ TQFile f( fileName );
if ( !f.open(IO_ReadOnly) ) {
kdDebug(5700) << "Couldn't open file '" << fileName << "'" << endl;
return;
}
- QStringList kmailEntries;
+ TQStringList kmailEntries;
- QTextStream t( &f );
+ TQTextStream t( &f );
while ( !t.eof() ) {
kmailEntries.append( t.readLine() );
}
f.close();
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) {
if ( (*it).at( 0 ) == '#' ) continue;
bool insideQuote = false;
@@ -167,22 +167,22 @@ void importKMailAddressBook( KABC::AddressBook *ab )
}
}
-void readKAddressBookEntries( const QString &dataString, Addressee &a )
+void readKAddressBookEntries( const TQString &dataString, Addressee &a )
{
// Strip "KMail:1.0" prefix and "[EOS]" suffix.
- QString str = dataString.mid( 11, dataString.length() - 24 );
+ TQString str = dataString.mid( 11, dataString.length() - 24 );
- QStringList entries = QStringList::split( "\n[EOR]\n ", str );
+ TQStringList entries = TQStringList::split( "\n[EOR]\n ", str );
Address homeAddress( Address::Home );
Address businessAddress( Address::Work );
Address otherAddress;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = entries.begin(); it != entries.end(); ++it ) {
int pos = (*it).find( "\n" );
- QString fieldName = (*it).left( pos );
- QString fieldValue = (*it).mid( pos + 2 );
+ TQString fieldName = (*it).left( pos );
+ TQString fieldValue = (*it).mid( pos + 2 );
if ( fieldName == "X-HomeFax" ) {
a.insertPhoneNumber( PhoneNumber( fieldValue, PhoneNumber::Home |
@@ -280,9 +280,9 @@ void readKAddressBookEntries( const QString &dataString, Addressee &a )
void importKab( KABC::AddressBook *ab, bool override, bool quiet )
{
- QString fileName = KGlobal::dirs()->saveLocation( "data", "kab/" );
+ TQString fileName = KGlobal::dirs()->saveLocation( "data", "kab/" );
fileName += "addressbook.kab";
- if ( !QFile::exists( fileName ) ) {
+ if ( !TQFile::exists( fileName ) ) {
if ( !quiet ) {
KMessageBox::error( 0, "<qt>" + i18n( "Address book file <b>%1</b> not found! Make sure the old address book is located there and you have read permission for this file." )
.arg( fileName ) + "</qt>" );
@@ -322,7 +322,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
// Convert custom entries
int count = 0;
bool idFound = false;
- QStringList::ConstIterator customIt;
+ TQStringList::ConstIterator customIt;
for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) {
if ( (*customIt).startsWith( "X-KABC-UID:" ) ) {
a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) );
@@ -330,7 +330,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
} else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) {
readKAddressBookEntries( *customIt, a );
} else {
- a.insertCustom( "kab2kabc", QString::number( count++ ), *customIt );
+ a.insertCustom( "kab2kabc", TQString::number( count++ ), *customIt );
}
}
if ( idFound ) {
@@ -353,15 +353,15 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
a.setFamilyName( entry.lastname );
a.setBirthday( entry.birthday );
- QStringList::ConstIterator emailIt;
+ TQStringList::ConstIterator emailIt;
for ( emailIt = entry.emails.begin(); emailIt != entry.emails.end(); ++emailIt )
a.insertEmail( *emailIt );
- QStringList::ConstIterator phoneIt;
+ TQStringList::ConstIterator phoneIt;
for ( phoneIt = entry.telephone.begin(); phoneIt != entry.telephone.end(); ++phoneIt ) {
int kabType = (*phoneIt++).toInt();
if ( phoneIt == entry.telephone.end() ) break;
- QString number = *phoneIt;
+ TQString number = *phoneIt;
int type = 0;
if ( kabType == ::AddressBook::Fixed ) type = PhoneNumber::Voice;
else if ( kabType == ::AddressBook::Mobile ) type = PhoneNumber::Cell | PhoneNumber::Voice;
@@ -390,7 +390,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
adr.setCountry( kabAddress.country );
adr.setRegion( kabAddress.state );
- QString label;
+ TQString label;
if ( !kabAddress.headline.isEmpty() ) label += kabAddress.headline + "\n";
if ( !kabAddress.position.isEmpty() ) label += kabAddress.position + "\n";
if ( !kabAddress.org.isEmpty() ) label += kabAddress.org + "\n";
@@ -402,7 +402,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
a.insertAddress( adr );
}
- QString note = entry.comment;
+ TQString note = entry.comment;
if ( !entry.user1.isEmpty() ) note += "\nUser1: " + entry.user1;
if ( !entry.user2.isEmpty() ) note += "\nUser2: " + entry.user2;
@@ -411,7 +411,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
if ( !entry.keywords.count() == 0 ) note += "\nKeywords: " + entry.keywords.join( ", " );
- QStringList::ConstIterator talkIt;
+ TQStringList::ConstIterator talkIt;
for ( talkIt = entry.talk.begin(); talkIt != entry.talk.end(); ++talkIt ) {
note += "\nTalk: " + (*talkIt);
}
diff --git a/kabc/key.cpp b/kabc/key.cpp
index e4fe50f2e..0d917595d 100644
--- a/kabc/key.cpp
+++ b/kabc/key.cpp
@@ -25,7 +25,7 @@
using namespace KABC;
-Key::Key( const QString &text, int type )
+Key::Key( const TQString &text, int type )
: mTextData( text ), mIsBinary( false ), mType( type )
{
mId = KApplication::randomString(8);
@@ -53,34 +53,34 @@ bool Key::operator!=( const Key &k ) const
return !( k == *this );
}
-void Key::setId( const QString &id )
+void Key::setId( const TQString &id )
{
mId = id;
}
-QString Key::id() const
+TQString Key::id() const
{
return mId;
}
-void Key::setBinaryData( const QByteArray &binary )
+void Key::setBinaryData( const TQByteArray &binary )
{
mBinaryData = binary;
mIsBinary = true;
}
-QByteArray Key::binaryData() const
+TQByteArray Key::binaryData() const
{
return mBinaryData;
}
-void Key::setTextData( const QString &text )
+void Key::setTextData( const TQString &text )
{
mTextData = text;
mIsBinary = false;
}
-QString Key::textData() const
+TQString Key::textData() const
{
return mTextData;
}
@@ -95,7 +95,7 @@ void Key::setType( int type )
mType = type;
}
-void Key::setCustomTypeString( const QString &custom )
+void Key::setCustomTypeString( const TQString &custom )
{
mCustomTypeString = custom;
}
@@ -105,7 +105,7 @@ int Key::type() const
return mType;
}
-QString Key::customTypeString() const
+TQString Key::customTypeString() const
{
return mCustomTypeString;
}
@@ -120,7 +120,7 @@ Key::TypeList Key::typeList()
return list;
}
-QString Key::typeLabel( int type )
+TQString Key::typeLabel( int type )
{
switch ( type ) {
case X509:
@@ -138,13 +138,13 @@ QString Key::typeLabel( int type )
}
}
-QDataStream &KABC::operator<<( QDataStream &s, const Key &key )
+TQDataStream &KABC::operator<<( TQDataStream &s, const Key &key )
{
return s << key.mId << key.mIsBinary << key.mTextData << key.mBinaryData <<
key.mCustomTypeString << key.mType;
}
-QDataStream &KABC::operator>>( QDataStream &s, Key &key )
+TQDataStream &KABC::operator>>( TQDataStream &s, Key &key )
{
s >> key.mId >> key.mIsBinary >> key.mTextData >> key.mBinaryData >>
key.mCustomTypeString >> key.mType;
diff --git a/kabc/key.h b/kabc/key.h
index 8c91fd6cf..ecc4492d8 100644
--- a/kabc/key.h
+++ b/kabc/key.h
@@ -21,7 +21,7 @@
#ifndef KABC_KEY_H
#define KABC_KEY_H
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <kdelibs_export.h>
@@ -32,12 +32,12 @@ namespace KABC {
*/
class KABC_EXPORT Key
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Key & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Key & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Key & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Key & );
public:
- typedef QValueList<Key> List;
- typedef QValueList<int> TypeList;
+ typedef TQValueList<Key> List;
+ typedef TQValueList<int> TypeList;
/**
* Key types
@@ -58,7 +58,7 @@ public:
* @param text The text data.
* @param type The key type, see Types.
*/
- Key( const QString &text = QString::null, int type = PGP );
+ Key( const TQString &text = TQString::null, int type = PGP );
/**
* Destructor.
@@ -71,32 +71,32 @@ public:
/**
* Sets the unique identifier.
*/
- void setId( const QString &id );
+ void setId( const TQString &id );
/**
* Returns the unique identifier.
*/
- QString id() const;
+ TQString id() const;
/**
* Sets binary data.
*/
- void setBinaryData( const QByteArray &binary );
+ void setBinaryData( const TQByteArray &binary );
/**
* Returns the binary data.
*/
- QByteArray binaryData() const;
+ TQByteArray binaryData() const;
/**
* Sets text data.
*/
- void setTextData( const QString &text );
+ void setTextData( const TQString &text );
/**
* Returns the text data.
*/
- QString textData() const;
+ TQString textData() const;
/**
* Returns whether the key contains binary or text data.
@@ -111,7 +111,7 @@ public:
/**
* Sets custom type string.
*/
- void setCustomTypeString( const QString &custom );
+ void setCustomTypeString( const TQString &custom );
/**
* Returns the type, see Type.
@@ -121,7 +121,7 @@ public:
/**
* Returns the custom type string.
*/
- QString customTypeString() const;
+ TQString customTypeString() const;
/**
* Returns a list of all available key types.
@@ -131,20 +131,20 @@ public:
/**
* Returns a translated label for a given key type.
*/
- static QString typeLabel( int type );
+ static TQString typeLabel( int type );
private:
- QByteArray mBinaryData;
- QString mId;
- QString mTextData;
- QString mCustomTypeString;
+ TQByteArray mBinaryData;
+ TQString mId;
+ TQString mTextData;
+ TQString mCustomTypeString;
int mIsBinary;
int mType;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const Key & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, Key & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Key & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Key & );
}
#endif
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index 3e73b1c59..724f039ec 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -22,12 +22,12 @@
-#include <qfile.h>
-#include <qimage.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qtextstream.h>
-#include <qurl.h>
+#include <tqfile.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqpixmap.h>
+#include <tqtextstream.h>
+#include <tqurl.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -43,18 +43,18 @@ using namespace KABC;
class LdapClient::LdapClientPrivate{
public:
- QString bindDN;
- QString pwdBindDN;
+ TQString bindDN;
+ TQString pwdBindDN;
LDIF ldif;
};
-QString LdapObject::toString() const
+TQString LdapObject::toString() const
{
- QString result = QString::fromLatin1( "\ndn: %1\n" ).arg( dn );
+ TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
- QString attr = it.key();
+ TQString attr = it.key();
for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {
- result += QString::fromUtf8( LDIF::assembleLine( attr, *it2, 76 ) ) + "\n";
+ result += TQString::fromUtf8( LDIF::assembleLine( attr, *it2, 76 ) ) + "\n";
}
}
@@ -63,7 +63,7 @@ QString LdapObject::toString() const
void LdapObject::clear()
{
- dn = QString::null;
+ dn = TQString::null;
attrs.clear();
}
@@ -76,8 +76,8 @@ void LdapObject::assign( const LdapObject& that )
}
}
-LdapClient::LdapClient( QObject* parent, const char* name )
- : QObject( parent, name ), mJob( 0 ), mActive( false )
+LdapClient::LdapClient( TQObject* parent, const char* name )
+ : TQObject( parent, name ), mJob( 0 ), mActive( false )
{
d = new LdapClientPrivate;
}
@@ -88,37 +88,37 @@ LdapClient::~LdapClient()
delete d; d = 0;
}
-void LdapClient::setHost( const QString& host )
+void LdapClient::setHost( const TQString& host )
{
mHost = host;
}
-void LdapClient::setPort( const QString& port )
+void LdapClient::setPort( const TQString& port )
{
mPort = port;
}
-void LdapClient::setBase( const QString& base )
+void LdapClient::setBase( const TQString& base )
{
mBase = base;
}
-void LdapClient::setBindDN( const QString& bindDN )
+void LdapClient::setBindDN( const TQString& bindDN )
{
d->bindDN = bindDN;
}
-void LdapClient::setPwdBindDN( const QString& pwdBindDN )
+void LdapClient::setPwdBindDN( const TQString& pwdBindDN )
{
d->pwdBindDN = pwdBindDN;
}
-void LdapClient::setAttrs( const QStringList& attrs )
+void LdapClient::setAttrs( const TQStringList& attrs )
{
mAttrs = attrs;
}
-void LdapClient::startQuery( const QString& filter )
+void LdapClient::startQuery( const TQString& filter )
{
cancelQuery();
LDAPUrl url;
@@ -138,12 +138,12 @@ void LdapClient::startQuery( const QString& filter )
startParseLDIF();
mActive = true;
mJob = KIO::get( url, false, false );
- connect( mJob, SIGNAL( data( KIO::Job*, const QByteArray& ) ),
- this, SLOT( slotData( KIO::Job*, const QByteArray& ) ) );
- connect( mJob, SIGNAL( infoMessage( KIO::Job*, const QString& ) ),
- this, SLOT( slotInfoMessage( KIO::Job*, const QString& ) ) );
- connect( mJob, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( slotDone() ) );
+ connect( mJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
+ connect( mJob, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
+ connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( slotDone() ) );
}
void LdapClient::cancelQuery()
@@ -156,16 +156,16 @@ void LdapClient::cancelQuery()
mActive = false;
}
-void LdapClient::slotData( KIO::Job*, const QByteArray& data )
+void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
{
#ifndef NDEBUG // don't create the QString
-// QString str( data );
+// TQString str( data );
// kdDebug(5700) << "LdapClient: Got \"" << str << "\"\n";
#endif
parseLDIF( data );
}
-void LdapClient::slotInfoMessage( KIO::Job*, const QString & )
+void LdapClient::slotInfoMessage( KIO::Job*, const TQString & )
{
//qDebug("Job said \"%s\"", info.latin1());
}
@@ -175,13 +175,13 @@ void LdapClient::slotDone()
endParseLDIF();
mActive = false;
#if 0
- for ( QValueList<LdapObject>::Iterator it = mObjects.begin(); it != mObjects.end(); ++it ) {
+ for ( TQValueList<LdapObject>::Iterator it = mObjects.begin(); it != mObjects.end(); ++it ) {
qDebug( (*it).toString().latin1() );
}
#endif
int err = mJob->error();
if ( err && err != KIO::ERR_USER_CANCELED ) {
- emit error( KIO::buildErrorString( err, QString("%1:%2").arg( mHost ).arg( mPort ) ) );
+ emit error( KIO::buildErrorString( err, TQString("%1:%2").arg( mHost ).arg( mPort ) ) );
}
emit done();
}
@@ -199,7 +199,7 @@ void LdapClient::endParseLDIF()
{
}
-void LdapClient::parseLDIF( const QByteArray& data )
+void LdapClient::parseLDIF( const TQByteArray& data )
{
if ( data.size() ) {
d->ldif.setLDIF( data );
@@ -208,15 +208,15 @@ void LdapClient::parseLDIF( const QByteArray& data )
}
LDIF::ParseVal ret;
- QString name;
+ TQString name;
do {
ret = d->ldif.nextItem();
switch ( ret ) {
case LDIF::Item:
{
name = d->ldif.attr();
- // Must make a copy! QByteArray is explicitely shared
- QByteArray value = d->ldif.val().copy();
+ // Must make a copy! TQByteArray is explicitely shared
+ TQByteArray value = d->ldif.val().copy();
mCurrentObject.attrs[ name ].append( value );
break;
}
@@ -232,12 +232,12 @@ void LdapClient::parseLDIF( const QByteArray& data )
} while ( ret != LDIF::MoreData );
}
-QString LdapClient::bindDN() const
+TQString LdapClient::bindDN() const
{
return d->bindDN;
}
-QString LdapClient::pwdBindDN() const
+TQString LdapClient::pwdBindDN() const
{
return d->pwdBindDN;
}
@@ -261,45 +261,45 @@ LdapSearch::LdapSearch()
for ( int j = 0; j < numHosts; j++ ) {
LdapClient* ldapClient = new LdapClient( this );
- QString host = config.readEntry( QString( "SelectedHost%1" ).arg( j ), "" ).stripWhiteSpace();
+ TQString host = config.readEntry( TQString( "SelectedHost%1" ).arg( j ), "" ).stripWhiteSpace();
if ( !host.isEmpty() )
ldapClient->setHost( host );
- QString port = QString::number( config.readUnsignedNumEntry( QString( "SelectedPort%1" ).arg( j ) ) );
+ TQString port = TQString::number( config.readUnsignedNumEntry( TQString( "SelectedPort%1" ).arg( j ) ) );
if ( !port.isEmpty() )
ldapClient->setPort( port );
- QString base = config.readEntry( QString( "SelectedBase%1" ).arg( j ), "" ).stripWhiteSpace();
+ TQString base = config.readEntry( TQString( "SelectedBase%1" ).arg( j ), "" ).stripWhiteSpace();
if ( !base.isEmpty() )
ldapClient->setBase( base );
- QString bindDN = config.readEntry( QString( "SelectedBind%1" ).arg( j ) ).stripWhiteSpace();
+ TQString bindDN = config.readEntry( TQString( "SelectedBind%1" ).arg( j ) ).stripWhiteSpace();
if ( !bindDN.isEmpty() )
ldapClient->setBindDN( bindDN );
- QString pwdBindDN = config.readEntry( QString( "SelectedPwdBind%1" ).arg( j ) );
+ TQString pwdBindDN = config.readEntry( TQString( "SelectedPwdBind%1" ).arg( j ) );
if ( !pwdBindDN.isEmpty() )
ldapClient->setPwdBindDN( pwdBindDN );
- QStringList attrs;
+ TQStringList attrs;
attrs << "cn" << "mail" << "givenname" << "sn";
ldapClient->setAttrs( attrs );
- connect( ldapClient, SIGNAL( result( const KABC::LdapObject& ) ),
- this, SLOT( slotLDAPResult( const KABC::LdapObject& ) ) );
- connect( ldapClient, SIGNAL( done() ),
- this, SLOT( slotLDAPDone() ) );
- connect( ldapClient, SIGNAL( error( const QString& ) ),
- this, SLOT( slotLDAPError( const QString& ) ) );
+ connect( ldapClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
+ this, TQT_SLOT( slotLDAPResult( const KABC::LdapObject& ) ) );
+ connect( ldapClient, TQT_SIGNAL( done() ),
+ this, TQT_SLOT( slotLDAPDone() ) );
+ connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ),
+ this, TQT_SLOT( slotLDAPError( const TQString& ) ) );
mClients.append( ldapClient );
}
}
- connect( &mDataTimer, SIGNAL( timeout() ), SLOT( slotDataTimer() ) );
+ connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) );
}
-void LdapSearch::startSearch( const QString& txt )
+void LdapSearch::startSearch( const TQString& txt )
{
if ( mNoLDAPLookup )
return;
@@ -318,10 +318,10 @@ void LdapSearch::startSearch( const QString& txt )
} else
mSearchText = txt;
- QString filter = QString( "|(cn=%1*)(mail=%2*)(givenName=%3*)(sn=%4*)" )
+ TQString filter = TQString( "|(cn=%1*)(mail=%2*)(givenName=%3*)(sn=%4*)" )
.arg( mSearchText ).arg( mSearchText ).arg( mSearchText ).arg( mSearchText );
- QValueList< LdapClient* >::Iterator it;
+ TQValueList< LdapClient* >::Iterator it;
for ( it = mClients.begin(); it != mClients.end(); ++it ) {
(*it)->startQuery( filter );
++mActiveClients;
@@ -330,7 +330,7 @@ void LdapSearch::startSearch( const QString& txt )
void LdapSearch::cancelSearch()
{
- QValueList< LdapClient* >::Iterator it;
+ TQValueList< LdapClient* >::Iterator it;
for ( it = mClients.begin(); it != mClients.end(); ++it )
(*it)->cancelQuery();
@@ -345,7 +345,7 @@ void LdapSearch::slotLDAPResult( const KABC::LdapObject& obj )
mDataTimer.start( 500, true );
}
-void LdapSearch::slotLDAPError( const QString& )
+void LdapSearch::slotLDAPError( const TQString& )
{
slotLDAPDone();
}
@@ -360,7 +360,7 @@ void LdapSearch::slotLDAPDone()
void LdapSearch::slotDataTimer()
{
- QStringList lst;
+ TQStringList lst;
LdapResultList reslist;
makeSearchData( lst, reslist );
if ( !lst.isEmpty() )
@@ -377,17 +377,17 @@ void LdapSearch::finish()
emit searchDone();
}
-void LdapSearch::makeSearchData( QStringList& ret, LdapResultList& resList )
+void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
{
- QString search_text_upper = mSearchText.upper();
+ TQString search_text_upper = mSearchText.upper();
- QValueList< KABC::LdapObject >::ConstIterator it1;
+ TQValueList< KABC::LdapObject >::ConstIterator it1;
for ( it1 = mResults.begin(); it1 != mResults.end(); ++it1 ) {
- QString name, mail, givenname, sn;
+ TQString name, mail, givenname, sn;
LdapAttrMap::ConstIterator it2;
for ( it2 = (*it1).attrs.begin(); it2 != (*it1).attrs.end(); ++it2 ) {
- QString tmp = QString::fromUtf8( (*it2).first(), (*it2).first().size() );
+ TQString tmp = TQString::fromUtf8( (*it2).first(), (*it2).first().size() );
if ( it2.key() == "cn" )
name = tmp; // TODO loop?
else if( it2.key() == "mail" )
@@ -404,7 +404,7 @@ void LdapSearch::makeSearchData( QStringList& ret, LdapResultList& resList )
ret.append( mail );
else {
kdDebug(5700) << "<" << name << "><" << mail << ">" << endl;
- ret.append( QString( "%1 <%2>" ).arg( name ).arg( mail ) );
+ ret.append( TQString( "%1 <%2>" ).arg( name ).arg( mail ) );
}
LdapResult sr;
diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h
index a7bb89ddd..b4ee9d749 100644
--- a/kabc/ldapclient.h
+++ b/kabc/ldapclient.h
@@ -23,21 +23,21 @@
#define KABC_LDAPCLIENT_H
-#include <qobject.h>
-#include <qstring.h>
-#include <qcstring.h>
-#include <qstringlist.h>
-#include <qmemarray.h>
-#include <qguardedptr.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqstringlist.h>
+#include <tqmemarray.h>
+#include <tqguardedptr.h>
+#include <tqtimer.h>
#include <kio/job.h>
namespace KABC {
class LdapClient;
-typedef QValueList<QByteArray> LdapAttrValue;
-typedef QMap<QString,LdapAttrValue > LdapAttrMap;
+typedef TQValueList<TQByteArray> LdapAttrValue;
+typedef TQMap<TQString,LdapAttrValue > LdapAttrMap;
/**
* This class is internal. Binary compatibiliy might be broken any time
@@ -50,8 +50,8 @@ class KABC_EXPORT LdapObject
{
public:
LdapObject()
- : dn( QString::null ), client( 0 ) {}
- explicit LdapObject( const QString& _dn, LdapClient* _cl ) : dn( _dn ), client( _cl ) {}
+ : dn( TQString::null ), client( 0 ) {}
+ explicit LdapObject( const TQString& _dn, LdapClient* _cl ) : dn( _dn ), client( _cl ) {}
LdapObject( const LdapObject& that ) { assign( that ); }
LdapObject& operator=( const LdapObject& that )
@@ -60,11 +60,11 @@ class KABC_EXPORT LdapObject
return *this;
}
- QString toString() const;
+ TQString toString() const;
void clear();
- QString dn;
+ TQString dn;
LdapAttrMap attrs;
LdapClient* client;
@@ -87,7 +87,7 @@ class KABC_EXPORT LdapClient : public QObject
Q_OBJECT
public:
- LdapClient( QObject* parent = 0, const char* name = 0 );
+ LdapClient( TQObject* parent = 0, const char* name = 0 );
virtual ~LdapClient();
/*! returns true if there is a query running */
@@ -98,7 +98,7 @@ class KABC_EXPORT LdapClient : public QObject
void done();
/*! Emitted in case of error */
- void error( const QString& );
+ void error( const TQString& );
/*! Emitted once for each object returned
* from the query
@@ -109,47 +109,47 @@ class KABC_EXPORT LdapClient : public QObject
/*!
* Set the name or IP of the LDAP server
*/
- void setHost( const QString& host );
- QString host() const { return mHost; }
+ void setHost( const TQString& host );
+ TQString host() const { return mHost; }
/*!
* Set the port of the LDAP server
* if using a nonstandard port
*/
- void setPort( const QString& port );
- QString port() const { return mPort; }
+ void setPort( const TQString& port );
+ TQString port() const { return mPort; }
/*!
* Set the base DN
*/
- void setBase( const QString& base );
- QString base() const { return mBase; }
+ void setBase( const TQString& base );
+ TQString base() const { return mBase; }
/*!
* Set the bind DN
*/
- void setBindDN( const QString& bindDN );
- QString bindDN() const;
+ void setBindDN( const TQString& bindDN );
+ TQString bindDN() const;
/*!
* Set the bind password DN
*/
- void setPwdBindDN( const QString& pwdBindDN );
- QString pwdBindDN() const;
+ void setPwdBindDN( const TQString& pwdBindDN );
+ TQString pwdBindDN() const;
/*! Set the attributes that should be
* returned, or an empty list if
* all attributes are wanted
*/
- void setAttrs( const QStringList& attrs );
- QStringList attrs() const { return mAttrs; }
+ void setAttrs( const TQStringList& attrs );
+ TQStringList attrs() const { return mAttrs; }
- void setScope( const QString scope ) { mScope = scope; }
+ void setScope( const TQString scope ) { mScope = scope; }
/*!
* Start the query with filter filter
*/
- void startQuery( const QString& filter );
+ void startQuery( const TQString& filter );
/*!
* Abort a running query
@@ -157,28 +157,28 @@ class KABC_EXPORT LdapClient : public QObject
void cancelQuery();
protected slots:
- void slotData( KIO::Job*, const QByteArray &data );
- void slotInfoMessage( KIO::Job*, const QString &info );
+ void slotData( KIO::Job*, const TQByteArray &data );
+ void slotInfoMessage( KIO::Job*, const TQString &info );
void slotDone();
protected:
void startParseLDIF();
- void parseLDIF( const QByteArray& data );
+ void parseLDIF( const TQByteArray& data );
void endParseLDIF();
- QString mHost;
- QString mPort;
- QString mBase;
- QString mScope;
- QStringList mAttrs;
+ TQString mHost;
+ TQString mPort;
+ TQString mBase;
+ TQString mScope;
+ TQStringList mAttrs;
- QGuardedPtr<KIO::SimpleJob> mJob;
+ TQGuardedPtr<KIO::SimpleJob> mJob;
bool mActive;
LdapObject mCurrentObject;
- QCString mBuf;
- QCString mLastAttrName;
- QCString mLastAttrValue;
+ TQCString mBuf;
+ TQCString mLastAttrName;
+ TQCString mLastAttrValue;
bool mIsBase64;
private:
@@ -190,11 +190,11 @@ class KABC_EXPORT LdapClient : public QObject
* Structure describing one result returned by a LDAP query
*/
struct LdapResult {
- QString name; ///< full name
- QString email; ///< email
+ TQString name; ///< full name
+ TQString email; ///< email
int clientNumber; ///< for sorting
};
-typedef QValueList<LdapResult> LdapResultList;
+typedef TQValueList<LdapResult> LdapResultList;
/**
@@ -211,14 +211,14 @@ class KABC_EXPORT LdapSearch : public QObject
public:
LdapSearch();
- void startSearch( const QString& txt );
+ void startSearch( const TQString& txt );
void cancelSearch();
bool isAvailable() const;
signals:
/// Results, assembled as "Full Name <email>"
/// (This signal can be emitted many times)
- void searchData( const QStringList& );
+ void searchData( const TQStringList& );
/// Another form for the results, with separate fields
/// (This signal can be emitted many times)
void searchData( const KABC::LdapResultList& );
@@ -226,19 +226,19 @@ class KABC_EXPORT LdapSearch : public QObject
private slots:
void slotLDAPResult( const KABC::LdapObject& );
- void slotLDAPError( const QString& );
+ void slotLDAPError( const TQString& );
void slotLDAPDone();
void slotDataTimer();
private:
void finish();
- void makeSearchData( QStringList& ret, LdapResultList& resList );
- QValueList< LdapClient* > mClients;
- QString mSearchText;
- QTimer mDataTimer;
+ void makeSearchData( TQStringList& ret, LdapResultList& resList );
+ TQValueList< LdapClient* > mClients;
+ TQString mSearchText;
+ TQTimer mDataTimer;
int mActiveClients;
bool mNoLDAPLookup;
- QValueList< LdapObject > mResults;
+ TQValueList< LdapObject > mResults;
private:
class LdapSearchPrivate* d;
diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp
index b144b2db5..a4b7fc571 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/kabc/ldapconfigwidget.cpp
@@ -17,17 +17,17 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-
-#include <qobjectlist.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qvgroupbox.h>
-#include <qhbuttongroup.h>
-#include <qradiobutton.h>
+#include <tqapplication.h>
+
+#include <tqobjectlist.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqvgroupbox.h>
+#include <tqhbuttongroup.h>
+#include <tqradiobutton.h>
#include <kmessagebox.h>
#include <kaccelmanager.h>
@@ -44,21 +44,21 @@
using namespace KABC;
-LdapConfigWidget::LdapConfigWidget( QWidget* parent,
- const char* name, WFlags fl ) : QWidget( parent, name, fl )
+LdapConfigWidget::LdapConfigWidget( TQWidget* parent,
+ const char* name, WFlags fl ) : TQWidget( parent, name, fl )
{
mProg = 0;
mFlags = 0;
- mainLayout = new QGridLayout( this, 12, 4, 0,
+ mainLayout = new TQGridLayout( this, 12, 4, 0,
KDialog::spacingHint() );
}
-LdapConfigWidget::LdapConfigWidget( int flags, QWidget* parent,
- const char* name, WFlags fl ) : QWidget( parent, name, fl )
+LdapConfigWidget::LdapConfigWidget( int flags, TQWidget* parent,
+ const char* name, WFlags fl ) : TQWidget( parent, name, fl )
{
mFlags = flags;
mProg = 0;
- mainLayout = new QGridLayout( this, 12, 4, 0,
+ mainLayout = new TQGridLayout( this, 12, 4, 0,
KDialog::spacingHint() );
initWidget();
}
@@ -69,7 +69,7 @@ LdapConfigWidget::~LdapConfigWidget()
void LdapConfigWidget::initWidget()
{
- QLabel *label;
+ TQLabel *label;
mUser = mPassword = mHost = mDn = mBindDN = mRealm = mFilter = 0;
mPort = mVer = mTimeLimit = mSizeLimit = 0;
@@ -80,7 +80,7 @@ void LdapConfigWidget::initWidget()
int col;
if ( mFlags & W_USER ) {
- label = new QLabel( i18n( "User:" ), this );
+ label = new TQLabel( i18n( "User:" ), this );
mUser = new KLineEdit( this, "kcfg_ldapuser" );
mainLayout->addWidget( label, row, 0 );
@@ -89,7 +89,7 @@ void LdapConfigWidget::initWidget()
}
if ( mFlags & W_BINDDN ) {
- label = new QLabel( i18n( "Bind DN:" ), this );
+ label = new TQLabel( i18n( "Bind DN:" ), this );
mBindDN = new KLineEdit( this, "kcfg_ldapbinddn" );
mainLayout->addWidget( label, row, 0 );
@@ -98,7 +98,7 @@ void LdapConfigWidget::initWidget()
}
if ( mFlags & W_REALM ) {
- label = new QLabel( i18n( "Realm:" ), this );
+ label = new TQLabel( i18n( "Realm:" ), this );
mRealm = new KLineEdit( this, "kcfg_ldaprealm" );
mainLayout->addWidget( label, row, 0 );
@@ -107,7 +107,7 @@ void LdapConfigWidget::initWidget()
}
if ( mFlags & W_PASS ) {
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this, "kcfg_ldappassword" );
mPassword->setEchoMode( KLineEdit::Password );
@@ -117,7 +117,7 @@ void LdapConfigWidget::initWidget()
}
if ( mFlags & W_HOST ) {
- label = new QLabel( i18n( "Host:" ), this );
+ label = new TQLabel( i18n( "Host:" ), this );
mHost = new KLineEdit( this, "kcfg_ldaphost" );
mainLayout->addWidget( label, row, 0 );
@@ -127,9 +127,9 @@ void LdapConfigWidget::initWidget()
col = 0;
if ( mFlags & W_PORT ) {
- label = new QLabel( i18n( "Port:" ), this );
- mPort = new QSpinBox( 0, 65535, 1, this, "kcfg_ldapport" );
- mPort->setSizePolicy( QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred ) );
+ label = new TQLabel( i18n( "Port:" ), this );
+ mPort = new TQSpinBox( 0, 65535, 1, this, "kcfg_ldapport" );
+ mPort->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
mPort->setValue( 389 );
mainLayout->addWidget( label, row, col );
@@ -138,9 +138,9 @@ void LdapConfigWidget::initWidget()
}
if ( mFlags & W_VER ) {
- label = new QLabel( i18n( "LDAP version:" ), this );
- mVer = new QSpinBox( 2, 3, 1, this, "kcfg_ldapver" );
- mVer->setSizePolicy( QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred ) );
+ label = new TQLabel( i18n( "LDAP version:" ), this );
+ mVer = new TQSpinBox( 2, 3, 1, this, "kcfg_ldapver" );
+ mVer->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
mVer->setValue( 3 );
mainLayout->addWidget( label, row, col );
mainLayout->addWidget( mVer, row, col+1 );
@@ -149,9 +149,9 @@ void LdapConfigWidget::initWidget()
col = 0;
if ( mFlags & W_SIZELIMIT ) {
- label = new QLabel( i18n( "Size limit:" ), this );
- mSizeLimit = new QSpinBox( 0, 9999999, 1, this, "kcfg_ldapsizelimit" );
- mSizeLimit->setSizePolicy( QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred ) );
+ label = new TQLabel( i18n( "Size limit:" ), this );
+ mSizeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldapsizelimit" );
+ mSizeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
mSizeLimit->setValue( 0 );
mSizeLimit->setSpecialValueText( i18n("Default") );
mainLayout->addWidget( label, row, col );
@@ -160,9 +160,9 @@ void LdapConfigWidget::initWidget()
}
if ( mFlags & W_TIMELIMIT ) {
- label = new QLabel( i18n( "Time limit:" ), this );
- mTimeLimit = new QSpinBox( 0, 9999999, 1, this, "kcfg_ldaptimelimit" );
- mTimeLimit->setSizePolicy( QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred ) );
+ label = new TQLabel( i18n( "Time limit:" ), this );
+ mTimeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldaptimelimit" );
+ mTimeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
mTimeLimit->setValue( 0 );
mTimeLimit->setSuffix( i18n(" sec") );
mTimeLimit->setSpecialValueText( i18n("Default") );
@@ -172,22 +172,22 @@ void LdapConfigWidget::initWidget()
if ( mFlags & ( W_SIZELIMIT | W_TIMELIMIT ) ) row++;
if ( mFlags & W_DN ) {
- label = new QLabel( i18n( "Distinguished Name", "DN:" ), this );
+ label = new TQLabel( i18n( "Distinguished Name", "DN:" ), this );
mDn = new KLineEdit( this, "kcfg_ldapdn" );
mainLayout->addWidget( label, row, 0 );
mainLayout->addMultiCellWidget( mDn, row, row, 1, 1 );
//without host query doesn't make sense
if ( mHost ) {
- QPushButton *dnquery = new QPushButton( i18n( "Query Server" ), this );
- connect( dnquery, SIGNAL( clicked() ), SLOT( mQueryDNClicked() ) );
+ TQPushButton *dnquery = new TQPushButton( i18n( "Query Server" ), this );
+ connect( dnquery, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryDNClicked() ) );
mainLayout->addMultiCellWidget( dnquery, row, row, 2, 3 );
}
row++;
}
if ( mFlags & W_FILTER ) {
- label = new QLabel( i18n( "Filter:" ), this );
+ label = new TQLabel( i18n( "Filter:" ), this );
mFilter = new KLineEdit( this, "kcfg_ldapfilter" );
mainLayout->addWidget( label, row, 0 );
@@ -196,15 +196,15 @@ void LdapConfigWidget::initWidget()
}
if ( mFlags & W_SECBOX ) {
- QHButtonGroup *btgroup = new QHButtonGroup( i18n( "Security" ), this );
- mSecNO = new QRadioButton( i18n( "No" ), btgroup, "kcfg_ldapnosec" );
- mSecTLS = new QRadioButton( i18n( "TLS" ), btgroup, "kcfg_ldaptls" );
- mSecSSL = new QRadioButton( i18n( "SSL" ), btgroup, "kcfg_ldapssl" );
+ TQHButtonGroup *btgroup = new TQHButtonGroup( i18n( "Security" ), this );
+ mSecNO = new TQRadioButton( i18n( "No" ), btgroup, "kcfg_ldapnosec" );
+ mSecTLS = new TQRadioButton( i18n( "TLS" ), btgroup, "kcfg_ldaptls" );
+ mSecSSL = new TQRadioButton( i18n( "SSL" ), btgroup, "kcfg_ldapssl" );
mainLayout->addMultiCellWidget( btgroup, row, row, 0, 3 );
- connect( mSecNO, SIGNAL( clicked() ), SLOT( setLDAPPort() ) );
- connect( mSecTLS, SIGNAL( clicked() ), SLOT( setLDAPPort() ) );
- connect( mSecSSL, SIGNAL( clicked() ), SLOT( setLDAPSPort( ) ) );
+ connect( mSecNO, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) );
+ connect( mSecTLS, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) );
+ connect( mSecSSL, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPSPort( ) ) );
mSecNO->setChecked( true );
row++;
@@ -212,14 +212,14 @@ void LdapConfigWidget::initWidget()
if ( mFlags & W_AUTHBOX ) {
- QButtonGroup *authbox =
- new QButtonGroup( 3, Qt::Horizontal, i18n( "Authentication" ), this );
+ TQButtonGroup *authbox =
+ new TQButtonGroup( 3, Qt::Horizontal, i18n( "Authentication" ), this );
- mAnonymous = new QRadioButton( i18n( "Anonymous" ), authbox, "kcfg_ldapanon" );
- mSimple = new QRadioButton( i18n( "Simple" ), authbox, "kcfg_ldapsimple" );
- mSASL = new QRadioButton( i18n( "SASL" ), authbox, "kcfg_ldapsasl" );
+ mAnonymous = new TQRadioButton( i18n( "Anonymous" ), authbox, "kcfg_ldapanon" );
+ mSimple = new TQRadioButton( i18n( "Simple" ), authbox, "kcfg_ldapsimple" );
+ mSASL = new TQRadioButton( i18n( "SASL" ), authbox, "kcfg_ldapsasl" );
- label = new QLabel( i18n( "SASL mechanism:" ), authbox );
+ label = new TQLabel( i18n( "SASL mechanism:" ), authbox );
mMech = new KComboBox( false, authbox, "kcfg_ldapsaslmech" );
mMech->setEditable( true );
mMech->insertItem( "DIGEST-MD5" );
@@ -228,22 +228,22 @@ void LdapConfigWidget::initWidget()
//without host query doesn't make sense
if ( mHost ) {
- mQueryMech = new QPushButton( i18n( "Query Server" ), authbox );
- connect( mQueryMech, SIGNAL( clicked() ), SLOT( mQueryMechClicked() ) );
+ mQueryMech = new TQPushButton( i18n( "Query Server" ), authbox );
+ connect( mQueryMech, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryMechClicked() ) );
}
mainLayout->addMultiCellWidget( authbox, row, row+1, 0, 3 );
- connect( mAnonymous, SIGNAL( stateChanged(int) ), SLOT( setAnonymous(int) ) );
- connect( mSimple, SIGNAL( stateChanged(int) ), SLOT( setSimple(int) ) );
- connect( mSASL, SIGNAL( stateChanged(int) ), SLOT( setSASL(int) ) );
+ connect( mAnonymous, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setAnonymous(int) ) );
+ connect( mSimple, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSimple(int) ) );
+ connect( mSASL, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSASL(int) ) );
mAnonymous->setChecked( true );
}
}
-void LdapConfigWidget::loadData( KIO::Job*, const QByteArray& d )
+void LdapConfigWidget::loadData( KIO::Job*, const TQByteArray& d )
{
LDIF::ParseVal ret;
@@ -256,7 +256,7 @@ void LdapConfigWidget::loadData( KIO::Job*, const QByteArray& d )
ret = mLdif.nextItem();
if ( ret == LDIF::Item && mLdif.attr().lower() == mAttr ) {
mProg->progressBar()->advance( 1 );
- mQResult.push_back( QString::fromUtf8( mLdif.val(), mLdif.val().size() ) );
+ mQResult.push_back( TQString::fromUtf8( mLdif.val(), mLdif.val().size() ) );
}
} while ( ret != LDIF::MoreData );
}
@@ -286,17 +286,17 @@ void LdapConfigWidget::sendQuery()
_url.setDn( "" );
_url.setAttributes( mAttr );
_url.setScope( LDAPUrl::Base );
- if ( mVer ) _url.setExtension( "x-ver", QString::number( mVer->value() ) );
+ if ( mVer ) _url.setExtension( "x-ver", TQString::number( mVer->value() ) );
if ( mSecTLS && mSecTLS->isChecked() ) _url.setExtension( "x-tls", "" );
kdDebug(5700) << "sendQuery url: " << _url.prettyURL() << endl;
mLdif.startParsing();
KIO::Job *job = KIO::get( _url, true, false );
job->addMetaData("no-auth-prompt","true");
- connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ),
- this, SLOT( loadData( KIO::Job*, const QByteArray& ) ) );
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( loadResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( loadData( KIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( loadResult( KIO::Job* ) ) );
if ( mProg == NULL )
mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true );
@@ -333,7 +333,7 @@ void LdapConfigWidget::mQueryDNClicked()
void LdapConfigWidget::setAnonymous( int state )
{
- if ( state == QButton::Off ) return;
+ if ( state == TQButton::Off ) return;
if ( mUser ) mUser->setEnabled(false);
if ( mPassword ) mPassword->setEnabled(false);
if ( mBindDN ) mBindDN->setEnabled(false);
@@ -344,7 +344,7 @@ void LdapConfigWidget::setAnonymous( int state )
void LdapConfigWidget::setSimple( int state )
{
- if ( state == QButton::Off ) return;
+ if ( state == TQButton::Off ) return;
if ( mUser ) mUser->setEnabled(true);
if ( mPassword ) mPassword->setEnabled(true);
if ( mBindDN ) mBindDN->setEnabled(false);
@@ -355,7 +355,7 @@ void LdapConfigWidget::setSimple( int state )
void LdapConfigWidget::setSASL( int state )
{
- if ( state == QButton::Off ) return;
+ if ( state == TQButton::Off ) return;
if ( mUser ) mUser->setEnabled(true);
if ( mPassword ) mPassword->setEnabled(true);
if ( mBindDN ) mBindDN->setEnabled(true);
@@ -388,11 +388,11 @@ LDAPUrl LdapConfigWidget::url() const
if ( mHost ) _url.setHost( mHost->text() );
if ( mPort ) _url.setPort( mPort->value() );
if ( mDn ) _url.setDn( mDn->text() );
- if ( mVer ) _url.setExtension( "x-ver", QString::number( mVer->value() ) );
+ if ( mVer ) _url.setExtension( "x-ver", TQString::number( mVer->value() ) );
if ( mSizeLimit && mSizeLimit->value() != 0 )
- _url.setExtension( "x-sizelimit", QString::number( mSizeLimit->value() ) );
+ _url.setExtension( "x-sizelimit", TQString::number( mSizeLimit->value() ) );
if ( mTimeLimit && mTimeLimit->value() != 0 )
- _url.setExtension( "x-timelimit", QString::number( mTimeLimit->value() ) );
+ _url.setExtension( "x-timelimit", TQString::number( mTimeLimit->value() ) );
if ( mSecTLS && mSecTLS->isChecked() ) _url.setExtension( "x-tls","" );
if ( mFilter && !mFilter->text().isEmpty() )
_url.setFilter( mFilter->text() );
@@ -407,54 +407,54 @@ LDAPUrl LdapConfigWidget::url() const
return ( _url );
}
-void LdapConfigWidget::setUser( const QString &user )
+void LdapConfigWidget::setUser( const TQString &user )
{
if ( mUser ) mUser->setText( user );
}
-QString LdapConfigWidget::user() const
+TQString LdapConfigWidget::user() const
{
- return ( mUser ? mUser->text() : QString::null );
+ return ( mUser ? mUser->text() : TQString::null );
}
-void LdapConfigWidget::setPassword( const QString &password )
+void LdapConfigWidget::setPassword( const TQString &password )
{
if ( mPassword ) mPassword->setText( password );
}
-QString LdapConfigWidget::password() const
+TQString LdapConfigWidget::password() const
{
- return ( mPassword ? mPassword->text() : QString::null );
+ return ( mPassword ? mPassword->text() : TQString::null );
}
-void LdapConfigWidget::setBindDN( const QString &binddn )
+void LdapConfigWidget::setBindDN( const TQString &binddn )
{
if ( mBindDN ) mBindDN->setText( binddn );
}
-QString LdapConfigWidget::bindDN() const
+TQString LdapConfigWidget::bindDN() const
{
- return ( mBindDN ? mBindDN->text() : QString::null );
+ return ( mBindDN ? mBindDN->text() : TQString::null );
}
-void LdapConfigWidget::setRealm( const QString &realm )
+void LdapConfigWidget::setRealm( const TQString &realm )
{
if ( mRealm ) mRealm->setText( realm );
}
-QString LdapConfigWidget::realm() const
+TQString LdapConfigWidget::realm() const
{
- return ( mRealm ? mRealm->text() : QString::null );
+ return ( mRealm ? mRealm->text() : TQString::null );
}
-void LdapConfigWidget::setHost( const QString &host )
+void LdapConfigWidget::setHost( const TQString &host )
{
if ( mHost ) mHost->setText( host );
}
-QString LdapConfigWidget::host() const
+TQString LdapConfigWidget::host() const
{
- return ( mHost ? mHost->text() : QString::null );
+ return ( mHost ? mHost->text() : TQString::null );
}
void LdapConfigWidget::setPort( int port )
@@ -477,27 +477,27 @@ int LdapConfigWidget::ver() const
return ( mVer ? mVer->value() : 3 );
}
-void LdapConfigWidget::setDn( const QString &dn )
+void LdapConfigWidget::setDn( const TQString &dn )
{
if ( mDn ) mDn->setText( dn );
}
-QString LdapConfigWidget::dn() const
+TQString LdapConfigWidget::dn() const
{
- return ( mDn ? mDn->text() : QString::null );
+ return ( mDn ? mDn->text() : TQString::null );
}
-void LdapConfigWidget::setFilter( const QString &filter )
+void LdapConfigWidget::setFilter( const TQString &filter )
{
if ( mFilter ) mFilter->setText( filter );
}
-QString LdapConfigWidget::filter() const
+TQString LdapConfigWidget::filter() const
{
- return ( mFilter ? mFilter->text() : QString::null );
+ return ( mFilter ? mFilter->text() : TQString::null );
}
-void LdapConfigWidget::setMech( const QString &mech )
+void LdapConfigWidget::setMech( const TQString &mech )
{
if ( mMech == 0 ) return;
if ( !mech.isEmpty() ) {
@@ -511,9 +511,9 @@ void LdapConfigWidget::setMech( const QString &mech )
}
}
-QString LdapConfigWidget::mech() const
+TQString LdapConfigWidget::mech() const
{
- return ( mMech ? mMech->currentText() : QString::null );
+ return ( mMech ? mMech->currentText() : TQString::null );
}
void LdapConfigWidget::setSecNO( bool b )
@@ -607,14 +607,14 @@ void LdapConfigWidget::setFlags( int flags )
// First delete all the child widgets.
// FIXME: I hope it's correct
- const QObjectList *ch = children();
- QObjectList ch2 = *ch;
- QObject *obj;
- QWidget *widget;
+ const TQObjectList *ch = children();
+ TQObjectList ch2 = *ch;
+ TQObject *obj;
+ TQWidget *widget;
obj = ch2.first();
while ( obj != 0 ) {
- widget = dynamic_cast<QWidget*> (obj);
+ widget = dynamic_cast<TQWidget*> (obj);
if ( widget && widget->parent() == this ) {
mainLayout->remove( widget );
delete ( widget );
diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h
index e48b10e53..ce41f0151 100644
--- a/kabc/ldapconfigwidget.h
+++ b/kabc/ldapconfigwidget.h
@@ -21,9 +21,9 @@
#ifndef LDAPCONFIGWIDGET_H
#define LDAPCONFIGWIDGET_H
-#include <qwidget.h>
-#include <qmap.h>
-#include <qstring.h>
+#include <tqwidget.h>
+#include <tqmap.h>
+#include <tqstring.h>
#include <kabc/ldapurl.h>
#include <kabc/ldif.h>
@@ -51,16 +51,16 @@ namespace KABC {
{
Q_OBJECT
Q_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
- Q_PROPERTY( QString user READ user WRITE setUser )
- Q_PROPERTY( QString password READ password WRITE setPassword )
- Q_PROPERTY( QString bindDN READ bindDN WRITE setBindDN )
- Q_PROPERTY( QString realm READ realm WRITE setRealm )
- Q_PROPERTY( QString host READ host WRITE setHost )
+ Q_PROPERTY( TQString user READ user WRITE setUser )
+ Q_PROPERTY( TQString password READ password WRITE setPassword )
+ Q_PROPERTY( TQString bindDN READ bindDN WRITE setBindDN )
+ Q_PROPERTY( TQString realm READ realm WRITE setRealm )
+ Q_PROPERTY( TQString host READ host WRITE setHost )
Q_PROPERTY( int port READ port WRITE setPort )
Q_PROPERTY( int ver READ ver WRITE setVer )
- Q_PROPERTY( QString dn READ dn WRITE setDn )
- Q_PROPERTY( QString filter READ filter WRITE setFilter )
- Q_PROPERTY( QString mech READ mech WRITE setMech )
+ Q_PROPERTY( TQString dn READ dn WRITE setDn )
+ Q_PROPERTY( TQString filter READ filter WRITE setFilter )
+ Q_PROPERTY( TQString mech READ mech WRITE setMech )
Q_PROPERTY( bool secNO READ isSecNO WRITE setSecNO )
Q_PROPERTY( bool secSSL READ isSecSSL WRITE setSecSSL )
Q_PROPERTY( bool secTLS READ isSecSSL WRITE setSecTLS )
@@ -93,41 +93,41 @@ namespace KABC {
/** Constructs an empty configuration widget.
* You need to call setFlags() after this.
*/
- LdapConfigWidget( QWidget* parent = 0,
+ LdapConfigWidget( TQWidget* parent = 0,
const char* name = 0, WFlags fl = 0 );
/** Constructs a configuration widget */
- LdapConfigWidget( int flags, QWidget* parent = 0,
+ LdapConfigWidget( int flags, TQWidget* parent = 0,
const char* name = 0, WFlags fl = 0 );
/** Destructs a configuration widget */
virtual ~LdapConfigWidget();
/** Sets the user name. Kconfig widget name: kcfg_ldapuser */
- void setUser( const QString &user );
+ void setUser( const TQString &user );
/** Gets the user name. Kconfig widget name: kcfg_ldapuser */
- QString user() const;
+ TQString user() const;
/** Sets the password. Kconfig widget name: kcfg_ldappassword */
- void setPassword( const QString &password );
+ void setPassword( const TQString &password );
/** Gets the password. Kconfig widget name: kcfg_ldappassword */
- QString password() const;
+ TQString password() const;
/**
* Sets the bind dn. Useful for SASL proxy auth.
* Kconfig widget name: kcfg_ldapbinddn
*/
- void setBindDN( const QString &binddn );
+ void setBindDN( const TQString &binddn );
/** Gets the bind dn. Kconfig widget name: kcfg_ldapbinddn*/
- QString bindDN() const;
+ TQString bindDN() const;
/** Sets the SASL realm. Kconfig widget name: kcfg_ldaprealm */
- void setRealm( const QString &realm );
+ void setRealm( const TQString &realm );
/** Gets the SASL realm. Kconfig widget name: kcfg_ldaprealm */
- QString realm() const;
+ TQString realm() const;
/** Sets the host name. Kconfig widget name: kcfg_ldaphost */
- void setHost( const QString &host );
+ void setHost( const TQString &host );
/** Gets the host name. Kconfig widget name: kcfg_ldaphost */
- QString host() const;
+ TQString host() const;
/** Sets the LDAP port. Kconfig widget name: kcfg_ldapport */
void setPort( int port );
@@ -140,19 +140,19 @@ namespace KABC {
int ver() const;
/** Sets the LDAP Base DN. Kconfig widget name: kcfg_ldapdn */
- void setDn( const QString &dn );
+ void setDn( const TQString &dn );
/** Gets the LDAP Base DN. Kconfig widget name: kcfg_ldapdn */
- QString dn() const;
+ TQString dn() const;
/** Sets the LDAP Filter. Kconfig widget name: kcfg_ldapfilter */
- void setFilter( const QString &filter );
+ void setFilter( const TQString &filter );
/** Gets the LDAP Filter. Kconfig widget name: kcfg_ldapfilter */
- QString filter() const;
+ TQString filter() const;
/** Sets the SASL Mechanism. Kconfig widget name: kcfg_ldapsaslmech */
- void setMech( const QString &mech );
+ void setMech( const TQString &mech );
/** Gets the SASL Mechanism. Kconfig widget name: kcfg_ldapsaslmech */
- QString mech() const;
+ TQString mech() const;
/**
* Sets the configuration to no transport security.
@@ -259,33 +259,33 @@ namespace KABC {
void setSASL( int state );
void mQueryDNClicked();
void mQueryMechClicked();
- void loadData( KIO::Job*, const QByteArray& );
+ void loadData( KIO::Job*, const TQByteArray& );
void loadResult( KIO::Job* );
private:
int mFlags;
LDIF mLdif;
- QStringList mQResult;
- QString mAttr;
+ TQStringList mQResult;
+ TQString mAttr;
KLineEdit *mUser;
KLineEdit *mPassword;
KLineEdit *mHost;
- QSpinBox *mPort, *mVer, *mSizeLimit, *mTimeLimit;
+ TQSpinBox *mPort, *mVer, *mSizeLimit, *mTimeLimit;
KLineEdit *mDn, *mBindDN, *mRealm;
KLineEdit *mFilter;
- QRadioButton *mAnonymous,*mSimple,*mSASL;
- QCheckBox *mSubTree;
- QPushButton *mEditButton;
- QPushButton *mQueryMech;
- QRadioButton *mSecNO,*mSecTLS,*mSecSSL;
+ TQRadioButton *mAnonymous,*mSimple,*mSASL;
+ TQCheckBox *mSubTree;
+ TQPushButton *mEditButton;
+ TQPushButton *mQueryMech;
+ TQRadioButton *mSecNO,*mSecTLS,*mSecSSL;
KComboBox *mMech;
- QString mErrorMsg;
+ TQString mErrorMsg;
bool mCancelled;
KProgressDialog *mProg;
- QGridLayout *mainLayout;
+ TQGridLayout *mainLayout;
class LDAPConfigWidgetPrivate;
LDAPConfigWidgetPrivate *d;
diff --git a/kabc/ldapurl.cpp b/kabc/ldapurl.cpp
index b7ee2a16f..9032c16d3 100644
--- a/kabc/ldapurl.cpp
+++ b/kabc/ldapurl.cpp
@@ -19,8 +19,8 @@
*/
#include <kdebug.h>
-#include <qstringlist.h>
-#include <qdir.h>
+#include <tqstringlist.h>
+#include <tqdir.h>
#include "ldapurl.h"
@@ -35,7 +35,7 @@ LDAPUrl::LDAPUrl(const KURL &_url)
: KURL(_url), m_extensions()
{
m_dn = path();
- if ( !QDir::isRelativePath(m_dn) )
+ if ( !TQDir::isRelativePath(m_dn) )
#ifdef Q_WS_WIN
m_dn.remove(0,3); // e.g. "c:/"
#else
@@ -44,10 +44,10 @@ LDAPUrl::LDAPUrl(const KURL &_url)
parseQuery();
}
-void LDAPUrl::setDn( const QString &dn)
+void LDAPUrl::setDn( const TQString &dn)
{
m_dn = dn;
- if ( !QDir::isRelativePath(m_dn) )
+ if ( !TQDir::isRelativePath(m_dn) )
#ifdef Q_WS_WIN
m_dn.remove(0,3); // e.g. "c:/"
#else
@@ -56,14 +56,14 @@ void LDAPUrl::setDn( const QString &dn)
setPath(m_dn);
}
-bool LDAPUrl::hasExtension( const QString &key ) const
+bool LDAPUrl::hasExtension( const TQString &key ) const
{
return m_extensions.contains( key );
}
-LDAPUrl::Extension LDAPUrl::extension( const QString &key ) const
+LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const
{
- QMap<QString, Extension>::const_iterator it;
+ TQMap<TQString, Extension>::const_iterator it;
it = m_extensions.find( key );
if ( it != m_extensions.constEnd() )
@@ -76,7 +76,7 @@ LDAPUrl::Extension LDAPUrl::extension( const QString &key ) const
}
}
-QString LDAPUrl::extension( const QString &key, bool &critical ) const
+TQString LDAPUrl::extension( const TQString &key, bool &critical ) const
{
Extension ext;
@@ -85,13 +85,13 @@ QString LDAPUrl::extension( const QString &key, bool &critical ) const
return ext.value;
}
-void LDAPUrl::setExtension( const QString &key, const LDAPUrl::Extension &ext )
+void LDAPUrl::setExtension( const TQString &key, const LDAPUrl::Extension &ext )
{
m_extensions[ key ] = ext;
updateQuery();
}
-void LDAPUrl::setExtension( const QString &key, const QString &value, bool critical )
+void LDAPUrl::setExtension( const TQString &key, const TQString &value, bool critical )
{
Extension ext;
ext.value = value;
@@ -99,7 +99,7 @@ void LDAPUrl::setExtension( const QString &key, const QString &value, bool criti
setExtension( key, ext );
}
-void LDAPUrl::removeExtension( const QString &key )
+void LDAPUrl::removeExtension( const TQString &key )
{
m_extensions.remove( key );
updateQuery();
@@ -108,8 +108,8 @@ void LDAPUrl::removeExtension( const QString &key )
void LDAPUrl::updateQuery()
{
Extension ext;
- QMap<QString, Extension>::iterator it;
- QString q = "?";
+ TQMap<TQString, Extension>::iterator it;
+ TQString q = "?";
// set the attributes to query
if ( m_attributes.count() > 0 ) q += m_attributes.join(",");
@@ -152,14 +152,14 @@ void LDAPUrl::updateQuery()
void LDAPUrl::parseQuery()
{
Extension ext;
- QStringList extensions;
- QString q = query();
+ TQStringList extensions;
+ TQString q = query();
// remove first ?
if (q.startsWith("?"))
q.remove(0,1);
// split into a list
- QStringList url_items = QStringList::split("?", q, true);
+ TQStringList url_items = TQStringList::split("?", q, true);
m_attributes.clear();
m_scope = Base;
@@ -167,10 +167,10 @@ void LDAPUrl::parseQuery()
m_extensions.clear();
int i = 0;
- for ( QStringList::Iterator it = url_items.begin(); it != url_items.end(); ++it, i++ ) {
+ for ( TQStringList::Iterator it = url_items.begin(); it != url_items.end(); ++it, i++ ) {
switch (i) {
case 0:
- m_attributes = QStringList::split(",", (*it), false);
+ m_attributes = TQStringList::split(",", (*it), false);
break;
case 1:
if ( (*it) == "sub" ) m_scope = Sub; else
@@ -180,13 +180,13 @@ void LDAPUrl::parseQuery()
m_filter = decode_string( *it );
break;
case 3:
- extensions = QStringList::split(",", (*it), false);
+ extensions = TQStringList::split(",", (*it), false);
break;
}
}
- QString name,value;
- for ( QStringList::Iterator it = extensions.begin(); it != extensions.end(); ++it ) {
+ TQString name,value;
+ for ( TQStringList::Iterator it = extensions.begin(); it != extensions.end(); ++it ) {
ext.critical = false;
name = decode_string( (*it).section('=',0,0) ).lower();
value = decode_string( (*it).section('=',1) );
diff --git a/kabc/ldapurl.h b/kabc/ldapurl.h
index 6cfc9edbc..0c2693758 100644
--- a/kabc/ldapurl.h
+++ b/kabc/ldapurl.h
@@ -21,9 +21,9 @@
#ifndef _K_LDAPURL_H_
#define _K_LDAPURL_H_
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
#include <kurl.h>
@@ -44,7 +44,7 @@ namespace KABC {
public:
struct Extension {
- QString value;
+ TQString value;
bool critical;
};
@@ -59,14 +59,14 @@ namespace KABC {
* Returns the dn part of the LDAP Url (same as path(), but slash removed
* from the beginning).
*/
- const QString& dn() const { return m_dn; }
+ const TQString& dn() const { return m_dn; }
/** Sets the the dn part of the LDAP Url. */
- void setDn( const QString &dn );
+ void setDn( const TQString &dn );
/** Returns the attributes part of the LDAP Url */
- const QStringList &attributes() { return m_attributes; }
+ const TQStringList &attributes() { return m_attributes; }
/** Sets the attributes part of the LDAP Url */
- void setAttributes( const QStringList &attributes )
+ void setAttributes( const TQStringList &attributes )
{ m_attributes=attributes; updateQuery(); }
/** Returns the scope part of the LDAP Url */
@@ -75,22 +75,22 @@ namespace KABC {
void setScope(Scope scope) { m_scope = scope; updateQuery(); }
/** Returns the filter part of the LDAP Url */
- const QString &filter() const { return m_filter; }
+ const TQString &filter() const { return m_filter; }
/** Sets the filter part of the LDAP Url */
- void setFilter( QString filter ) { m_filter = filter; updateQuery(); }
+ void setFilter( TQString filter ) { m_filter = filter; updateQuery(); }
/** Returns if the specified extension exists in the LDAP Url */
- bool hasExtension( const QString &key ) const;
+ bool hasExtension( const TQString &key ) const;
/** Returns the specified extension */
- Extension extension( const QString &key ) const;
+ Extension extension( const TQString &key ) const;
/** Returns the specified extension */
- QString extension( const QString &key, bool &critical ) const;
+ TQString extension( const TQString &key, bool &critical ) const;
/** Sets the specified extension key with the value and criticality in ext */
- void setExtension( const QString &key, const Extension &ext );
+ void setExtension( const TQString &key, const Extension &ext );
/** Sets the specified extension key with the value and criticality specified */
- void setExtension( const QString &key, const QString &value, bool critical = false );
+ void setExtension( const TQString &key, const TQString &value, bool critical = false );
/** Removes the specified extension */
- void removeExtension( const QString &key );
+ void removeExtension( const TQString &key );
/** Updates the query component from the attributes, scope, filter and extensions */
void updateQuery();
@@ -99,11 +99,11 @@ namespace KABC {
private:
- QMap<QString, Extension> m_extensions;
- QString m_dn;
- QStringList m_attributes;
+ TQMap<TQString, Extension> m_extensions;
+ TQString m_dn;
+ TQStringList m_attributes;
Scope m_scope;
- QString m_filter;
+ TQString m_filter;
};
}
diff --git a/kabc/ldif.cpp b/kabc/ldif.cpp
index 6d4e033e2..19895fce5 100644
--- a/kabc/ldif.cpp
+++ b/kabc/ldif.cpp
@@ -34,16 +34,16 @@ LDIF::~LDIF()
{
}
-QCString LDIF::assembleLine( const QString &fieldname, const QByteArray &value,
+TQCString LDIF::assembleLine( const TQString &fieldname, const TQByteArray &value,
uint linelen, bool url )
{
bool safe = false;
bool isDn;
- QCString result;
+ TQCString result;
uint i;
if ( url ) {
- result = fieldname.utf8() + ":< " + QCString( value.data(), value.size()+1 );
+ result = fieldname.utf8() + ":< " + TQCString( value.data(), value.size()+1 );
} else {
isDn = fieldname.lower() == "dn";
//SAFE-INIT-CHAR
@@ -66,7 +66,7 @@ QCString LDIF::assembleLine( const QString &fieldname, const QByteArray &value,
if ( value.size() == 0 ) safe = true;
if( safe ) {
- result = fieldname.utf8() + ": " + QCString( value.data(), value.size()+1 );
+ result = fieldname.utf8() + ": " + TQCString( value.data(), value.size()+1 );
} else {
result = fieldname.utf8() + ":: " + KCodecs::base64Encode( value, false );
}
@@ -82,11 +82,11 @@ QCString LDIF::assembleLine( const QString &fieldname, const QByteArray &value,
return result;
}
-QCString LDIF::assembleLine( const QString &fieldname, const QCString &value,
+TQCString LDIF::assembleLine( const TQString &fieldname, const TQCString &value,
uint linelen, bool url )
{
- QCString ret;
- QByteArray tmp;
+ TQCString ret;
+ TQByteArray tmp;
uint valuelen = value.length();
const char *data = value.data();
@@ -97,26 +97,26 @@ QCString LDIF::assembleLine( const QString &fieldname, const QCString &value,
}
-QCString LDIF::assembleLine( const QString &fieldname, const QString &value,
+TQCString LDIF::assembleLine( const TQString &fieldname, const TQString &value,
uint linelen, bool url )
{
return assembleLine( fieldname, value.utf8(), linelen, url );
}
-bool LDIF::splitLine( const QCString &line, QString &fieldname, QByteArray &value )
+bool LDIF::splitLine( const TQCString &line, TQString &fieldname, TQByteArray &value )
{
int position;
- QByteArray tmp;
+ TQByteArray tmp;
int linelen;
const char *data;
-// kdDebug(5700) << "splitLine line: " << QString::fromUtf8(line) << endl;
+// kdDebug(5700) << "splitLine line: " << TQString::fromUtf8(line) << endl;
position = line.find( ":" );
if ( position == -1 ) {
// strange: we did not find a fieldname
fieldname = "";
- QCString str;
+ TQCString str;
str = line.stripWhiteSpace();
linelen = str.length();
data = str.data();
@@ -131,7 +131,7 @@ bool LDIF::splitLine( const QCString &line, QString &fieldname, QByteArray &valu
if ( linelen > ( position + 1 ) && line[ position + 1 ] == ':' ) {
// String is BASE64 encoded -> decode it now.
- fieldname = QString::fromUtf8(
+ fieldname = TQString::fromUtf8(
line.left( position ).stripWhiteSpace() );
if ( linelen <= ( position + 3 ) ) {
value.resize( 0 );
@@ -146,7 +146,7 @@ bool LDIF::splitLine( const QCString &line, QString &fieldname, QByteArray &valu
if ( linelen > ( position + 1 ) && line[ position + 1 ] == '<' ) {
// String is an URL.
- fieldname = QString::fromUtf8(
+ fieldname = TQString::fromUtf8(
line.left( position ).stripWhiteSpace() );
if ( linelen <= ( position + 3 ) ) {
value.resize( 0 );
@@ -159,7 +159,7 @@ bool LDIF::splitLine( const QCString &line, QString &fieldname, QByteArray &valu
return true;
}
- fieldname = QString::fromUtf8(line.left( position ).stripWhiteSpace());
+ fieldname = TQString::fromUtf8(line.left( position ).stripWhiteSpace());
if ( linelen <= ( position + 2 ) ) {
value.resize( 0 );
return false;
@@ -171,16 +171,16 @@ bool LDIF::splitLine( const QCString &line, QString &fieldname, QByteArray &valu
return false;
}
-bool LDIF::splitControl( const QCString &line, QString &oid, bool &critical,
- QByteArray &value )
+bool LDIF::splitControl( const TQCString &line, TQString &oid, bool &critical,
+ TQByteArray &value )
{
- QString tmp;
+ TQString tmp;
critical = false;
bool url = splitLine( line, tmp, value );
- kdDebug(5700) << "splitControl: value: " << QString::fromUtf8(value, value.size()) << endl;
+ kdDebug(5700) << "splitControl: value: " << TQString::fromUtf8(value, value.size()) << endl;
if ( tmp.isEmpty() ) {
- tmp = QString::fromUtf8( value, value.size() );
+ tmp = TQString::fromUtf8( value, value.size() );
value.resize( 0 );
}
if ( tmp.right( 4 ) == "true" ) {
@@ -204,22 +204,22 @@ LDIF::ParseVal LDIF::processLine()
mUrl = splitLine( line, mAttr, mVal );
- QString attrLower = mAttr.lower();
+ TQString attrLower = mAttr.lower();
switch ( mEntryType ) {
case Entry_None:
if ( attrLower == "version" ) {
if ( !mDn.isEmpty() ) retval = Err;
} else if ( attrLower == "dn" ) {
- kdDebug(5700) << "ldapentry dn: " << QString::fromUtf8( mVal, mVal.size() ) << endl;
- mDn = QString::fromUtf8( mVal, mVal.size() );
+ kdDebug(5700) << "ldapentry dn: " << TQString::fromUtf8( mVal, mVal.size() ) << endl;
+ mDn = TQString::fromUtf8( mVal, mVal.size() );
mModType = Mod_None;
retval = NewEntry;
} else if ( attrLower == "changetype" ) {
if ( mDn.isEmpty() )
retval = Err;
else {
- QString tmpval = QString::fromUtf8( mVal, mVal.size() );
+ TQString tmpval = TQString::fromUtf8( mVal, mVal.size() );
kdDebug(5700) << "changetype: " << tmpval << endl;
if ( tmpval == "add" ) mEntryType = Entry_Add;
else if ( tmpval == "delete" ) mEntryType = Entry_Del;
@@ -233,7 +233,7 @@ LDIF::ParseVal LDIF::processLine()
else retval = Err;
}
} else if ( attrLower == "control" ) {
- mUrl = splitControl( QCString( mVal, mVal.size() + 1 ), mOid, mCritical, mVal );
+ mUrl = splitControl( TQCString( mVal, mVal.size() + 1 ), mOid, mCritical, mVal );
retval = Control;
} else if ( !mAttr.isEmpty() && mVal.size() > 0 ) {
mEntryType = Entry_Add;
@@ -261,12 +261,12 @@ LDIF::ParseVal LDIF::processLine()
mModType = Mod_Add;
} else if ( attrLower == "replace" ) {
mModType = Mod_Replace;
- mAttr = QString::fromUtf8( mVal, mVal.size() );
+ mAttr = TQString::fromUtf8( mVal, mVal.size() );
mVal.resize( 0 );
retval = Item;
} else if ( attrLower == "delete" ) {
mModType = Mod_Del;
- mAttr = QString::fromUtf8( mVal, mVal.size() );
+ mAttr = TQString::fromUtf8( mVal, mVal.size() );
mVal.resize( 0 );
retval = Item;
} else {
@@ -274,7 +274,7 @@ LDIF::ParseVal LDIF::processLine()
}
} else {
if ( mAttr.isEmpty() ) {
- if ( QString::fromUtf8( mVal, mVal.size() ) == "-" ) {
+ if ( TQString::fromUtf8( mVal, mVal.size() ) == "-" ) {
mModType = Mod_None;
} else if ( mVal.size() == 0 ) {
retval = EndEntry;
@@ -288,9 +288,9 @@ LDIF::ParseVal LDIF::processLine()
if ( mAttr.isEmpty() && mVal.size() == 0 )
retval = EndEntry;
else if ( attrLower == "newrdn" )
- mNewRdn = QString::fromUtf8( mVal, mVal.size() );
+ mNewRdn = TQString::fromUtf8( mVal, mVal.size() );
else if ( attrLower == "newsuperior" )
- mNewSuperior = QString::fromUtf8( mVal, mVal.size() );
+ mNewSuperior = TQString::fromUtf8( mVal, mVal.size() );
else if ( attrLower == "deleteoldrdn" ) {
if ( mVal.size() > 0 && mVal[0] == '0' )
mDelOldRdn = false;
@@ -343,7 +343,7 @@ LDIF::ParseVal LDIF::nextItem()
void LDIF::endLDIF()
{
- QByteArray tmp( 3 );
+ TQByteArray tmp( 3 );
tmp[ 0 ] = '\n';
tmp[ 1 ] = '\n';
tmp[ 2 ] = '\n';
diff --git a/kabc/ldif.h b/kabc/ldif.h
index cad227774..10cd15e18 100644
--- a/kabc/ldif.h
+++ b/kabc/ldif.h
@@ -21,9 +21,9 @@
#ifndef _K_LDIF_H_
#define _K_LDIF_H_
-#include <qstring.h>
-#include <qcstring.h>
-#include <qmemarray.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqmemarray.h>
#include <kdelibs_export.h>
@@ -55,26 +55,26 @@ namespace KABC {
* @param linelen Maximum length of the lines in the result.
* @param url If true, encode value as url ( use :< ).
*/
- static QCString assembleLine( const QString &fieldname,
- const QByteArray &value, uint linelen=0, bool url=false );
+ static TQCString assembleLine( const TQString &fieldname,
+ const TQByteArray &value, uint linelen=0, bool url=false );
/**
* This is the same as the above function, the only difference that
- * this accepts QCString as the value.
+ * this accepts TQCString as the value.
*/
- static QCString assembleLine( const QString &fieldname,
- const QCString &value, uint linelen=0, bool url=false );
+ static TQCString assembleLine( const TQString &fieldname,
+ const TQCString &value, uint linelen=0, bool url=false );
/**
* This is the same as the above function, the only difference that
- * this accepts QString as the value.
+ * this accepts TQString as the value.
*/
- static QCString assembleLine( const QString &fieldname,
- const QString &value, uint linelen=0, bool url=false );
+ static TQCString assembleLine( const TQString &fieldname,
+ const TQString &value, uint linelen=0, bool url=false );
/**
* Splits one line from an LDIF file to attribute and value components.
* @returns true if value is an URL, false otherwise
*/
- static bool splitLine( const QCString &line, QString &fieldname, QByteArray &value );
+ static bool splitLine( const TQCString &line, TQString &fieldname, TQByteArray &value );
/**
* Splits a control specification (without the "control:" directive)
* @param line is the control directive
@@ -82,8 +82,8 @@ namespace KABC {
* @param critical will contain the criticality of control
* @param value is the control value
*/
- static bool splitControl( const QCString &line, QString &oid, bool &critical,
- QByteArray &value );
+ static bool splitControl( const TQCString &line, TQString &oid, bool &critical,
+ TQByteArray &value );
/**
* Starts the parsing of a new LDIF
*/
@@ -108,7 +108,7 @@ namespace KABC {
* Sets a chunk of LDIF. Call before startParsing(), or if nextItem() returned
* MoreData.
*/
- void setLDIF( const QByteArray &ldif ) { mLdif = ldif; mPos = 0; }
+ void setLDIF( const TQByteArray &ldif ) { mLdif = ldif; mPos = 0; }
/**
* Indicates the end of the LDIF file/stream. Call if nextItem() returned
* MoreData, but actually you don't have more data.
@@ -125,15 +125,15 @@ namespace KABC {
/**
* Returns the Distinguished Name of the current entry.
*/
- const QString& dn() const { return mDn; }
+ const TQString& dn() const { return mDn; }
/**
* Returns the new Relative Distinguished Name if modType() returned Entry_Modrdn.
*/
- const QString& newRdn() const { return mNewRdn; }
+ const TQString& newRdn() const { return mNewRdn; }
/**
* Returns the new parent of the entry if modType() returned Entry_Modrdn.
*/
- const QString& newSuperior() const { return mNewSuperior; }
+ const TQString& newSuperior() const { return mNewSuperior; }
/**
* Returns if the delete of the old RDN is required.
*/
@@ -141,11 +141,11 @@ namespace KABC {
/**
* Returns the attribute name.
*/
- const QString& attr() const { return mAttr; }
+ const TQString& attr() const { return mAttr; }
/**
* Returns the attribute value.
*/
- const QByteArray& val() const { return mVal; }
+ const TQByteArray& val() const { return mVal; }
/**
* Returns if val() is an url
*/
@@ -157,7 +157,7 @@ namespace KABC {
/**
* Returns the OID when modType() returned Control.
*/
- const QString& oid() const { return mOid; }
+ const TQString& oid() const { return mOid; }
/**
* Returns the line number which the parser processes.
*/
@@ -165,14 +165,14 @@ namespace KABC {
private:
int mModType;
bool mDelOldRdn, mUrl;
- QString mDn,mAttr,mNewRdn,mNewSuperior, mOid;
- QByteArray mLdif, mVal;
+ TQString mDn,mAttr,mNewRdn,mNewSuperior, mOid;
+ TQByteArray mLdif, mVal;
EntryType mEntryType;
bool mIsNewLine, mIsComment,mCritical;
ParseVal mLastParseVal;
uint mPos,mLineNo;
- QCString line;
+ TQCString line;
class LDIFPrivate;
LDIFPrivate *d;
diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp
index 684f07bbd..6f875cffb 100644
--- a/kabc/ldifconverter.cpp
+++ b/kabc/ldifconverter.cpp
@@ -33,10 +33,10 @@
- physicaldeliveryofficename,
*/
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qregexp.h>
-#include <qtextstream.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqregexp.h>
+#include <tqtextstream.h>
#include <klocale.h>
#include <kdebug.h>
@@ -53,7 +53,7 @@ using namespace KABC;
/* generate LDIF stream */
-bool LDIFConverter::addresseeToLDIF( const AddresseeList &addrList, QString &str )
+bool LDIFConverter::addresseeToLDIF( const AddresseeList &addrList, TQString &str )
{
AddresseeList::ConstIterator it;
for ( it = addrList.begin(); it != addrList.end(); ++it ) {
@@ -64,29 +64,29 @@ bool LDIFConverter::addresseeToLDIF( const AddresseeList &addrList, QString &str
-static void ldif_out( QTextStream &t, QString formatStr, QString value )
+static void ldif_out( TQTextStream &t, TQString formatStr, TQString value )
{
if ( value.isEmpty() )
return;
- QCString txt = LDIF::assembleLine( formatStr, value, 72 );
+ TQCString txt = LDIF::assembleLine( formatStr, value, 72 );
// write the string
- t << QString::fromUtf8(txt) << "\n";
+ t << TQString::fromUtf8(txt) << "\n";
}
-bool LDIFConverter::addresseeToLDIF( const Addressee &addr, QString &str )
+bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
{
if ( addr.isEmpty() )
return false;
- QTextStream t( str, IO_WriteOnly|IO_Append );
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream t( str, IO_WriteOnly|IO_Append );
+ t.setEncoding( TQTextStream::UnicodeUTF8 );
const Address homeAddr = addr.address( Address::Home );
const Address workAddr = addr.address( Address::Work );
- ldif_out( t, "dn", QString( "cn=%1,mail=%2" )
+ ldif_out( t, "dn", TQString( "cn=%1,mail=%2" )
.arg( addr.formattedName().simplifyWhiteSpace() )
.arg( addr.preferredEmail() ) );
ldif_out( t, "givenname", addr.givenName() );
@@ -113,7 +113,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, QString &str )
ldif_out( t, "postalcode", workAddr.postalCode() );
ldif_out( t, "postofficebox", workAddr.postOfficeBox() );
- QStringList streets = QStringList::split( '\n', homeAddr.street() );
+ TQStringList streets = TQStringList::split( '\n', homeAddr.street() );
if ( streets.count() > 0 )
ldif_out( t, "homepostaladdress", streets[ 0 ] ); // Netscape 7
if ( streets.count() > 1 )
@@ -125,7 +125,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, QString &str )
ldif_out( t, "locality", workAddr.locality() );
ldif_out( t, "streetaddress", workAddr.street() ); // Netscape 4.x
- streets = QStringList::split( '\n', workAddr.street() );
+ streets = TQStringList::split( '\n', workAddr.street() );
if ( streets.count() > 0 )
ldif_out( t, "postaladdress", streets[ 0 ] );
if ( streets.count() > 1 )
@@ -166,7 +166,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, QString &str )
/* convert from LDIF stream */
-bool LDIFConverter::LDIFToAddressee( const QString &str, AddresseeList &addrList, QDateTime dt )
+bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt )
{
if (str.isEmpty())
return true;
@@ -176,14 +176,14 @@ bool LDIFConverter::LDIFToAddressee( const QString &str, AddresseeList &addrList
LDIF::ParseVal ret;
const char *latinstr = str.latin1();
int latinstrlen = qstrlen( latinstr );
- QByteArray data;
+ TQByteArray data;
Addressee a;
Address homeAddr, workAddr;
data.setRawData( latinstr, latinstrlen );
ldif.setLDIF( data );
if (!dt.isValid())
- dt = QDateTime::currentDateTime();
+ dt = TQDateTime::currentDateTime();
a.setRevision(dt);
homeAddr = Address( Address::Home );
workAddr = Address( Address::Work );
@@ -192,8 +192,8 @@ bool LDIFConverter::LDIFToAddressee( const QString &str, AddresseeList &addrList
ret = ldif.nextItem();
switch ( ret ) {
case LDIF::Item: {
- QString fieldname = ldif.attr().lower();
- QString value = QString::fromUtf8( ldif.val(), ldif.val().size() );
+ TQString fieldname = ldif.attr().lower();
+ TQString value = TQString::fromUtf8( ldif.val(), ldif.val().size() );
evaluatePair( a, homeAddr, workAddr, fieldname, value );
break;
}
@@ -233,9 +233,9 @@ bool LDIFConverter::LDIFToAddressee( const QString &str, AddresseeList &addrList
bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
Address &workAddr,
- QString &fieldname, QString &value )
+ TQString &fieldname, TQString &value )
{
- if ( fieldname == QString::fromLatin1( "dn" ) ) // ignore & return false!
+ if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false!
return false;
if ( fieldname.startsWith("#") ) {
@@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
return true;
}
- if ( fieldname == QString::fromLatin1( "givenname" ) ) {
+ if ( fieldname == TQString::fromLatin1( "givenname" ) ) {
a.setGivenName( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "xmozillanickname") ||
- fieldname == QString::fromLatin1( "nickname") ) {
+ if ( fieldname == TQString::fromLatin1( "xmozillanickname") ||
+ fieldname == TQString::fromLatin1( "nickname") ) {
a.setNickName( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "sn" ) ) {
+ if ( fieldname == TQString::fromLatin1( "sn" ) ) {
a.setFamilyName( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "uid" ) ) {
+ if ( fieldname == TQString::fromLatin1( "uid" ) ) {
a.setUid( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "mail" ) ||
- fieldname == QString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mail" ) ||
+ fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( a.emails().findIndex( value ) == -1 )
a.insertEmail( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "title" ) ) {
+ if ( fieldname == TQString::fromLatin1( "title" ) ) {
a.setTitle( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "vocation" ) ) {
+ if ( fieldname == TQString::fromLatin1( "vocation" ) ) {
a.setPrefix( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "cn" ) ) {
+ if ( fieldname == TQString::fromLatin1( "cn" ) ) {
a.setFormattedName( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "o" ) ||
- fieldname == QString::fromLatin1( "organization" ) || // Exchange
- fieldname == QString::fromLatin1( "organizationname" ) ) { // Exchange
+ if ( fieldname == TQString::fromLatin1( "o" ) ||
+ fieldname == TQString::fromLatin1( "organization" ) || // Exchange
+ fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange
a.setOrganization( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "description" ) ) {
+ if ( fieldname == TQString::fromLatin1( "description" ) ) {
addComment:
if ( !a.note().isEmpty() )
a.setNote( a.note() + "\n" );
@@ -306,15 +306,15 @@ addComment:
return true;
}
- if ( fieldname == QString::fromLatin1( "custom1" ) ||
- fieldname == QString::fromLatin1( "custom2" ) ||
- fieldname == QString::fromLatin1( "custom3" ) ||
- fieldname == QString::fromLatin1( "custom4" ) ) {
+ if ( fieldname == TQString::fromLatin1( "custom1" ) ||
+ fieldname == TQString::fromLatin1( "custom2" ) ||
+ fieldname == TQString::fromLatin1( "custom3" ) ||
+ fieldname == TQString::fromLatin1( "custom4" ) ) {
goto addComment;
}
- if ( fieldname == QString::fromLatin1( "homeurl" ) ||
- fieldname == QString::fromLatin1( "workurl" ) ) {
+ if ( fieldname == TQString::fromLatin1( "homeurl" ) ||
+ fieldname == TQString::fromLatin1( "workurl" ) ) {
if (a.url().isEmpty()) {
a.setUrl( KURL( value ) );
return true;
@@ -325,144 +325,144 @@ addComment:
// TODO: change this with KDE 4
}
- if ( fieldname == QString::fromLatin1( "homephone" ) ) {
+ if ( fieldname == TQString::fromLatin1( "homephone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) );
return true;
}
- if ( fieldname == QString::fromLatin1( "telephonenumber" ) ) {
+ if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}
- if ( fieldname == QString::fromLatin1( "mobile" ) ) { // mozilla/Netscape 7
+ if ( fieldname == TQString::fromLatin1( "mobile" ) ) { // mozilla/Netscape 7
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}
- if ( fieldname == QString::fromLatin1( "cellphone" ) ) {
+ if ( fieldname == TQString::fromLatin1( "cellphone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}
- if ( fieldname == QString::fromLatin1( "pager" ) || // mozilla
- fieldname == QString::fromLatin1( "pagerphone" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "pager" ) || // mozilla
+ fieldname == TQString::fromLatin1( "pagerphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) );
return true;
}
- if ( fieldname == QString::fromLatin1( "facsimiletelephonenumber" ) ) {
+ if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) );
return true;
}
- if ( fieldname == QString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}
- if ( fieldname == QString::fromLatin1( "street" ) ||
- fieldname == QString::fromLatin1( "streethomeaddress" ) ) {
+ if ( fieldname == TQString::fromLatin1( "street" ) ||
+ fieldname == TQString::fromLatin1( "streethomeaddress" ) ) {
homeAddr.setStreet( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "postaladdress" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) { // mozilla
workAddr.setStreet( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "mozillapostaladdress2" ) ) { // mozilla
- workAddr.setStreet( workAddr.street() + QString::fromLatin1( "\n" ) + value );
+ if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) { // mozilla
+ workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value );
return true;
}
- if ( fieldname == QString::fromLatin1( "postalcode" ) ) {
+ if ( fieldname == TQString::fromLatin1( "postalcode" ) ) {
workAddr.setPostalCode( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "postofficebox" ) ) {
+ if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) {
workAddr.setPostOfficeBox( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "homepostaladdress" ) ) { // Netscape 7
+ if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) { // Netscape 7
homeAddr.setStreet( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
- homeAddr.setStreet( homeAddr.street() + QString::fromLatin1( "\n" ) + value );
+ if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
+ homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value );
return true;
}
- if ( fieldname == QString::fromLatin1( "mozillahomelocalityname" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) { // mozilla
homeAddr.setLocality( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "mozillahomestate" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mozillahomestate" ) ) { // mozilla
homeAddr.setRegion( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "mozillahomepostalcode" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) { // mozilla
homeAddr.setPostalCode( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
homeAddr.setCountry( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "locality" ) ) {
+ if ( fieldname == TQString::fromLatin1( "locality" ) ) {
workAddr.setLocality( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x
+ if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x
workAddr.setStreet( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "countryname" ) ||
- fieldname == QString::fromLatin1( "c" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "countryname" ) ||
+ fieldname == TQString::fromLatin1( "c" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
workAddr.setCountry( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "l" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "l" ) ) { // mozilla
workAddr.setLocality( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "st" ) ) {
+ if ( fieldname == TQString::fromLatin1( "st" ) ) {
workAddr.setRegion( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "ou" ) ) {
+ if ( fieldname == TQString::fromLatin1( "ou" ) ) {
a.setRole( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "department" ) ) {
+ if ( fieldname == TQString::fromLatin1( "department" ) ) {
a.setDepartment( value );
return true;
}
- if ( fieldname == QString::fromLatin1( "member" ) ) {
+ if ( fieldname == TQString::fromLatin1( "member" ) ) {
// this is a mozilla list member (cn=xxx, mail=yyy)
- QStringList list( QStringList::split( ',', value ) );
- QString name, email;
+ TQStringList list( TQStringList::split( ',', value ) );
+ TQString name, email;
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
if ( (*it).startsWith( "cn=" ) )
name = (*it).mid( 3 ).stripWhiteSpace();
@@ -476,20 +476,20 @@ addComment:
return true;
}
- if ( fieldname == QString::fromLatin1( "modifytimestamp" ) ) {
- if (value == QString::fromLatin1("0Z")) // ignore
+ if ( fieldname == TQString::fromLatin1( "modifytimestamp" ) ) {
+ if (value == TQString::fromLatin1("0Z")) // ignore
return true;
- QDateTime dt = VCardStringToDate( value );
+ TQDateTime dt = VCardStringToDate( value );
if ( dt.isValid() ) {
a.setRevision(dt);
return true;
}
}
- if ( fieldname == QString::fromLatin1( "objectclass" ) ) // ignore
+ if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore
return true;
- kdWarning() << QString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
+ kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
.arg(a.formattedName()).arg(fieldname).arg(value);
return true;
@@ -499,33 +499,33 @@ addComment:
* in the LDIF class */
bool LDIFConverter::parseSingleLine( Addressee &a, Address &homeAddr,
- Address &workAddr, QString &line )
+ Address &workAddr, TQString &line )
{
if ( line.isEmpty() )
return true;
- QString fieldname, value;
- QByteArray val;
+ TQString fieldname, value;
+ TQByteArray val;
LDIF::splitLine( line.latin1(), fieldname, val );
- value = QString::fromUtf8( val.data(), val.size() );
+ value = TQString::fromUtf8( val.data(), val.size() );
return evaluatePair( a, homeAddr, workAddr, fieldname, value);
}
-bool LDIFConverter::splitLine( QString &line, QString &fieldname, QString &value)
+bool LDIFConverter::splitLine( TQString &line, TQString &fieldname, TQString &value)
{
- QByteArray val;
+ TQByteArray val;
bool ret = LDIF::splitLine( line.latin1(), fieldname, val );
- value = QString::fromUtf8( val.data(), val.size() );
+ value = TQString::fromUtf8( val.data(), val.size() );
return ret;
}
-QString LDIFConverter::makeLDIFfieldString( QString formatStr, QString value, bool allowEncode )
+TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value, bool allowEncode )
{
if ( value.isEmpty() )
- return QString();
+ return TQString();
// append format if not given
if (formatStr.find(':') == -1)
@@ -554,7 +554,7 @@ QString LDIFConverter::makeLDIFfieldString( QString formatStr, QString value, bo
}
// generate the new string and split it to 72 chars/line
- QCString txt = (formatStr.arg(value)).utf8();
+ TQCString txt = (formatStr.arg(value)).utf8();
if (allowEncode) {
len = txt.length();
@@ -568,6 +568,6 @@ QString LDIFConverter::makeLDIFfieldString( QString formatStr, QString value, bo
}
}
- return QString::fromUtf8(txt);
+ return TQString::fromUtf8(txt);
}
diff --git a/kabc/ldifconverter.h b/kabc/ldifconverter.h
index 299a42e11..a8052a65f 100644
--- a/kabc/ldifconverter.h
+++ b/kabc/ldifconverter.h
@@ -20,8 +20,8 @@
#ifndef KABC_LDIFCONVERTER_H
#define KABC_LDIFCONVERTER_H
-#include <qstring.h>
-#include <qdatetime.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
#include "addressee.h"
#include "addresseelist.h"
@@ -44,7 +44,7 @@ namespace KABC {
* @param dt The date & time value of the last modification (e.g. file modification time).
* @since 3.2
*/
- KABC_EXPORT bool LDIFToAddressee( const QString &str, AddresseeList &addrList, QDateTime dt = QDateTime::currentDateTime() );
+ KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::currentDateTime() );
/**
* Converts a list of addressees to a LDIF string.
@@ -53,7 +53,7 @@ namespace KABC {
* @param str The LDIF string.
* @since 3.2
*/
- KABC_EXPORT bool addresseeToLDIF( const AddresseeList &addrList, QString &str );
+ KABC_EXPORT bool addresseeToLDIF( const AddresseeList &addrList, TQString &str );
/**
* Converts an addressee to a LDIF string.
@@ -62,7 +62,7 @@ namespace KABC {
* @param str The LDIF string.
* @since 3.2
*/
- KABC_EXPORT bool addresseeToLDIF( const Addressee &addr, QString &str );
+ KABC_EXPORT bool addresseeToLDIF( const Addressee &addr, TQString &str );
/**
* @deprecated
@@ -76,7 +76,7 @@ namespace KABC {
* @param allowEncode Set to false if you wish no encoding of the value.
* @since 3.2
*/
- KABC_EXPORT QString makeLDIFfieldString( QString field, QString value, bool allowEncode = true ) KDE_DEPRECATED;
+ KABC_EXPORT TQString makeLDIFfieldString( TQString field, TQString value, bool allowEncode = true ) KDE_DEPRECATED;
@@ -84,14 +84,14 @@ namespace KABC {
/** No need for this function anymore - use LDIF::splitLine() + evaluatePair() */
KABC_EXPORT bool parseSingleLine( Addressee &a,
- Address &homeAddr, Address &workAddr, QString &line );
+ Address &homeAddr, Address &workAddr, TQString &line );
/** No need for this function anymore - use LDIF::splitLine() */
- KABC_EXPORT bool splitLine( QString &line, QString &fieldname, QString &value);
+ KABC_EXPORT bool splitLine( TQString &line, TQString &fieldname, TQString &value);
KABC_EXPORT bool evaluatePair( Addressee &a, Address &homeAddr, Address &workAddr,
- QString &fieldname, QString &value );
+ TQString &fieldname, TQString &value );
}
diff --git a/kabc/lock.cpp b/kabc/lock.cpp
index a3270459d..b5e0ea5a6 100644
--- a/kabc/lock.cpp
+++ b/kabc/lock.cpp
@@ -26,7 +26,7 @@
#include <kstandarddirs.h>
#include <ktempfile.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <signal.h>
#include <sys/types.h>
@@ -35,7 +35,7 @@
using namespace KABC;
-Lock::Lock( const QString &identifier )
+Lock::Lock( const TQString &identifier )
: mIdentifier( identifier )
{
mIdentifier.replace( "/", "_" );
@@ -46,34 +46,34 @@ Lock::~Lock()
unlock();
}
-QString Lock::locksDir()
+TQString Lock::locksDir()
{
return locateLocal( "data", "kabc/lock/" );
}
-bool Lock::readLockFile( const QString &filename, int &pid, QString &app )
+bool Lock::readLockFile( const TQString &filename, int &pid, TQString &app )
{
- QFile file( filename );
+ TQFile file( filename );
if ( !file.open( IO_ReadOnly ) ) return false;
- QTextStream t( &file );
+ TQTextStream t( &file );
pid = t.readLine().toInt();
app = t.readLine();
return true;
}
-bool Lock::writeLockFile( const QString &filename )
+bool Lock::writeLockFile( const TQString &filename )
{
- QFile file( filename );
+ TQFile file( filename );
if ( !file.open( IO_WriteOnly ) ) return false;
- QTextStream t( &file );
- t << ::getpid() << endl << QString( KGlobal::instance()->instanceName() );
+ TQTextStream t( &file );
+ t << ::getpid() << endl << TQString( KGlobal::instance()->instanceName() );
return true;
}
-QString Lock::lockFileName() const
+TQString Lock::lockFileName() const
{
return locksDir() + mIdentifier + ".lock";
}
@@ -82,12 +82,12 @@ bool Lock::lock()
{
kdDebug(5700) << "Lock::lock()" << endl;
- QString lockName = lockFileName();
+ TQString lockName = lockFileName();
kdDebug(5700) << "-- lock name: " << lockName << endl;
- if ( QFile::exists( lockName ) ) { // check if it is a stale lock file
+ if ( TQFile::exists( lockName ) ) { // check if it is a stale lock file
int pid;
- QString app;
+ TQString app;
if ( !readLockFile( lockFileName(), pid, app ) ) {
mError = i18n("Unable to open lock file.");
@@ -96,11 +96,11 @@ bool Lock::lock()
int retval = ::kill( pid, 0 );
if ( retval == -1 && errno == ESRCH ) { // process doesn't exists anymore
- QFile::remove( lockName );
+ TQFile::remove( lockName );
kdWarning(5700) << "Removed stale lock file from process '" << app << "'"
<< endl;
} else {
- QString identifier( mIdentifier );
+ TQString identifier( mIdentifier );
identifier.replace( '_', '/' );
mError = i18n("The address book '%1' is locked by application '%2'.\nIf you believe this is incorrect, just remove the lock file from '%3'")
@@ -109,7 +109,7 @@ bool Lock::lock()
}
}
- QString lockUniqueName;
+ TQString lockUniqueName;
lockUniqueName = mIdentifier + kapp->randomString( 8 );
mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
@@ -118,8 +118,8 @@ bool Lock::lock()
writeLockFile( mLockUniqueName );
// Create lock file
- int result = ::link( QFile::encodeName( mLockUniqueName ),
- QFile::encodeName( lockName ) );
+ int result = ::link( TQFile::encodeName( mLockUniqueName ),
+ TQFile::encodeName( lockName ) );
if ( result == 0 ) {
mError = "";
@@ -136,15 +136,15 @@ bool Lock::lock()
bool Lock::unlock()
{
int pid;
- QString app;
+ TQString app;
if ( readLockFile( lockFileName(), pid, app ) ) {
if ( pid == getpid() ) {
- QFile::remove( lockFileName() );
- QFile::remove( mLockUniqueName );
+ TQFile::remove( lockFileName() );
+ TQFile::remove( mLockUniqueName );
emit unlocked();
} else {
mError = i18n("Unlock failed. Lock file is owned by other process: %1 (%2)")
- .arg( app ).arg( QString::number( pid ) );
+ .arg( app ).arg( TQString::number( pid ) );
kdDebug() << "Lock::unlock(): " << mError << endl;
return false;
}
@@ -154,7 +154,7 @@ bool Lock::unlock()
return true;
}
-QString Lock::error() const
+TQString Lock::error() const
{
return mError;
}
diff --git a/kabc/lock.h b/kabc/lock.h
index 1707d0f13..95f5c87a3 100644
--- a/kabc/lock.h
+++ b/kabc/lock.h
@@ -21,8 +21,8 @@
#ifndef KABC_LOCK_H
#define KABC_LOCK_H
-#include <qstring.h>
-#include <qobject.h>
+#include <tqstring.h>
+#include <tqobject.h>
#include <kdelibs_export.h>
@@ -42,7 +42,7 @@ class KABC_EXPORT Lock : public QObject
@param identifier An identifier for the resource to be locked, e.g. a file
name.
*/
- Lock( const QString &identifier );
+ Lock( const TQString &identifier );
/**
Destruct lock object. This also removes the lock on the resource.
@@ -59,25 +59,25 @@ class KABC_EXPORT Lock : public QObject
*/
virtual bool unlock();
- virtual QString error() const;
+ virtual TQString error() const;
- QString lockFileName() const;
+ TQString lockFileName() const;
- static bool readLockFile( const QString &filename, int &pid, QString &app );
- static bool writeLockFile( const QString &filename );
+ static bool readLockFile( const TQString &filename, int &pid, TQString &app );
+ static bool writeLockFile( const TQString &filename );
- static QString locksDir();
+ static TQString locksDir();
signals:
void locked();
void unlocked();
private:
- QString mIdentifier;
+ TQString mIdentifier;
- QString mLockUniqueName;
+ TQString mLockUniqueName;
- QString mError;
+ TQString mError;
class Private;
Private *d;
diff --git a/kabc/locknull.cpp b/kabc/locknull.cpp
index 1df269a24..234c2c214 100644
--- a/kabc/locknull.cpp
+++ b/kabc/locknull.cpp
@@ -27,7 +27,7 @@
using namespace KABC;
LockNull::LockNull( bool allowAccess )
- : Lock( QString::null ), mAllowAccess( allowAccess )
+ : Lock( TQString::null ), mAllowAccess( allowAccess )
{
}
@@ -54,7 +54,7 @@ bool LockNull::unlock()
return true;
}
-QString LockNull::error() const
+TQString LockNull::error() const
{
if ( mAllowAccess )
return i18n("LockNull: All locks succeed but no actual locking is done.");
diff --git a/kabc/locknull.h b/kabc/locknull.h
index 11b8c4fd5..dfefe122a 100644
--- a/kabc/locknull.h
+++ b/kabc/locknull.h
@@ -21,7 +21,7 @@
#ifndef KABC_LOCKNULL_H
#define KABC_LOCKNULL_H
-#include <qstring.h>
+#include <tqstring.h>
#include "lock.h"
@@ -40,7 +40,7 @@ class KABC_EXPORT LockNull : public Lock
bool lock();
bool unlock();
- QString error() const;
+ TQString error() const;
private:
bool mAllowAccess;
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 31fba4a9e..31a99f9ea 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -31,7 +31,7 @@ PhoneNumber::PhoneNumber() :
init();
}
-PhoneNumber::PhoneNumber( const QString &number, int type ) :
+PhoneNumber::PhoneNumber( const TQString &number, int type ) :
mType( type )
{
init();
@@ -48,7 +48,7 @@ void PhoneNumber::init()
mId = KApplication::randomString( 8 );
}
-void PhoneNumber::validateNumber( const QString &number )
+void PhoneNumber::validateNumber( const TQString &number )
{
mNumber = number;
@@ -70,22 +70,22 @@ bool PhoneNumber::operator!=( const PhoneNumber &p ) const
return !( p == *this );
}
-void PhoneNumber::setId( const QString &id )
+void PhoneNumber::setId( const TQString &id )
{
mId = id;
}
-QString PhoneNumber::id() const
+TQString PhoneNumber::id() const
{
return mId;
}
-void PhoneNumber::setNumber( const QString &number )
+void PhoneNumber::setNumber( const TQString &number )
{
validateNumber( number );
}
-QString PhoneNumber::number() const
+TQString PhoneNumber::number() const
{
return mNumber;
}
@@ -100,9 +100,9 @@ int PhoneNumber::type() const
return mType;
}
-QString PhoneNumber::typeLabel() const
+TQString PhoneNumber::typeLabel() const
{
- QString label;
+ TQString label;
bool first = true;
const TypeList list = typeList();
@@ -119,7 +119,7 @@ QString PhoneNumber::typeLabel() const
return label;
}
-QString PhoneNumber::label() const
+TQString PhoneNumber::label() const
{
return typeLabel( type() );
}
@@ -136,12 +136,12 @@ PhoneNumber::TypeList PhoneNumber::typeList()
return list;
}
-QString PhoneNumber::label( int type )
+TQString PhoneNumber::label( int type )
{
return typeLabel( type );
}
-QString PhoneNumber::typeLabel( int type )
+TQString PhoneNumber::typeLabel( int type )
{
if ( type & Pref )
return i18n( "Preferred phone", "Preferred" );
@@ -200,12 +200,12 @@ QString PhoneNumber::typeLabel( int type )
}
}
-QDataStream &KABC::operator<<( QDataStream &s, const PhoneNumber &phone )
+TQDataStream &KABC::operator<<( TQDataStream &s, const PhoneNumber &phone )
{
return s << phone.mId << phone.mType << phone.mNumber;
}
-QDataStream &KABC::operator>>( QDataStream &s, PhoneNumber &phone )
+TQDataStream &KABC::operator>>( TQDataStream &s, PhoneNumber &phone )
{
s >> phone.mId >> phone.mType >> phone.mNumber;
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index 099cd2261..71c9a692d 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -21,8 +21,8 @@
#ifndef KABC_PHONENUMBER_H
#define KABC_PHONENUMBER_H
-#include <qvaluelist.h>
-#include <qstring.h>
+#include <tqvaluelist.h>
+#include <tqstring.h>
#include <kdelibs_export.h>
@@ -37,12 +37,12 @@ namespace KABC {
*/
class KABC_EXPORT PhoneNumber
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const PhoneNumber & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, PhoneNumber & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const PhoneNumber & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, PhoneNumber & );
public:
- typedef QValueList<PhoneNumber> List;
- typedef QValueList<int> TypeList;
+ typedef TQValueList<PhoneNumber> List;
+ typedef TQValueList<int> TypeList;
/**
@li @p Home - Home number
@@ -76,7 +76,7 @@ class KABC_EXPORT PhoneNumber
@param type Type as defined in enum. Multiple types can be
specified by combining them by a logical or.
*/
- PhoneNumber( const QString &number, int type = Home );
+ PhoneNumber( const TQString &number, int type = Home );
/**
Destructor.
@@ -89,22 +89,22 @@ class KABC_EXPORT PhoneNumber
/**
Sets the unique identifier.
*/
- void setId( const QString &id );
+ void setId( const TQString &id );
/**
Returns the unique identifier.
*/
- QString id() const;
+ TQString id() const;
/**
Sets the number.
*/
- void setNumber( const QString & );
+ void setNumber( const TQString & );
/**
Returns the number.
*/
- QString number() const;
+ TQString number() const;
/**
Sets the type. Multiple types can be specified by combining them by
@@ -120,12 +120,12 @@ class KABC_EXPORT PhoneNumber
/**
Returns a translated string of all types the address has.
*/
- QString typeLabel() const;
+ TQString typeLabel() const;
/**
Returns the translated label for phone number depending on its type.
*/
- QString label() const;
+ TQString label() const;
/**
Returns a list of all available types
@@ -135,26 +135,26 @@ class KABC_EXPORT PhoneNumber
/**
Returns the translated label for phone number type.
*/
- static QString typeLabel( int type );
+ static TQString typeLabel( int type );
/**
Returns the translated label for phone number type.
@obsolete
*/
- static QString label( int type );
+ static TQString label( int type );
private:
void init();
- void validateNumber( const QString& );
+ void validateNumber( const TQString& );
- QString mId;
+ TQString mId;
int mType;
- QString mNumber;
+ TQString mNumber;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const PhoneNumber & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, PhoneNumber & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const PhoneNumber & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, PhoneNumber & );
}
diff --git a/kabc/picture.cpp b/kabc/picture.cpp
index d0b79c89a..4ddd3f537 100644
--- a/kabc/picture.cpp
+++ b/kabc/picture.cpp
@@ -27,12 +27,12 @@ Picture::Picture()
{
}
-Picture::Picture( const QString &url )
+Picture::Picture( const TQString &url )
: mUrl( url ), mIntern( false )
{
}
-Picture::Picture( const QImage &data )
+Picture::Picture( const TQImage &data )
: mData( data ), mIntern( true )
{
}
@@ -61,19 +61,19 @@ bool Picture::operator!=( const Picture &p ) const
return !( p == *this );
}
-void Picture::setUrl( const QString &url )
+void Picture::setUrl( const TQString &url )
{
mUrl = url;
mIntern = false;
}
-void Picture::setData( const QImage &data )
+void Picture::setData( const TQImage &data )
{
mData = data;
mIntern = true;
}
-void Picture::setType( const QString &type )
+void Picture::setType( const TQString &type )
{
mType = type;
}
@@ -83,22 +83,22 @@ bool Picture::isIntern() const
return mIntern;
}
-QString Picture::url() const
+TQString Picture::url() const
{
return mUrl;
}
-QImage Picture::data() const
+TQImage Picture::data() const
{
return mData;
}
-QString Picture::type() const
+TQString Picture::type() const
{
return mType;
}
-QString Picture::asString() const
+TQString Picture::asString() const
{
if ( mIntern )
return "intern picture";
@@ -106,13 +106,13 @@ QString Picture::asString() const
return mUrl;
}
-QDataStream &KABC::operator<<( QDataStream &s, const Picture &picture )
+TQDataStream &KABC::operator<<( TQDataStream &s, const Picture &picture )
{
return s << picture.mIntern << picture.mUrl << picture.mType;
// return s << picture.mIntern << picture.mUrl << picture.mType << picture.mData;
}
-QDataStream &KABC::operator>>( QDataStream &s, Picture &picture )
+TQDataStream &KABC::operator>>( TQDataStream &s, Picture &picture )
{
s >> picture.mIntern >> picture.mUrl >> picture.mType;
// s >> picture.mIntern >> picture.mUrl >> picture.mType >> picture.mData;
diff --git a/kabc/picture.h b/kabc/picture.h
index a28f3ae14..ce619d912 100644
--- a/kabc/picture.h
+++ b/kabc/picture.h
@@ -21,7 +21,7 @@
#ifndef KABC_PICTURE_H
#define KABC_PICTURE_H
-#include <qimage.h>
+#include <tqimage.h>
#include <kdelibs_export.h>
@@ -29,8 +29,8 @@ namespace KABC {
class KABC_EXPORT Picture
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Picture & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Picture & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Picture & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Picture & );
public:
@@ -44,14 +44,14 @@ public:
*
* @param url A URL that describes the position of the picture file.
*/
- Picture( const QString &url );
+ Picture( const TQString &url );
/**
* Consturctor.
*
* @param data The raw data of the picture.
*/
- Picture( const QImage &data );
+ Picture( const TQImage &data );
/**
* Destructor.
@@ -69,7 +69,7 @@ public:
*
* @param url The location URL of the picture file.
*/
- void setUrl( const QString &url );
+ void setUrl( const TQString &url );
/**
* Sets the raw data of the picture. When using this function,
@@ -77,12 +77,12 @@ public:
*
* @param data The raw data of the picture.
*/
- void setData( const QImage &data );
+ void setData( const TQImage &data );
/**
* Sets the type of the picture.
*/
- void setType( const QString &type );
+ void setType( const TQString &type );
/**
* Returns whether the picture is described by a URL (extern) or
@@ -96,33 +96,33 @@ public:
/**
* Returns the location URL of this picture.
*/
- QString url() const;
+ TQString url() const;
/**
* Returns the raw data of this picture.
*/
- QImage data() const;
+ TQImage data() const;
/**
* Returns the type of this picture.
*/
- QString type() const;
+ TQString type() const;
/**
* Returns string representation of the picture.
*/
- QString asString() const;
+ TQString asString() const;
private:
- QString mUrl;
- QString mType;
- QImage mData;
+ TQString mUrl;
+ TQString mType;
+ TQImage mData;
int mIntern;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const Picture & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, Picture & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Picture & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Picture & );
}
#endif
diff --git a/kabc/plugin.cpp b/kabc/plugin.cpp
index a00e0187f..a53192559 100644
--- a/kabc/plugin.cpp
+++ b/kabc/plugin.cpp
@@ -30,32 +30,32 @@ Plugin::~Plugin()
{
}
-void Plugin::setType( const QString& type )
+void Plugin::setType( const TQString& type )
{
mType = type;
}
-QString Plugin::type() const
+TQString Plugin::type() const
{
return mType;
}
-void Plugin::setNameLabel( const QString& label )
+void Plugin::setNameLabel( const TQString& label )
{
mNameLabel = label;
}
-QString Plugin::nameLabel() const
+TQString Plugin::nameLabel() const
{
return mNameLabel;
}
-void Plugin::setDescriptionLabel( const QString& label )
+void Plugin::setDescriptionLabel( const TQString& label )
{
mDescriptionLabel = label;
}
-QString Plugin::descriptionLabel() const
+TQString Plugin::descriptionLabel() const
{
return mDescriptionLabel;
}
diff --git a/kabc/plugin.h b/kabc/plugin.h
index a25b647de..17fbdd13f 100644
--- a/kabc/plugin.h
+++ b/kabc/plugin.h
@@ -21,7 +21,7 @@
#ifndef KABC_PLUGIN_H
#define KABC_PLUGIN_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdelibs_export.h>
@@ -33,19 +33,19 @@ public:
Plugin();
virtual ~Plugin();
- virtual void setType( const QString& type );
- virtual QString type() const;
+ virtual void setType( const TQString& type );
+ virtual TQString type() const;
- virtual void setNameLabel( const QString& label );
- virtual QString nameLabel() const;
+ virtual void setNameLabel( const TQString& label );
+ virtual TQString nameLabel() const;
- virtual void setDescriptionLabel( const QString& label );
- virtual QString descriptionLabel() const;
+ virtual void setDescriptionLabel( const TQString& label );
+ virtual TQString descriptionLabel() const;
private:
- QString mType;
- QString mNameLabel;
- QString mDescriptionLabel;
+ TQString mType;
+ TQString mNameLabel;
+ TQString mDescriptionLabel;
};
}
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 1947e98f3..0897c9cee 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -24,9 +24,9 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <qregexp.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
+#include <tqwidget.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -67,13 +67,13 @@ ResourceDir::ResourceDir( const KConfig *config )
}
}
-ResourceDir::ResourceDir( const QString &path, const QString &format )
+ResourceDir::ResourceDir( const TQString &path, const TQString &format )
: Resource( 0 ), mAsynchronous( false )
{
init( path, format );
}
-void ResourceDir::init( const QString &path, const QString &format )
+void ResourceDir::init( const TQString &path, const TQString &format )
{
mFormatName = format;
@@ -87,9 +87,9 @@ void ResourceDir::init( const QString &path, const QString &format )
mLock = 0;
- connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
- connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
- connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
+ connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( pathChanged() ) );
+ connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( pathChanged() ) );
+ connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( pathChanged() ) );
setPath( path );
}
@@ -143,15 +143,15 @@ void ResourceDir::releaseSaveTicket( Ticket *ticket )
bool ResourceDir::doOpen()
{
- QDir dir( mPath );
+ TQDir dir( mPath );
if ( !dir.exists() ) { // no directory available
return dir.mkdir( dir.path() );
} else {
- QString testName = dir.entryList( QDir::Files )[0];
+ TQString testName = dir.entryList( TQDir::Files )[0];
if ( testName.isNull() || testName.isEmpty() ) // no file in directory
return true;
- QFile file( mPath + "/" + testName );
+ TQFile file( mPath + "/" + testName );
if ( file.open( IO_ReadOnly ) )
return true;
@@ -174,13 +174,13 @@ bool ResourceDir::load()
mAsynchronous = false;
- QDir dir( mPath );
- QStringList files = dir.entryList( QDir::Files );
+ TQDir dir( mPath );
+ TQStringList files = dir.entryList( TQDir::Files );
- QStringList::Iterator it;
+ TQStringList::Iterator it;
bool ok = true;
for ( it = files.begin(); it != files.end(); ++it ) {
- QFile file( mPath + "/" + (*it) );
+ TQFile file( mPath + "/" + (*it) );
if ( !file.open( IO_ReadOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
@@ -224,7 +224,7 @@ bool ResourceDir::save( Ticket * )
if ( !it.data().changed() )
continue;
- QFile file( mPath + "/" + (*it).uid() );
+ TQFile file( mPath + "/" + (*it).uid() );
if ( !file.open( IO_WriteOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
continue;
@@ -255,7 +255,7 @@ bool ResourceDir::asyncSave( Ticket *ticket )
return ok;
}
-void ResourceDir::setPath( const QString &path )
+void ResourceDir::setPath( const TQString &path )
{
mDirWatch.stopScan();
if ( mDirWatch.contains( mPath ) )
@@ -266,12 +266,12 @@ void ResourceDir::setPath( const QString &path )
mDirWatch.startScan();
}
-QString ResourceDir::path() const
+TQString ResourceDir::path() const
{
return mPath;
}
-void ResourceDir::setFormat( const QString &format )
+void ResourceDir::setFormat( const TQString &format )
{
mFormatName = format;
@@ -282,7 +282,7 @@ void ResourceDir::setFormat( const QString &format )
mFormat = factory->format( mFormatName );
}
-QString ResourceDir::format() const
+TQString ResourceDir::format() const
{
return mFormatName;
}
@@ -303,7 +303,7 @@ void ResourceDir::pathChanged()
void ResourceDir::removeAddressee( const Addressee& addr )
{
- QFile::remove( mPath + "/" + addr.uid() );
+ TQFile::remove( mPath + "/" + addr.uid() );
mAddrMap.erase( addr.uid() );
}
diff --git a/kabc/plugins/dir/resourcedir.h b/kabc/plugins/dir/resourcedir.h
index b54f0ddda..125882a84 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/kabc/plugins/dir/resourcedir.h
@@ -44,7 +44,7 @@ class KABC_EXPORT ResourceDir : public Resource
public:
ResourceDir( const KConfig* );
- ResourceDir( const QString &path, const QString &type = "vcard" );
+ ResourceDir( const TQString &path, const TQString &type = "vcard" );
~ResourceDir();
virtual void writeConfig( KConfig* );
@@ -63,22 +63,22 @@ class KABC_EXPORT ResourceDir : public Resource
/**
Set path to be used for saving.
*/
- void setPath( const QString & );
+ void setPath( const TQString & );
/**
Return path used for loading and saving the address book.
*/
- QString path() const;
+ TQString path() const;
/**
Set the format by name.
*/
- void setFormat( const QString &format );
+ void setFormat( const TQString &format );
/**
Returns the format name.
*/
- QString format() const;
+ TQString format() const;
/**
Remove a addressee from its source.
@@ -90,15 +90,15 @@ class KABC_EXPORT ResourceDir : public Resource
void pathChanged();
protected:
- void init( const QString &path, const QString &format );
+ void init( const TQString &path, const TQString &format );
private:
FormatPlugin *mFormat;
KDirWatch mDirWatch;
- QString mPath;
- QString mFormatName;
+ TQString mPath;
+ TQString mFormatName;
Lock *mLock;
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
index ada7c1f9d..819d75d96 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
@@ -34,19 +34,19 @@
using namespace KABC;
-ResourceDirConfig::ResourceDirConfig( QWidget* parent, const char* name )
+ResourceDirConfig::ResourceDirConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0,
+ TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2, 0,
KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "Format:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Format:" ), this );
mFormatBox = new KComboBox( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mFormatBox, 0, 1 );
- label = new QLabel( i18n( "Location:" ), this );
+ label = new TQLabel( i18n( "Location:" ), this );
mFileNameEdit = new KURLRequester( this );
mFileNameEdit->setMode( KFile::Directory );
@@ -54,8 +54,8 @@ ResourceDirConfig::ResourceDirConfig( QWidget* parent, const char* name )
mainLayout->addWidget( mFileNameEdit, 1, 1 );
FormatFactory *factory = FormatFactory::self();
- QStringList formats = factory->formats();
- QStringList::Iterator it;
+ TQStringList formats = factory->formats();
+ TQStringList::Iterator it;
for ( it = formats.begin(); it != formats.end(); ++it ) {
FormatInfo *info = factory->info( *it );
if ( info ) {
diff --git a/kabc/plugins/dir/resourcedirconfig.h b/kabc/plugins/dir/resourcedirconfig.h
index 46d446b36..4333fdae1 100644
--- a/kabc/plugins/dir/resourcedirconfig.h
+++ b/kabc/plugins/dir/resourcedirconfig.h
@@ -33,7 +33,7 @@ class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceDirConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceDirConfig( TQWidget* parent = 0, const char* name = 0 );
void setEditMode( bool value );
@@ -45,7 +45,7 @@ private:
KComboBox* mFormatBox;
KURLRequester* mFileNameEdit;
- QStringList mFormatTypes;
+ TQStringList mFormatTypes;
bool mInEditMode;
};
diff --git a/kabc/plugins/evolution/dbwrapper.cpp b/kabc/plugins/evolution/dbwrapper.cpp
index cc566344c..bcc641191 100644
--- a/kabc/plugins/evolution/dbwrapper.cpp
+++ b/kabc/plugins/evolution/dbwrapper.cpp
@@ -1,6 +1,6 @@
#include <db.h>
-#include <qfile.h>
+#include <tqfile.h>
#include "dbwrapper.h"
@@ -9,8 +9,8 @@ using namespace Evolution;
struct DBIterator::Data {
DBWrapper *wrapper;
- QString key;
- QString data;
+ TQString key;
+ TQString data;
DBC* cursor;
bool atEnd;
};
@@ -55,13 +55,13 @@ DBIterator& DBIterator::operator=( const DBIterator& rhs ) {
return *this;
}
-QString DBIterator::key()const{
+TQString DBIterator::key()const{
return data->key;
}
-QString DBIterator::value()const {
+TQString DBIterator::value()const {
return data->data;
}
-QString DBIterator::operator*() {
+TQString DBIterator::operator*() {
return data->data;
}
DBIterator& DBIterator::operator++() {
@@ -71,8 +71,8 @@ DBIterator& DBIterator::operator++() {
if ( data->cursor )
if ( data->cursor->c_get(data->cursor, &key, &val,DB_NEXT ) != 0 )
data->atEnd = true;
- data->key = QString::fromUtf8( (char*)key.data, key.size );
- data->data = QString::fromUtf8( (char*)val.data, val.size );
+ data->key = TQString::fromUtf8( (char*)key.data, key.size );
+ data->data = TQString::fromUtf8( (char*)val.data, val.size );
return *this;
}
DBIterator& DBIterator::operator--() {
@@ -82,8 +82,8 @@ DBIterator& DBIterator::operator--() {
if ( data->cursor )
if ( data->cursor->c_get(data->cursor, &key, &val,DB_PREV ) != 0 )
data->atEnd = true;
- data->key = QString::fromUtf8( (char*)key.data, key.size );
- data->data = QString::fromUtf8( (char*)val.data, val.size );
+ data->key = TQString::fromUtf8( (char*)key.data, key.size );
+ data->data = TQString::fromUtf8( (char*)val.data, val.size );
return *this;
}
bool DBIterator::operator==( const DBIterator& rhs ) {
@@ -107,9 +107,9 @@ DBWrapper::~DBWrapper() {
data->db->close(data->db, 0 );
delete data;
}
-bool DBWrapper::open( const QString& file, bool on) {
+bool DBWrapper::open( const TQString& file, bool on) {
data->only = on;
- return !data->db->open(data->db, QFile::encodeName( file ), NULL, DB_HASH, 0, 0666 );
+ return !data->db->open(data->db, TQFile::encodeName( file ), NULL, DB_HASH, 0, 0666 );
}
bool DBWrapper::save() {
return true;
@@ -134,8 +134,8 @@ DBIterator DBWrapper::begin() {
}
it.data->cursor = cursor;
- it.data->key = QString::fromUtf8((char*)key.data, key.size );
- it.data->data = QString::fromUtf8((char*)val.data, val.size );
+ it.data->key = TQString::fromUtf8((char*)key.data, key.size );
+ it.data->data = TQString::fromUtf8((char*)val.data, val.size );
return it;
}
@@ -145,26 +145,26 @@ DBIterator DBWrapper::end() {
return it;
}
-bool DBWrapper::find( const QString& _key, QString& _val ) {
+bool DBWrapper::find( const TQString& _key, TQString& _val ) {
DBT key, val;
::memset(&key, 0, sizeof(key) );
::memset(&val, 0, sizeof(val) );
- QCString db_key = _key.local8Bit();
+ TQCString db_key = _key.local8Bit();
key.data = db_key.data();
key.size = db_key.size();
int ret = data->db->get(data->db, NULL, &key, &val, 0 );
if (!ret) {
- _val = QString::fromUtf8( (char*)val.data, val.size );
+ _val = TQString::fromUtf8( (char*)val.data, val.size );
qWarning("key: %s val: %sXXX", (char*)key.data, (char*)val.data );
return true;
}
return false;
}
-bool DBWrapper::add( const QString& _key, const QString& _val ) {
- QCString db_key = _key.local8Bit();
- QCString db_val = _val.local8Bit();
+bool DBWrapper::add( const TQString& _key, const TQString& _val ) {
+ TQCString db_key = _key.local8Bit();
+ TQCString db_val = _val.local8Bit();
DBT key, val;
::memset(&key, 0, sizeof(key) );
::memset(&val, 0, sizeof(val) );
@@ -176,8 +176,8 @@ bool DBWrapper::add( const QString& _key, const QString& _val ) {
return !data->db->put(data->db, NULL, &key, &val, 0 );
}
-bool DBWrapper::remove( const QString& _key ) {
- QCString db_key = _key.local8Bit();
+bool DBWrapper::remove( const TQString& _key ) {
+ TQCString db_key = _key.local8Bit();
DBT key;
memset(&key, 0, sizeof(key) );
key.data = db_key.data();
diff --git a/kabc/plugins/evolution/dbwrapper.h b/kabc/plugins/evolution/dbwrapper.h
index 484605acf..e5e0a2c33 100644
--- a/kabc/plugins/evolution/dbwrapper.h
+++ b/kabc/plugins/evolution/dbwrapper.h
@@ -3,8 +3,8 @@
#include <db.h>
-#include <qstring.h>
-#include <qpair.h>
+#include <tqstring.h>
+#include <tqpair.h>
namespace Evolution {
@@ -18,10 +18,10 @@ namespace Evolution {
DBIterator( const DBIterator& );
DBIterator &operator=( const DBIterator& );
- QString key()const;
- QString value()const;
+ TQString key()const;
+ TQString value()const;
- QString operator*();
+ TQString operator*();
DBIterator &operator++();
DBIterator &operator--();
@@ -37,18 +37,18 @@ namespace Evolution {
DBWrapper();
~DBWrapper();
- QString lastError()const;
+ TQString lastError()const;
- bool open( const QString& file, bool readOnly = false);
+ bool open( const TQString& file, bool readOnly = false);
bool save();
DBIterator begin();
DBIterator end();
- bool find( const QString& key, QString& value );
- bool add( const QString& key, const QString& val );
- bool remove( const QString& key );
+ bool find( const TQString& key, TQString& value );
+ bool add( const TQString& key, const TQString& val );
+ bool remove( const TQString& key );
private:
- // DBT element( const QString& );
+ // DBT element( const TQString& );
struct Data;
Data* data;
diff --git a/kabc/plugins/evolution/resourceevo.cpp b/kabc/plugins/evolution/resourceevo.cpp
index a1858bf83..a93d7d2a1 100644
--- a/kabc/plugins/evolution/resourceevo.cpp
+++ b/kabc/plugins/evolution/resourceevo.cpp
@@ -1,4 +1,4 @@
-#include <qdir.h>
+#include <tqdir.h>
#include <kglobal.h>
#include <klocale.h>
@@ -22,7 +22,7 @@ class EvolutionFactory : public KRES::PluginFactoryBase
return new ResourceEvolution( config );
}
- KRES::ConfigWidget *configWidget( QWidget * )
+ KRES::ConfigWidget *configWidget( TQWidget * )
{
return 0;
}
@@ -46,11 +46,11 @@ ResourceEvolution::~ResourceEvolution() {
}
bool ResourceEvolution::doOpen() {
mWrap = new DBWrapper;
- if (!mWrap->open( QDir::homeDirPath() + "/evolution/local/Contacts/addressbook.db" ) ) {
+ if (!mWrap->open( TQDir::homeDirPath() + "/evolution/local/Contacts/addressbook.db" ) ) {
return false;
}
- QString val;
+ TQString val;
if (!mWrap->find( "PAS-DB-VERSION", val ) )
return false;
@@ -88,7 +88,7 @@ bool ResourceEvolution::load() {
qWarning( "val:%s", it.value().latin1() );
VCardTool tool;
- QString str = it.value().stripWhiteSpace();
+ TQString str = it.value().stripWhiteSpace();
Addressee::List list = tool.parseVCards( str );
if (!list.first().isEmpty() ) {
Addressee adr = list.first();
@@ -104,7 +104,7 @@ bool ResourceEvolution::save( Ticket* ticket ) {
// just delete the summary so evolution will regenerate it
// on next start up
- (void)QFile::remove( QDir::homeDirPath() + "/evolution/local/Contacts/addressbook.db.summary" );
+ (void)TQFile::remove( TQDir::homeDirPath() + "/evolution/local/Contacts/addressbook.db.summary" );
AddressBook::Iterator it;
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 9c0f85fb8..b391dffa5 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -25,9 +25,9 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qtimer.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqtimer.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -50,7 +50,7 @@ ResourceFile::ResourceFile( const KConfig *config )
: Resource( config ), mFormat( 0 ),
mAsynchronous( false )
{
- QString fileName, formatName;
+ TQString fileName, formatName;
if ( config ) {
fileName = config->readPathEntry( "FileName", StdAddressBook::fileName() );
@@ -63,15 +63,15 @@ ResourceFile::ResourceFile( const KConfig *config )
init( fileName, formatName );
}
-ResourceFile::ResourceFile( const QString &fileName,
- const QString &formatName )
+ResourceFile::ResourceFile( const TQString &fileName,
+ const TQString &formatName )
: Resource( 0 ), mFormat( 0 ),
mAsynchronous( false )
{
init( fileName, formatName );
}
-void ResourceFile::init( const QString &fileName, const QString &formatName )
+void ResourceFile::init( const TQString &fileName, const TQString &formatName )
{
mFormatName = formatName;
@@ -83,9 +83,9 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
mFormat = factory->format( mFormatName );
}
- connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
- connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
- connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
+ connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( fileChanged() ) );
+ connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( fileChanged() ) );
+ connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( fileChanged() ) );
setFileName( fileName );
@@ -143,7 +143,7 @@ void ResourceFile::releaseSaveTicket( Ticket *ticket )
bool ResourceFile::doOpen()
{
- QFile file( mFileName );
+ TQFile file( mFileName );
if ( !file.exists() ) {
// try to create the file
@@ -153,7 +153,7 @@ bool ResourceFile::doOpen()
return ok;
} else {
- QFileInfo fileInfo( mFileName );
+ TQFileInfo fileInfo( mFileName );
if ( readOnly() || !fileInfo.isWritable() ) {
if ( !file.open( IO_ReadOnly ) )
return false;
@@ -167,22 +167,22 @@ bool ResourceFile::doOpen()
kdDebug() << "File size is zero. Evaluating backups" << endl;
for (int i=0; i!=20; i++)
{
- QFile backup( mFileName + "__" + QString::number(i) );
+ TQFile backup( mFileName + "__" + TQString::number(i) );
kdDebug() << "Evaluating" << backup.name() << " size: " << backup.size() << endl;
if ( backup.size() != 0 )
{
kdDebug() << "Restoring backup " << i << endl;
- const QString src = mFileName + "__" + QString::number(i);
- const QString dest = mFileName;
+ const TQString src = mFileName + "__" + TQString::number(i);
+ const TQString dest = mFileName;
// remove dest
- QFile::remove( dest );
+ TQFile::remove( dest );
// copy src to dest
if ( backup.open( IO_ReadOnly ) ) {
- const QByteArray data = backup.readAll();
+ const TQByteArray data = backup.readAll();
- QFile out( dest );
+ TQFile out( dest );
if ( out.open( IO_WriteOnly ) ) {
out.writeBlock( data );
out.close();
@@ -213,7 +213,7 @@ bool ResourceFile::load()
mAsynchronous = false;
- QFile file( mFileName );
+ TQFile file( mFileName );
if ( !file.open( IO_ReadOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) );
return false;
@@ -245,25 +245,25 @@ bool ResourceFile::save( Ticket * )
kdDebug(5700) << "ResourceFile::save()" << endl;
// Only do the logrotate dance when the __0 file is not 0 bytes.
- QFile file( mFileName + "__0" );
+ TQFile file( mFileName + "__0" );
if ( file.size() != 0 ) {
- const QString last = mFileName + "__20";
+ const TQString last = mFileName + "__20";
kdDebug() << "deleting " << last << endl;
- QFile::remove( last );
+ TQFile::remove( last );
for (int i=19; i>=0; i--)
{
- const QString src = mFileName + "__" + QString::number(i);
- const QString dest = mFileName + "__" + QString::number(i+1);
+ const TQString src = mFileName + "__" + TQString::number(i);
+ const TQString dest = mFileName + "__" + TQString::number(i+1);
kdDebug() << "moving " << src << " -> " << dest << endl;
// copy src to dest
- QFile in( src );
+ TQFile in( src );
if ( in.open( IO_ReadOnly ) ) {
- const QByteArray data = in.readAll();
+ const TQByteArray data = in.readAll();
- QFile out( dest );
+ TQFile out( dest );
if ( out.open( IO_WriteOnly ) ) {
out.writeBlock( data );
out.close();
@@ -273,13 +273,13 @@ bool ResourceFile::save( Ticket * )
}
// remove src
- QFile::remove( src );
+ TQFile::remove( src );
}
} else
kdDebug() << "Not starting logrotate __0 is 0 bytes." << endl;
- QString extension = "__0";
- (void) KSaveFile::backupFile( mFileName, QString::null /*directory*/,
+ TQString extension = "__0";
+ (void) KSaveFile::backupFile( mFileName, TQString::null /*directory*/,
extension );
mDirWatch.stopScan();
@@ -309,14 +309,14 @@ bool ResourceFile::asyncSave( Ticket *ticket )
bool ok = save( ticket );
if ( !ok )
- QTimer::singleShot( 0, this, SLOT( emitSavingError() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingError() ) );
else
- QTimer::singleShot( 0, this, SLOT( emitSavingFinished() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingFinished() ) );
return ok;
}
-void ResourceFile::setFileName( const QString &fileName )
+void ResourceFile::setFileName( const TQString &fileName )
{
mDirWatch.stopScan();
if ( mDirWatch.contains( mFileName ) )
@@ -328,12 +328,12 @@ void ResourceFile::setFileName( const QString &fileName )
mDirWatch.startScan();
}
-QString ResourceFile::fileName() const
+TQString ResourceFile::fileName() const
{
return mFileName;
}
-void ResourceFile::setFormat( const QString &format )
+void ResourceFile::setFormat( const TQString &format )
{
mFormatName = format;
delete mFormat;
@@ -342,7 +342,7 @@ void ResourceFile::setFormat( const QString &format )
mFormat = factory->format( mFormatName );
}
-QString ResourceFile::format() const
+TQString ResourceFile::format() const
{
return mFormatName;
}
@@ -365,9 +365,9 @@ void ResourceFile::fileChanged()
void ResourceFile::removeAddressee( const Addressee &addr )
{
- QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
- QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
- QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
+ TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
+ TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
+ TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
mAddrMap.erase( addr.uid() );
}
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h
index 84dfc7cda..b44c22ec1 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/kabc/plugins/file/resourcefile.h
@@ -52,7 +52,7 @@ class KABC_EXPORT ResourceFile : public Resource
/**
Construct file resource on file @arg fileName using format @arg formatName.
*/
- ResourceFile( const QString &fileName, const QString &formatName = "vcard" );
+ ResourceFile( const TQString &fileName, const TQString &formatName = "vcard" );
/**
Destructor.
@@ -103,22 +103,22 @@ class KABC_EXPORT ResourceFile : public Resource
/**
Set name of file to be used for saving.
*/
- void setFileName( const QString & );
+ void setFileName( const TQString & );
/**
Return name of file used for loading and saving the address book.
*/
- QString fileName() const;
+ TQString fileName() const;
/**
Sets a new format by name.
*/
- void setFormat( const QString &name );
+ void setFormat( const TQString &name );
/**
Returns the format name.
*/
- QString format() const;
+ TQString format() const;
/**
Remove a addressee from its source.
@@ -136,14 +136,14 @@ class KABC_EXPORT ResourceFile : public Resource
void fileChanged();
protected:
- void init( const QString &fileName, const QString &format );
+ void init( const TQString &fileName, const TQString &format );
- bool lock( const QString &fileName );
- void unlock( const QString &fileName );
+ bool lock( const TQString &fileName );
+ void unlock( const TQString &fileName );
private:
- QString mFileName;
- QString mFormatName;
+ TQString mFileName;
+ TQString mFormatName;
FormatPlugin *mFormat;
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp
index a6d8ab4f9..92b07594f 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/kabc/plugins/file/resourcefileconfig.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
@@ -36,30 +36,30 @@
using namespace KABC;
-ResourceFileConfig::ResourceFileConfig( QWidget* parent, const char* name )
+ResourceFileConfig::ResourceFileConfig( TQWidget* parent, const char* name )
: ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0,
+ TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2, 0,
KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "Format:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Format:" ), this );
mFormatBox = new KComboBox( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mFormatBox, 0, 1 );
- label = new QLabel( i18n( "Location:" ), this );
+ label = new TQLabel( i18n( "Location:" ), this );
mFileNameEdit = new KURLRequester( this );
- connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ),
- SLOT( checkFilePermissions( const QString & ) ) );
+ connect( mFileNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
+ TQT_SLOT( checkFilePermissions( const TQString & ) ) );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mFileNameEdit, 1, 1 );
FormatFactory *factory = FormatFactory::self();
- QStringList formats = factory->formats();
- QStringList::Iterator it;
+ TQStringList formats = factory->formats();
+ TQStringList::Iterator it;
for ( it = formats.begin(); it != formats.end(); ++it ) {
FormatInfo *info = factory->info( *it );
if ( info ) {
@@ -108,11 +108,11 @@ void ResourceFileConfig::saveSettings( KRES::Resource *res )
resource->setFileName( mFileNameEdit->url() );
}
-void ResourceFileConfig::checkFilePermissions( const QString& fileName )
+void ResourceFileConfig::checkFilePermissions( const TQString& fileName )
{
// If file exist but is not writeable...
- if ( access( QFile::encodeName( fileName ), F_OK ) == 0 )
- emit setReadOnly( access( QFile::encodeName( fileName ), W_OK ) < 0 );
+ if ( access( TQFile::encodeName( fileName ), F_OK ) == 0 )
+ emit setReadOnly( access( TQFile::encodeName( fileName ), W_OK ) < 0 );
}
#include "resourcefileconfig.moc"
diff --git a/kabc/plugins/file/resourcefileconfig.h b/kabc/plugins/file/resourcefileconfig.h
index 3e92f0728..343a5623d 100644
--- a/kabc/plugins/file/resourcefileconfig.h
+++ b/kabc/plugins/file/resourcefileconfig.h
@@ -33,7 +33,7 @@ class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceFileConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceFileConfig( TQWidget* parent = 0, const char* name = 0 );
void setEditMode( bool value );
@@ -42,14 +42,14 @@ public slots:
void saveSettings( KRES::Resource *resource );
protected slots:
- void checkFilePermissions( const QString& fileName );
+ void checkFilePermissions( const TQString& fileName );
private:
KComboBox* mFormatBox;
KURLRequester* mFileNameEdit;
bool mInEditMode;
- QStringList mFormatTypes;
+ TQStringList mFormatTypes;
};
}
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp
index 30b8ba7e0..df0baf455 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkio.cpp
@@ -20,9 +20,9 @@
*/
-#include <qapplication.h>
-#include <qbuffer.h>
-#include <qfile.h>
+#include <tqapplication.h>
+#include <tqbuffer.h>
+#include <tqfile.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -44,28 +44,28 @@
using namespace KABC;
// Hack from Netaccess
-void qt_enter_modal( QWidget *widget );
-void qt_leave_modal( QWidget *widget );
+void qt_enter_modal( TQWidget *widget );
+void qt_leave_modal( TQWidget *widget );
class ResourceLDAPKIO::ResourceLDAPKIOPrivate
{
public:
LDIF mLdif;
bool mTLS,mSSL,mSubTree;
- QString mResultDn;
+ TQString mResultDn;
Addressee mAddr;
Address mAd;
Resource::Iterator mSaveIt;
bool mSASL;
- QString mMech;
- QString mRealm, mBindDN;
+ TQString mMech;
+ TQString mRealm, mBindDN;
LDAPUrl mLDAPUrl;
int mVer, mSizeLimit, mTimeLimit, mRDNPrefix;
int mError;
int mCachePolicy;
bool mReadOnly;
bool mAutoCache;
- QString mCacheDst;
+ TQString mCacheDst;
KTempFile *mTmp;
};
@@ -74,8 +74,8 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
{
d = new ResourceLDAPKIOPrivate;
if ( config ) {
- QMap<QString, QString> attrList;
- QStringList attributes = config->readListEntry( "LdapAttributes" );
+ TQMap<TQString, TQString> attrList;
+ TQStringList attributes = config->readListEntry( "LdapAttributes" );
for ( uint pos = 0; pos < attributes.count(); pos += 2 )
mAttributes.insert( attributes[ pos ], attributes[ pos + 1 ] );
@@ -122,8 +122,8 @@ ResourceLDAPKIO::~ResourceLDAPKIO()
void ResourceLDAPKIO::enter_loop()
{
- QWidget dummy(0,0,WType_Dialog | WShowModal);
- dummy.setFocusPolicy( QWidget::NoFocus );
+ TQWidget dummy(0,0,WType_Dialog | WShowModal);
+ dummy.setFocusPolicy( TQWidget::NoFocus );
qt_enter_modal(&dummy);
qApp->enter_loop();
qt_leave_modal(&dummy);
@@ -157,7 +157,7 @@ void ResourceLDAPKIO::listResult( KIO::Job *job)
qApp->exit_loop();
}
-QString ResourceLDAPKIO::findUid( const QString &uid )
+TQString ResourceLDAPKIO::findUid( const TQString &uid )
{
LDAPUrl url( d->mLDAPUrl );
KIO::UDSEntry entry;
@@ -173,18 +173,18 @@ QString ResourceLDAPKIO::findUid( const QString &uid )
KIO::ListJob * listJob = KIO::listDir( url, false /* no GUI */ );
connect( listJob,
- SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
- SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
- connect( listJob, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( listResult( KIO::Job* ) ) );
+ TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
+ TQT_SLOT( entries( KIO::Job*, const KIO::UDSEntryList& ) ) );
+ connect( listJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( listResult( KIO::Job* ) ) );
enter_loop();
return d->mResultDn;
}
-QCString ResourceLDAPKIO::addEntry( const QString &attr, const QString &value, bool mod )
+TQCString ResourceLDAPKIO::addEntry( const TQString &attr, const TQString &value, bool mod )
{
- QCString tmp;
+ TQCString tmp;
if ( !attr.isEmpty() ) {
if ( mod ) tmp += LDIF::assembleLine( "replace", attr ) + "\n";
tmp += LDIF::assembleLine( attr, value ) + "\n";
@@ -193,12 +193,12 @@ QCString ResourceLDAPKIO::addEntry( const QString &attr, const QString &value, b
return ( tmp );
}
-bool ResourceLDAPKIO::AddresseeToLDIF( QByteArray &ldif, const Addressee &addr,
- const QString &olddn )
+bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
+ const TQString &olddn )
{
- QCString tmp;
- QString dn;
- QByteArray data;
+ TQCString tmp;
+ TQString dn;
+ TQByteArray data;
bool mod = false;
if ( olddn.isEmpty() ) {
@@ -237,8 +237,8 @@ bool ResourceLDAPKIO::AddresseeToLDIF( QByteArray &ldif, const Addressee &addr,
if ( mod ) tmp += "changetype: modify\n";
if ( !mod ) {
tmp += "objectClass: top\n";
- QStringList obclass = QStringList::split( ',', mAttributes[ "objectClass" ] );
- for ( QStringList::iterator it = obclass.begin(); it != obclass.end(); it++ ) {
+ TQStringList obclass = TQStringList::split( ',', mAttributes[ "objectClass" ] );
+ for ( TQStringList::iterator it = obclass.begin(); it != obclass.end(); it++ ) {
tmp += LDIF::assembleLine( "objectClass", *it ) + "\n";
}
}
@@ -273,8 +273,8 @@ bool ResourceLDAPKIO::AddresseeToLDIF( QByteArray &ldif, const Addressee &addr,
tmp += addEntry( mAttributes[ "postalcode" ], ad.postalCode(), mod );
}
- QStringList emails = addr.emails();
- QStringList::ConstIterator mailIt = emails.begin();
+ TQStringList emails = addr.emails();
+ TQStringList::ConstIterator mailIt = emails.begin();
if ( !mAttributes[ "mail" ].isEmpty() ) {
if ( mod ) tmp +=
@@ -296,8 +296,8 @@ bool ResourceLDAPKIO::AddresseeToLDIF( QByteArray &ldif, const Addressee &addr,
}
if ( !mAttributes[ "jpegPhoto" ].isEmpty() ) {
- QByteArray pic;
- QBuffer buffer( pic );
+ TQByteArray pic;
+ TQBuffer buffer( pic );
buffer.open( IO_WriteOnly );
addr.photo().data().save( &buffer, "JPEG" );
@@ -308,7 +308,7 @@ bool ResourceLDAPKIO::AddresseeToLDIF( QByteArray &ldif, const Addressee &addr,
}
tmp += "\n";
- kdDebug(7125) << "ldif: " << QString::fromUtf8(tmp) << endl;
+ kdDebug(7125) << "ldif: " << TQString::fromUtf8(tmp) << endl;
ldif = tmp;
return true;
}
@@ -386,8 +386,8 @@ void ResourceLDAPKIO::init()
d->mLDAPUrl.setDn( mDn );
if (!mAttributes.empty()) {
- QMap<QString,QString>::Iterator it;
- QStringList attr;
+ TQMap<TQString,TQString>::Iterator it;
+ TQStringList attr;
for ( it = mAttributes.begin(); it != mAttributes.end(); ++it ) {
if ( !it.data().isEmpty() && it.key() != "objectClass" )
attr.append( it.data() );
@@ -400,11 +400,11 @@ void ResourceLDAPKIO::init()
d->mLDAPUrl.setFilter( mFilter );
d->mLDAPUrl.setExtension( "x-dir", "base" );
if ( d->mTLS ) d->mLDAPUrl.setExtension( "x-tls", "" );
- d->mLDAPUrl.setExtension( "x-ver", QString::number( d->mVer ) );
+ d->mLDAPUrl.setExtension( "x-ver", TQString::number( d->mVer ) );
if ( d->mSizeLimit )
- d->mLDAPUrl.setExtension( "x-sizelimit", QString::number( d->mSizeLimit ) );
+ d->mLDAPUrl.setExtension( "x-sizelimit", TQString::number( d->mSizeLimit ) );
if ( d->mTimeLimit )
- d->mLDAPUrl.setExtension( "x-timelimit", QString::number( d->mTimeLimit ) );
+ d->mLDAPUrl.setExtension( "x-timelimit", TQString::number( d->mTimeLimit ) );
if ( d->mSASL ) {
d->mLDAPUrl.setExtension( "x-sasl", "" );
if ( !d->mBindDN.isEmpty() ) d->mLDAPUrl.setExtension( "bindname", d->mBindDN );
@@ -442,8 +442,8 @@ void ResourceLDAPKIO::writeConfig( KConfig *config )
config->writeEntry( "LdapCachePolicy", d->mCachePolicy );
config->writeEntry( "LdapAutoCache", d->mAutoCache );
- QStringList attributes;
- QMap<QString, QString>::Iterator it;
+ TQStringList attributes;
+ TQMap<TQString, TQString>::Iterator it;
for ( it = mAttributes.begin(); it != mAttributes.end(); ++it )
attributes << it.key() << it.data();
@@ -487,7 +487,7 @@ void ResourceLDAPKIO::activateCache()
{
if ( d->mTmp && d->mError == 0 ) {
d->mTmp->close();
- rename( QFile::encodeName( d->mTmp->name() ), QFile::encodeName( d->mCacheDst ) );
+ rename( TQFile::encodeName( d->mTmp->name() ), TQFile::encodeName( d->mCacheDst ) );
}
if ( d->mTmp ) {
delete d->mTmp;
@@ -511,8 +511,8 @@ KIO::Job *ResourceLDAPKIO::loadFromCache()
KURL url( d->mCacheDst );
job = KIO::get( url, true, false );
- connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ),
- this, SLOT( data( KIO::Job*, const QByteArray& ) ) );
+ connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
}
return job;
}
@@ -535,17 +535,17 @@ bool ResourceLDAPKIO::load()
createCache();
if ( d->mCachePolicy != Cache_Always ) {
job = KIO::get( d->mLDAPUrl, true, false );
- connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ),
- this, SLOT( data( KIO::Job*, const QByteArray& ) ) );
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
enter_loop();
}
job = loadFromCache();
if ( job ) {
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
enter_loop();
}
if ( mErrorMsg.isEmpty() ) {
@@ -572,17 +572,17 @@ bool ResourceLDAPKIO::asyncLoad()
createCache();
if ( d->mCachePolicy != Cache_Always ) {
KIO::Job *job = KIO::get( d->mLDAPUrl, true, false );
- connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ),
- this, SLOT( data( KIO::Job*, const QByteArray& ) ) );
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( result( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( result( KIO::Job* ) ) );
} else {
result( NULL );
}
return true;
}
-void ResourceLDAPKIO::data( KIO::Job *, const QByteArray &data )
+void ResourceLDAPKIO::data( KIO::Job *, const TQByteArray &data )
{
if ( data.size() ) {
d->mLdif.setLDIF( data );
@@ -594,8 +594,8 @@ void ResourceLDAPKIO::data( KIO::Job *, const QByteArray &data )
}
LDIF::ParseVal ret;
- QString name;
- QByteArray value;
+ TQString name;
+ TQByteArray value;
do {
ret = d->mLdif.nextItem();
switch ( ret ) {
@@ -607,60 +607,60 @@ void ResourceLDAPKIO::data( KIO::Job *, const QByteArray &data )
value = d->mLdif.val();
if ( name == mAttributes[ "commonName" ].lower() ) {
if ( !d->mAddr.formattedName().isEmpty() ) {
- QString fn = d->mAddr.formattedName();
- d->mAddr.setNameFromString( QString::fromUtf8( value, value.size() ) );
+ TQString fn = d->mAddr.formattedName();
+ d->mAddr.setNameFromString( TQString::fromUtf8( value, value.size() ) );
d->mAddr.setFormattedName( fn );
} else
- d->mAddr.setNameFromString( QString::fromUtf8( value, value.size() ) );
+ d->mAddr.setNameFromString( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "formattedName" ].lower() ) {
- d->mAddr.setFormattedName( QString::fromUtf8( value, value.size() ) );
+ d->mAddr.setFormattedName( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "givenName" ].lower() ) {
- d->mAddr.setGivenName( QString::fromUtf8( value, value.size() ) );
+ d->mAddr.setGivenName( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "mail" ].lower() ) {
- d->mAddr.insertEmail( QString::fromUtf8( value, value.size() ), true );
+ d->mAddr.insertEmail( TQString::fromUtf8( value, value.size() ), true );
} else if ( name == mAttributes[ "mailAlias" ].lower() ) {
- d->mAddr.insertEmail( QString::fromUtf8( value, value.size() ), false );
+ d->mAddr.insertEmail( TQString::fromUtf8( value, value.size() ), false );
} else if ( name == mAttributes[ "phoneNumber" ].lower() ) {
PhoneNumber phone;
- phone.setNumber( QString::fromUtf8( value, value.size() ) );
+ phone.setNumber( TQString::fromUtf8( value, value.size() ) );
d->mAddr.insertPhoneNumber( phone );
} else if ( name == mAttributes[ "telephoneNumber" ].lower() ) {
- PhoneNumber phone( QString::fromUtf8( value, value.size() ),
+ PhoneNumber phone( TQString::fromUtf8( value, value.size() ),
PhoneNumber::Work );
d->mAddr.insertPhoneNumber( phone );
} else if ( name == mAttributes[ "facsimileTelephoneNumber" ].lower() ) {
- PhoneNumber phone( QString::fromUtf8( value, value.size() ),
+ PhoneNumber phone( TQString::fromUtf8( value, value.size() ),
PhoneNumber::Fax );
d->mAddr.insertPhoneNumber( phone );
} else if ( name == mAttributes[ "mobile" ].lower() ) {
- PhoneNumber phone( QString::fromUtf8( value, value.size() ),
+ PhoneNumber phone( TQString::fromUtf8( value, value.size() ),
PhoneNumber::Cell );
d->mAddr.insertPhoneNumber( phone );
} else if ( name == mAttributes[ "pager" ].lower() ) {
- PhoneNumber phone( QString::fromUtf8( value, value.size() ),
+ PhoneNumber phone( TQString::fromUtf8( value, value.size() ),
PhoneNumber::Pager );
d->mAddr.insertPhoneNumber( phone );
} else if ( name == mAttributes[ "description" ].lower() ) {
- d->mAddr.setNote( QString::fromUtf8( value, value.size() ) );
+ d->mAddr.setNote( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "title" ].lower() ) {
- d->mAddr.setTitle( QString::fromUtf8( value, value.size() ) );
+ d->mAddr.setTitle( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "street" ].lower() ) {
- d->mAd.setStreet( QString::fromUtf8( value, value.size() ) );
+ d->mAd.setStreet( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "state" ].lower() ) {
- d->mAd.setRegion( QString::fromUtf8( value, value.size() ) );
+ d->mAd.setRegion( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "city" ].lower() ) {
- d->mAd.setLocality( QString::fromUtf8( value, value.size() ) );
+ d->mAd.setLocality( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "postalcode" ].lower() ) {
- d->mAd.setPostalCode( QString::fromUtf8( value, value.size() ) );
+ d->mAd.setPostalCode( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "organization" ].lower() ) {
- d->mAddr.setOrganization( QString::fromUtf8( value, value.size() ) );
+ d->mAddr.setOrganization( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "familyName" ].lower() ) {
- d->mAddr.setFamilyName( QString::fromUtf8( value, value.size() ) );
+ d->mAddr.setFamilyName( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "uid" ].lower() ) {
- d->mAddr.setUid( QString::fromUtf8( value, value.size() ) );
+ d->mAddr.setUid( TQString::fromUtf8( value, value.size() ) );
} else if ( name == mAttributes[ "jpegPhoto" ].lower() ) {
KABC::Picture photo;
- QImage img( value );
+ TQImage img( value );
if ( !img.isNull() ) {
photo.setData( img );
photo.setType( "image/jpeg" );
@@ -714,8 +714,8 @@ void ResourceLDAPKIO::result( KIO::Job *job )
KIO::Job *cjob;
cjob = loadFromCache();
if ( cjob ) {
- connect( cjob, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( loadCacheResult( KIO::Job* ) ) );
+ connect( cjob, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( loadCacheResult( KIO::Job* ) ) );
} else {
if ( !mErrorMsg.isEmpty() )
emit loadingError( this, mErrorMsg );
@@ -730,10 +730,10 @@ bool ResourceLDAPKIO::save( Ticket* )
d->mSaveIt = begin();
KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false );
- connect( job, SIGNAL( dataReq( KIO::Job*, QByteArray& ) ),
- this, SLOT( saveData( KIO::Job*, QByteArray& ) ) );
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( syncLoadSaveResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
+ this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( syncLoadSaveResult( KIO::Job* ) ) );
enter_loop();
if ( mErrorMsg.isEmpty() ) {
kdDebug(7125) << "ResourceLDAPKIO save ok!" << endl;
@@ -750,10 +750,10 @@ bool ResourceLDAPKIO::asyncSave( Ticket* )
kdDebug(7125) << "ResourceLDAPKIO asyncSave" << endl;
d->mSaveIt = begin();
KIO::Job *job = KIO::put( d->mLDAPUrl, -1, true, false, false );
- connect( job, SIGNAL( dataReq( KIO::Job*, QByteArray& ) ),
- this, SLOT( saveData( KIO::Job*, QByteArray& ) ) );
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( saveResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
+ this, TQT_SLOT( saveData( KIO::Job*, TQByteArray& ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( saveResult( KIO::Job* ) ) );
return true;
}
@@ -778,7 +778,7 @@ void ResourceLDAPKIO::saveResult( KIO::Job *job )
emit savingFinished( this );
}
-void ResourceLDAPKIO::saveData( KIO::Job*, QByteArray& data )
+void ResourceLDAPKIO::saveData( KIO::Job*, TQByteArray& data )
{
while ( d->mSaveIt != end() &&
!(*d->mSaveIt).changed() ) d->mSaveIt++;
@@ -792,7 +792,7 @@ void ResourceLDAPKIO::saveData( KIO::Job*, QByteArray& data )
kdDebug(7125) << "ResourceLDAPKIO saveData: " << (*d->mSaveIt).assembledName() << endl;
AddresseeToLDIF( data, *d->mSaveIt, findUid( (*d->mSaveIt).uid() ) );
-// kdDebug(7125) << "ResourceLDAPKIO save LDIF: " << QString::fromUtf8(data) << endl;
+// kdDebug(7125) << "ResourceLDAPKIO save LDIF: " << TQString::fromUtf8(data) << endl;
// mark as unchanged
(*d->mSaveIt).setChanged( false );
@@ -801,7 +801,7 @@ void ResourceLDAPKIO::saveData( KIO::Job*, QByteArray& data )
void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
{
- QString dn = findUid( addr.uid() );
+ TQString dn = findUid( addr.uid() );
kdDebug(7125) << "ResourceLDAPKIO: removeAddressee: " << dn << endl;
@@ -823,42 +823,42 @@ void ResourceLDAPKIO::removeAddressee( const Addressee& addr )
}
-void ResourceLDAPKIO::setUser( const QString &user )
+void ResourceLDAPKIO::setUser( const TQString &user )
{
mUser = user;
}
-QString ResourceLDAPKIO::user() const
+TQString ResourceLDAPKIO::user() const
{
return mUser;
}
-void ResourceLDAPKIO::setPassword( const QString &password )
+void ResourceLDAPKIO::setPassword( const TQString &password )
{
mPassword = password;
}
-QString ResourceLDAPKIO::password() const
+TQString ResourceLDAPKIO::password() const
{
return mPassword;
}
-void ResourceLDAPKIO::setDn( const QString &dn )
+void ResourceLDAPKIO::setDn( const TQString &dn )
{
mDn = dn;
}
-QString ResourceLDAPKIO::dn() const
+TQString ResourceLDAPKIO::dn() const
{
return mDn;
}
-void ResourceLDAPKIO::setHost( const QString &host )
+void ResourceLDAPKIO::setHost( const TQString &host )
{
mHost = host;
}
-QString ResourceLDAPKIO::host() const
+TQString ResourceLDAPKIO::host() const
{
return mHost;
}
@@ -903,12 +903,12 @@ int ResourceLDAPKIO::timeLimit()
return d->mTimeLimit;
}
-void ResourceLDAPKIO::setFilter( const QString &filter )
+void ResourceLDAPKIO::setFilter( const TQString &filter )
{
mFilter = filter;
}
-QString ResourceLDAPKIO::filter() const
+TQString ResourceLDAPKIO::filter() const
{
return mFilter;
}
@@ -952,12 +952,12 @@ bool ResourceLDAPKIO::isSubTree() const
return d->mSubTree;
}
-void ResourceLDAPKIO::setAttributes( const QMap<QString, QString> &attributes )
+void ResourceLDAPKIO::setAttributes( const TQMap<TQString, TQString> &attributes )
{
mAttributes = attributes;
}
-QMap<QString, QString> ResourceLDAPKIO::attributes() const
+TQMap<TQString, TQString> ResourceLDAPKIO::attributes() const
{
return mAttributes;
}
@@ -982,32 +982,32 @@ bool ResourceLDAPKIO::isSASL() const
return d->mSASL;
}
-void ResourceLDAPKIO::setMech( const QString &mech )
+void ResourceLDAPKIO::setMech( const TQString &mech )
{
d->mMech = mech;
}
-QString ResourceLDAPKIO::mech() const
+TQString ResourceLDAPKIO::mech() const
{
return d->mMech;
}
-void ResourceLDAPKIO::setRealm( const QString &realm )
+void ResourceLDAPKIO::setRealm( const TQString &realm )
{
d->mRealm = realm;
}
-QString ResourceLDAPKIO::realm() const
+TQString ResourceLDAPKIO::realm() const
{
return d->mRealm;
}
-void ResourceLDAPKIO::setBindDN( const QString &binddn )
+void ResourceLDAPKIO::setBindDN( const TQString &binddn )
{
d->mBindDN = binddn;
}
-QString ResourceLDAPKIO::bindDN() const
+TQString ResourceLDAPKIO::bindDN() const
{
return d->mBindDN;
}
@@ -1032,7 +1032,7 @@ bool ResourceLDAPKIO::autoCache()
return d->mAutoCache;
}
-QString ResourceLDAPKIO::cacheDst() const
+TQString ResourceLDAPKIO::cacheDst() const
{
return d->mCacheDst;
}
diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/kabc/plugins/ldapkio/resourceldapkio.h
index bd72a9b11..2b5685fdc 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.h
+++ b/kabc/plugins/ldapkio/resourceldapkio.h
@@ -62,23 +62,23 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
virtual void removeAddressee( const Addressee& addr );
- void setUser( const QString &user );
- QString user() const;
+ void setUser( const TQString &user );
+ TQString user() const;
- void setPassword( const QString &password );
- QString password() const;
+ void setPassword( const TQString &password );
+ TQString password() const;
- void setRealm( const QString &realm );
- QString realm() const;
+ void setRealm( const TQString &realm );
+ TQString realm() const;
- void setBindDN( const QString &binddn );
- QString bindDN() const;
+ void setBindDN( const TQString &binddn );
+ TQString bindDN() const;
- void setDn( const QString &dn );
- QString dn() const;
+ void setDn( const TQString &dn );
+ TQString dn() const;
- void setHost( const QString &host );
- QString host() const;
+ void setHost( const TQString &host );
+ TQString host() const;
void setPort( int port );
int port() const;
@@ -92,14 +92,14 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
void setTimeLimit( int timelimit );
int timeLimit();
- void setFilter( const QString &filter );
- QString filter() const;
+ void setFilter( const TQString &filter );
+ TQString filter() const;
void setIsAnonymous( bool value );
bool isAnonymous() const;
- void setAttributes( const QMap<QString, QString> &attributes );
- QMap<QString, QString> attributes() const;
+ void setAttributes( const TQMap<TQString, TQString> &attributes );
+ TQMap<TQString, TQString> attributes() const;
void setRDNPrefix( int value );
int RDNPrefix() const;
@@ -116,8 +116,8 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
void setIsSASL( bool value );
bool isSASL() const ;
- void setMech( const QString &mech );
- QString mech() const;
+ void setMech( const TQString &mech );
+ TQString mech() const;
void setCachePolicy( int pol );
int cachePolicy() const;
@@ -125,42 +125,42 @@ class KABC_EXPORT ResourceLDAPKIO : public Resource
void setAutoCache( bool value );
bool autoCache();
- QString cacheDst() const;
+ TQString cacheDst() const;
protected slots:
void entries( KIO::Job*, const KIO::UDSEntryList& );
- void data( KIO::Job*, const QByteArray& );
+ void data( KIO::Job*, const TQByteArray& );
void result( KIO::Job* );
void listResult( KIO::Job* );
void syncLoadSaveResult( KIO::Job* );
void saveResult( KIO::Job* );
- void saveData( KIO::Job*, QByteArray& );
+ void saveData( KIO::Job*, TQByteArray& );
void loadCacheResult( KIO::Job* );
private:
- QString mUser;
- QString mPassword;
- QString mDn;
- QString mHost;
- QString mFilter;
+ TQString mUser;
+ TQString mPassword;
+ TQString mDn;
+ TQString mHost;
+ TQString mFilter;
int mPort;
bool mAnonymous;
- QMap<QString, QString> mAttributes;
+ TQMap<TQString, TQString> mAttributes;
KURL mLDAPUrl;
int mGetCounter; //KDE 4: remove
bool mErrorOccured; //KDE 4: remove
- QString mErrorMsg;
- QMap<KIO::Job*, QByteArray> mJobMap; //KDE 4: remove
+ TQString mErrorMsg;
+ TQMap<KIO::Job*, TQByteArray> mJobMap; //KDE 4: remove
KIO::Job *loadFromCache();
void createCache();
void activateCache();
void enter_loop();
- QCString addEntry( const QString &attr, const QString &value, bool mod );
- QString findUid( const QString &uid );
- bool AddresseeToLDIF( QByteArray &ldif, const Addressee &addr,
- const QString &olddn );
+ TQCString addEntry( const TQString &attr, const TQString &value, bool mod );
+ TQString findUid( const TQString &uid );
+ bool AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
+ const TQString &olddn );
class ResourceLDAPKIOPrivate;
ResourceLDAPKIOPrivate *d;
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index ae54ab8c3..271328525 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -17,17 +17,17 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qvbox.h>
-#include <qvgroupbox.h>
-#include <qhbuttongroup.h>
-#include <qradiobutton.h>
+#include <tqapplication.h>
+
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqspinbox.h>
+#include <tqvbox.h>
+#include <tqvgroupbox.h>
+#include <tqhbuttongroup.h>
+#include <tqradiobutton.h>
#include <kaccelmanager.h>
#include <kcombobox.h>
@@ -45,21 +45,21 @@
using namespace KABC;
-ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( QWidget* parent, const char* name )
+ResourceLDAPKIOConfig::ResourceLDAPKIOConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QBoxLayout *mainLayout = new QVBoxLayout( this );
+ TQBoxLayout *mainLayout = new TQVBoxLayout( this );
mainLayout->setAutoAdd( true );
cfg = new LdapConfigWidget( LdapConfigWidget::W_ALL, this );
- mSubTree = new QCheckBox( i18n( "Sub-tree query" ), this );
- QHBox *box = new QHBox( this );
+ mSubTree = new TQCheckBox( i18n( "Sub-tree query" ), this );
+ TQHBox *box = new TQHBox( this );
box->setSpacing( KDialog::spacingHint() );
- mEditButton = new QPushButton( i18n( "Edit Attributes..." ), box );
- mCacheButton = new QPushButton( i18n( "Offline Use..." ), box );
+ mEditButton = new TQPushButton( i18n( "Edit Attributes..." ), box );
+ mCacheButton = new TQPushButton( i18n( "Offline Use..." ), box );
- connect( mEditButton, SIGNAL( clicked() ), SLOT( editAttributes() ) );
- connect( mCacheButton, SIGNAL( clicked() ), SLOT( editCache() ) );
+ connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editAttributes() ) );
+ connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) );
}
void ResourceLDAPKIOConfig::loadSettings( KRES::Resource *res )
@@ -143,13 +143,13 @@ void ResourceLDAPKIOConfig::editAttributes()
void ResourceLDAPKIOConfig::editCache()
{
LDAPUrl src;
- QStringList attr;
+ TQStringList attr;
src = cfg->url();
src.setScope( mSubTree->isChecked() ? LDAPUrl::Sub : LDAPUrl::One );
if (!mAttributes.empty()) {
- QMap<QString,QString>::Iterator it;
- QStringList attr;
+ TQMap<TQString,TQString>::Iterator it;
+ TQStringList attr;
for ( it = mAttributes.begin(); it != mAttributes.end(); ++it ) {
if ( !it.data().isEmpty() && it.key() != "objectClass" )
attr.append( it.data() );
@@ -165,34 +165,34 @@ void ResourceLDAPKIOConfig::editCache()
}
-AttributesDialog::AttributesDialog( const QMap<QString, QString> &attributes,
+AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
int rdnprefix,
- QWidget *parent, const char *name )
+ TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Attributes Configuration" ), Ok | Cancel,
Ok, parent, name, true, true )
{
mNameDict.setAutoDelete( true );
- mNameDict.insert( "objectClass", new QString( i18n( "Object classes" ) ) );
- mNameDict.insert( "commonName", new QString( i18n( "Common name" ) ) );
- mNameDict.insert( "formattedName", new QString( i18n( "Formatted name" ) ) );
- mNameDict.insert( "familyName", new QString( i18n( "Family name" ) ) );
- mNameDict.insert( "givenName", new QString( i18n( "Given name" ) ) );
- mNameDict.insert( "organization", new QString( i18n( "Organization" ) ) );
- mNameDict.insert( "title", new QString( i18n( "Title" ) ) );
- mNameDict.insert( "street", new QString( i18n( "Street" ) ) );
- mNameDict.insert( "state", new QString( i18n( "State" ) ) );
- mNameDict.insert( "city", new QString( i18n( "City" ) ) );
- mNameDict.insert( "postalcode", new QString( i18n( "Postal code" ) ) );
- mNameDict.insert( "mail", new QString( i18n( "Email" ) ) );
- mNameDict.insert( "mailAlias", new QString( i18n( "Email alias" ) ) );
- mNameDict.insert( "phoneNumber", new QString( i18n( "Telephone number" ) ) );
- mNameDict.insert( "telephoneNumber", new QString( i18n( "Work telephone number" ) ) );
- mNameDict.insert( "facsimileTelephoneNumber", new QString( i18n( "Fax number" ) ) );
- mNameDict.insert( "mobile", new QString( i18n( "Cell phone number" ) ) );
- mNameDict.insert( "pager", new QString( i18n( "Pager" ) ) );
- mNameDict.insert( "description", new QString( i18n( "Note" ) ) );
- mNameDict.insert( "uid", new QString( i18n( "UID" ) ) );
- mNameDict.insert( "jpegPhoto", new QString( i18n( "Photo" ) ) );
+ mNameDict.insert( "objectClass", new TQString( i18n( "Object classes" ) ) );
+ mNameDict.insert( "commonName", new TQString( i18n( "Common name" ) ) );
+ mNameDict.insert( "formattedName", new TQString( i18n( "Formatted name" ) ) );
+ mNameDict.insert( "familyName", new TQString( i18n( "Family name" ) ) );
+ mNameDict.insert( "givenName", new TQString( i18n( "Given name" ) ) );
+ mNameDict.insert( "organization", new TQString( i18n( "Organization" ) ) );
+ mNameDict.insert( "title", new TQString( i18n( "Title" ) ) );
+ mNameDict.insert( "street", new TQString( i18n( "Street" ) ) );
+ mNameDict.insert( "state", new TQString( i18n( "State" ) ) );
+ mNameDict.insert( "city", new TQString( i18n( "City" ) ) );
+ mNameDict.insert( "postalcode", new TQString( i18n( "Postal code" ) ) );
+ mNameDict.insert( "mail", new TQString( i18n( "Email" ) ) );
+ mNameDict.insert( "mailAlias", new TQString( i18n( "Email alias" ) ) );
+ mNameDict.insert( "phoneNumber", new TQString( i18n( "Telephone number" ) ) );
+ mNameDict.insert( "telephoneNumber", new TQString( i18n( "Work telephone number" ) ) );
+ mNameDict.insert( "facsimileTelephoneNumber", new TQString( i18n( "Fax number" ) ) );
+ mNameDict.insert( "mobile", new TQString( i18n( "Cell phone number" ) ) );
+ mNameDict.insert( "pager", new TQString( i18n( "Pager" ) ) );
+ mNameDict.insert( "description", new TQString( i18n( "Note" ) ) );
+ mNameDict.insert( "uid", new TQString( i18n( "UID" ) ) );
+ mNameDict.insert( "jpegPhoto", new TQString( i18n( "Photo" ) ) );
// default map
mDefaultMap.insert( "objectClass", "inetOrgPerson" );
@@ -218,7 +218,7 @@ AttributesDialog::AttributesDialog( const QMap<QString, QString> &attributes,
mDefaultMap.insert( "jpegPhoto", "jpegPhoto" );
// overwrite the default values here
- QMap<QString, QString> kolabMap, netscapeMap, evolutionMap, outlookMap;
+ TQMap<TQString, TQString> kolabMap, netscapeMap, evolutionMap, outlookMap;
// kolab
kolabMap.insert( "formattedName", "display-name" );
@@ -233,11 +233,11 @@ AttributesDialog::AttributesDialog( const QMap<QString, QString> &attributes,
mMapList.append( evolutionMap );
mMapList.append( outlookMap );
- QFrame *page = plainPage();
- QGridLayout *layout = new QGridLayout( page, 4, ( attributes.count() + 4 ) >> 1,
+ TQFrame *page = plainPage();
+ TQGridLayout *layout = new TQGridLayout( page, 4, ( attributes.count() + 4 ) >> 1,
0, spacingHint() );
- QLabel *label = new QLabel( i18n( "Template:" ), page );
+ TQLabel *label = new TQLabel( i18n( "Template:" ), page );
layout->addWidget( label, 0, 0 );
mMapCombo = new KComboBox( page );
layout->addWidget( mMapCombo, 0, 1 );
@@ -247,9 +247,9 @@ AttributesDialog::AttributesDialog( const QMap<QString, QString> &attributes,
mMapCombo->insertItem( i18n( "Netscape" ) );
mMapCombo->insertItem( i18n( "Evolution" ) );
mMapCombo->insertItem( i18n( "Outlook" ) );
- connect( mMapCombo, SIGNAL( activated( int ) ), SLOT( mapChanged( int ) ) );
+ connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) );
- label = new QLabel( i18n( "RDN prefix attribute:" ), page );
+ label = new TQLabel( i18n( "RDN prefix attribute:" ), page );
layout->addWidget( label, 1, 0 );
mRDNCombo = new KComboBox( page );
layout->addWidget( mRDNCombo, 1, 1 );
@@ -257,7 +257,7 @@ AttributesDialog::AttributesDialog( const QMap<QString, QString> &attributes,
mRDNCombo->insertItem( i18n( "UID" ) );
mRDNCombo->setCurrentItem( rdnprefix );
- QMap<QString, QString>::ConstIterator it;
+ TQMap<TQString, TQString>::ConstIterator it;
int i, j = 0;
for ( i = 2, it = attributes.begin(); it != attributes.end(); ++it, ++i ) {
if ( mNameDict[ it.key() ] == 0 ) {
@@ -269,7 +269,7 @@ AttributesDialog::AttributesDialog( const QMap<QString, QString> &attributes,
j = 2;
}
kdDebug(7125) << "itkey: " << it.key() << " i: " << i << endl;
- label = new QLabel( *mNameDict[ it.key() ] + ":", page );
+ label = new TQLabel( *mNameDict[ it.key() ] + ":", page );
KLineEdit *lineedit = new KLineEdit( page );
mLineEditDict.insert( it.key(), lineedit );
lineedit->setText( it.data() );
@@ -279,7 +279,7 @@ AttributesDialog::AttributesDialog( const QMap<QString, QString> &attributes,
}
for ( i = 1; i < mMapCombo->count(); i++ ) {
- QDictIterator<KLineEdit> it2( mLineEditDict );
+ TQDictIterator<KLineEdit> it2( mLineEditDict );
for ( ; it2.current(); ++it2 ) {
if ( mMapList[ i ].contains( it2.currentKey() ) ) {
if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break;
@@ -300,11 +300,11 @@ AttributesDialog::~AttributesDialog()
{
}
-QMap<QString, QString> AttributesDialog::attributes() const
+TQMap<TQString, TQString> AttributesDialog::attributes() const
{
- QMap<QString, QString> map;
+ TQMap<TQString, TQString> map;
- QDictIterator<KLineEdit> it( mLineEditDict );
+ TQDictIterator<KLineEdit> it( mLineEditDict );
for ( ; it.current(); ++it )
map.insert( it.currentKey(), it.current()->text() );
@@ -320,7 +320,7 @@ void AttributesDialog::mapChanged( int pos )
{
// apply first the default and than the spezific changes
- QMap<QString, QString>::Iterator it;
+ TQMap<TQString, TQString>::Iterator it;
for ( it = mDefaultMap.begin(); it != mDefaultMap.end(); ++it )
mLineEditDict[ it.key() ]->setText( it.data() );
@@ -333,33 +333,33 @@ void AttributesDialog::mapChanged( int pos )
}
OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src,
- const QString &dst, QWidget *parent, const char *name )
+ const TQString &dst, TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Offline Configuration" ), Ok | Cancel,
Ok, parent, name, true, true )
{
- QFrame *page = plainPage();
- QVBoxLayout *layout = new QVBoxLayout( page );
+ TQFrame *page = plainPage();
+ TQVBoxLayout *layout = new TQVBoxLayout( page );
layout->setAutoAdd( true );
mSrc = src; mDst = dst;
- mCacheGroup = new QButtonGroup( 1, Qt::Horizontal,
+ mCacheGroup = new TQButtonGroup( 1, Qt::Horizontal,
i18n("Offline Cache Policy"), page );
- QRadioButton *bt;
- new QRadioButton( i18n("Do not use offline cache"), mCacheGroup );
- bt = new QRadioButton( i18n("Use local copy if no connection"), mCacheGroup );
- new QRadioButton( i18n("Always use local copy"), mCacheGroup );
+ TQRadioButton *bt;
+ new TQRadioButton( i18n("Do not use offline cache"), mCacheGroup );
+ bt = new TQRadioButton( i18n("Use local copy if no connection"), mCacheGroup );
+ new TQRadioButton( i18n("Always use local copy"), mCacheGroup );
mCacheGroup->setButton( cachePolicy );
- mAutoCache = new QCheckBox( i18n("Refresh offline cache automatically"),
+ mAutoCache = new TQCheckBox( i18n("Refresh offline cache automatically"),
page );
mAutoCache->setChecked( autoCache );
mAutoCache->setEnabled( bt->isChecked() );
- connect( bt, SIGNAL(toggled(bool)), mAutoCache, SLOT(setEnabled(bool)) );
+ connect( bt, TQT_SIGNAL(toggled(bool)), mAutoCache, TQT_SLOT(setEnabled(bool)) );
- QPushButton *lcache = new QPushButton( i18n("Load into Cache"), page );
- connect( lcache, SIGNAL( clicked() ), SLOT( loadCache() ) );
+ TQPushButton *lcache = new TQPushButton( i18n("Load into Cache"), page );
+ connect( lcache, TQT_SIGNAL( clicked() ), TQT_SLOT( loadCache() ) );
}
OfflineDialog::~OfflineDialog()
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldapkio/resourceldapkioconfig.h
index c261cbd06..8bc6d081a 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.h
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.h
@@ -21,10 +21,10 @@
#ifndef RESOURCELDAPCONFIG_H
#define RESOURCELDAPCONFIG_H
-#include <qmap.h>
-#include <qradiobutton.h>
-#include <qcombobox.h>
-#include <qdict.h>
+#include <tqmap.h>
+#include <tqradiobutton.h>
+#include <tqcombobox.h>
+#include <tqdict.h>
#include <kdialogbase.h>
#include <kresources/configwidget.h>
@@ -47,7 +47,7 @@ class KABC_EXPORT ResourceLDAPKIOConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceLDAPKIOConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceLDAPKIOConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
@@ -57,13 +57,13 @@ class KABC_EXPORT ResourceLDAPKIOConfig : public KRES::ConfigWidget
void editAttributes();
void editCache();
private:
- QPushButton *mEditButton, *mCacheButton;
+ TQPushButton *mEditButton, *mCacheButton;
LdapConfigWidget *cfg;
- QCheckBox *mSubTree;
- QMap<QString, QString> mAttributes;
+ TQCheckBox *mSubTree;
+ TQMap<TQString, TQString> mAttributes;
int mRDNPrefix, mCachePolicy;
bool mAutoCache;
- QString mCacheDst;
+ TQString mCacheDst;
};
class AttributesDialog : public KDialogBase
@@ -71,11 +71,11 @@ class AttributesDialog : public KDialogBase
Q_OBJECT
public:
- AttributesDialog( const QMap<QString, QString> &attributes, int rdnprefix,
- QWidget *parent, const char *name = 0 );
+ AttributesDialog( const TQMap<TQString, TQString> &attributes, int rdnprefix,
+ TQWidget *parent, const char *name = 0 );
~AttributesDialog();
- QMap<QString, QString> attributes() const;
+ TQMap<TQString, TQString> attributes() const;
int rdnprefix() const;
private slots:
@@ -85,10 +85,10 @@ class AttributesDialog : public KDialogBase
enum { UserMap, KolabMap, NetscapeMap, EvolutionMap, OutlookMap };
KComboBox *mMapCombo, *mRDNCombo;
- QValueList< QMap<QString, QString> > mMapList;
- QMap<QString, QString> mDefaultMap;
- QDict<KLineEdit> mLineEditDict;
- QDict<QString> mNameDict;
+ TQValueList< TQMap<TQString, TQString> > mMapList;
+ TQMap<TQString, TQString> mDefaultMap;
+ TQDict<KLineEdit> mLineEditDict;
+ TQDict<TQString> mNameDict;
};
class OfflineDialog : public KDialogBase
@@ -97,7 +97,7 @@ class OfflineDialog : public KDialogBase
public:
OfflineDialog( bool autoCache, int cachePolicy, const KURL &src,
- const QString &dst, QWidget *parent, const char *name = 0 );
+ const TQString &dst, TQWidget *parent, const char *name = 0 );
~OfflineDialog();
int cachePolicy() const;
@@ -108,9 +108,9 @@ class OfflineDialog : public KDialogBase
private:
KURL mSrc;
- QString mDst;
- QButtonGroup *mCacheGroup;
- QCheckBox *mAutoCache;
+ TQString mDst;
+ TQButtonGroup *mCacheGroup;
+ TQCheckBox *mAutoCache;
};
}
diff --git a/kabc/plugins/net/resourcenet.cpp b/kabc/plugins/net/resourcenet.cpp
index 49d66d9e0..914885877 100644
--- a/kabc/plugins/net/resourcenet.cpp
+++ b/kabc/plugins/net/resourcenet.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
+#include <tqfile.h>
#include <kdebug.h>
#include <kio/netaccess.h>
@@ -46,7 +46,7 @@ class ResourceNet::ResourceNetPrivate
KIO::Job *mSaveJob;
bool mIsSaving;
- QString mLastErrorString;
+ TQString mLastErrorString;
};
ResourceNet::ResourceNet( const KConfig *config )
@@ -57,11 +57,11 @@ ResourceNet::ResourceNet( const KConfig *config )
if ( config ) {
init( KURL( config->readPathEntry( "NetUrl" ) ), config->readEntry( "NetFormat" ) );
} else {
- init( KURL(), QString("vcard").latin1() );
+ init( KURL(), TQString("vcard").latin1() );
}
}
-ResourceNet::ResourceNet( const KURL &url, const QString &format )
+ResourceNet::ResourceNet( const KURL &url, const TQString &format )
: Resource( 0 ), mFormat( 0 ),
mTempFile( 0 ),
d( new ResourceNetPrivate )
@@ -69,7 +69,7 @@ ResourceNet::ResourceNet( const KURL &url, const QString &format )
init( url, format );
}
-void ResourceNet::init( const KURL &url, const QString &format )
+void ResourceNet::init( const KURL &url, const TQString &format )
{
d->mLoadJob = 0;
d->mIsLoading = false;
@@ -81,7 +81,7 @@ void ResourceNet::init( const KURL &url, const QString &format )
FormatFactory *factory = FormatFactory::self();
mFormat = factory->format( mFormatName );
if ( !mFormat ) {
- mFormatName = QString("vcard").latin1();
+ mFormatName = TQString("vcard").latin1();
mFormat = factory->format( mFormatName );
}
@@ -135,14 +135,14 @@ void ResourceNet::doClose()
bool ResourceNet::load()
{
- QString tempFile;
+ TQString tempFile;
if ( !KIO::NetAccess::download( mUrl, tempFile, 0 ) ) {
addressBook()->error( i18n( "Unable to download file '%1'." ).arg( mUrl.prettyURL() ) );
return false;
}
- QFile file( tempFile );
+ TQFile file( tempFile );
if ( !file.open( IO_ReadOnly ) ) {
addressBook()->error( i18n( "Unable to open file '%1'." ).arg( tempFile ) );
KIO::NetAccess::removeTempFile( tempFile );
@@ -158,7 +158,7 @@ bool ResourceNet::load()
return result;
}
-bool ResourceNet::clearAndLoad( QFile *file )
+bool ResourceNet::clearAndLoad( TQFile *file )
{
clear();
return mFormat->loadAll( addressBook(), this, file );
@@ -192,8 +192,8 @@ bool ResourceNet::asyncLoad()
KIO::Scheduler::checkSlaveOnHold( true );
d->mLoadJob = KIO::file_copy( mUrl, dest, -1, true, false, false );
d->mIsLoading = true;
- connect( d->mLoadJob, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( downloadFinished( KIO::Job* ) ) );
+ connect( d->mLoadJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( downloadFinished( KIO::Job* ) ) );
return true;
}
@@ -286,8 +286,8 @@ bool ResourceNet::asyncSave( Ticket* )
KIO::Scheduler::checkSlaveOnHold( true );
d->mIsSaving = true;
d->mSaveJob = KIO::file_copy( src, mUrl, -1, true, false, false );
- connect( d->mSaveJob, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( uploadFinished( KIO::Job* ) ) );
+ connect( d->mSaveJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( uploadFinished( KIO::Job* ) ) );
return true;
}
@@ -314,7 +314,7 @@ void ResourceNet::deleteLocalTempFile()
mTempFile = 0;
}
-void ResourceNet::saveToFile( QFile *file )
+void ResourceNet::saveToFile( TQFile *file )
{
mFormat->saveAll( addressBook(), this, file );
}
@@ -329,7 +329,7 @@ KURL ResourceNet::url() const
return mUrl;
}
-void ResourceNet::setFormat( const QString &name )
+void ResourceNet::setFormat( const TQString &name )
{
mFormatName = name;
if ( mFormat )
@@ -339,7 +339,7 @@ void ResourceNet::setFormat( const QString &name )
mFormat = factory->format( mFormatName );
}
-QString ResourceNet::format() const
+TQString ResourceNet::format() const
{
return mFormatName;
}
@@ -352,11 +352,11 @@ void ResourceNet::downloadFinished( KIO::Job* )
if ( !hasTempFile() || mTempFile->status() != 0 ) {
d->mLastErrorString = i18n( "Download failed: Unable to create temporary file" );
- QTimer::singleShot( 0, this, SLOT( signalError() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( signalError() ) );
return;
}
- QFile file( mTempFile->name() );
+ TQFile file( mTempFile->name() );
if ( file.open( IO_ReadOnly ) ) {
if ( clearAndLoad( &file ) )
emit loadingFinished( this );
diff --git a/kabc/plugins/net/resourcenet.h b/kabc/plugins/net/resourcenet.h
index b315be6df..ccb59694d 100644
--- a/kabc/plugins/net/resourcenet.h
+++ b/kabc/plugins/net/resourcenet.h
@@ -48,7 +48,7 @@ class KABC_EXPORT ResourceNet : public Resource
public:
ResourceNet( const KConfig* );
- ResourceNet( const KURL &url, const QString &format );
+ ResourceNet( const KURL &url, const TQString &format );
~ResourceNet();
virtual void writeConfig( KConfig* );
@@ -77,15 +77,15 @@ class KABC_EXPORT ResourceNet : public Resource
/**
Sets a new format by name.
*/
- void setFormat( const QString &name );
+ void setFormat( const TQString &name );
/**
Returns the format name.
*/
- QString format() const;
+ TQString format() const;
protected:
- void init( const KURL &url, const QString &format );
+ void init( const KURL &url, const TQString &format );
private slots:
void downloadFinished( KIO::Job* );
@@ -93,8 +93,8 @@ class KABC_EXPORT ResourceNet : public Resource
void signalError();
private:
- bool clearAndLoad( QFile *file );
- void saveToFile( QFile *file );
+ bool clearAndLoad( TQFile *file );
+ void saveToFile( TQFile *file );
bool hasTempFile() const { return mTempFile != 0; }
void abortAsyncLoading();
void abortAsyncSaving();
@@ -103,7 +103,7 @@ class KABC_EXPORT ResourceNet : public Resource
void deleteStaleTempFile();
FormatPlugin *mFormat;
- QString mFormatName;
+ TQString mFormatName;
KURL mUrl;
KTempFile *mTempFile;
diff --git a/kabc/plugins/net/resourcenetconfig.cpp b/kabc/plugins/net/resourcenetconfig.cpp
index ef5bfdcb9..b441fbd98 100644
--- a/kabc/plugins/net/resourcenetconfig.cpp
+++ b/kabc/plugins/net/resourcenetconfig.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
@@ -33,19 +33,19 @@
using namespace KABC;
-ResourceNetConfig::ResourceNetConfig( QWidget* parent, const char* name )
+ResourceNetConfig::ResourceNetConfig( TQWidget* parent, const char* name )
: ConfigWidget( parent, name ), mInEditMode( false )
{
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0,
+ TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2, 0,
KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "Format:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Format:" ), this );
mFormatBox = new KComboBox( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mFormatBox, 0, 1 );
- label = new QLabel( i18n( "Location:" ), this );
+ label = new TQLabel( i18n( "Location:" ), this );
mUrlEdit = new KURLRequester( this );
mUrlEdit->setMode( KFile::File );
@@ -53,8 +53,8 @@ ResourceNetConfig::ResourceNetConfig( QWidget* parent, const char* name )
mainLayout->addWidget( mUrlEdit, 1, 1 );
FormatFactory *factory = FormatFactory::self();
- QStringList formats = factory->formats();
- QStringList::Iterator it;
+ TQStringList formats = factory->formats();
+ TQStringList::Iterator it;
for ( it = formats.begin(); it != formats.end(); ++it ) {
FormatInfo *info = factory->info( *it );
if ( info ) {
diff --git a/kabc/plugins/net/resourcenetconfig.h b/kabc/plugins/net/resourcenetconfig.h
index e35c46c01..e07937739 100644
--- a/kabc/plugins/net/resourcenetconfig.h
+++ b/kabc/plugins/net/resourcenetconfig.h
@@ -33,7 +33,7 @@ class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceNetConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceNetConfig( TQWidget* parent = 0, const char* name = 0 );
void setEditMode( bool value );
@@ -45,7 +45,7 @@ class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
KComboBox* mFormatBox;
KURLRequester* mUrlEdit;
- QStringList mFormatTypes;
+ TQStringList mFormatTypes;
bool mInEditMode;
};
diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp
index 2e6eb6902..55f02bae7 100644
--- a/kabc/plugins/sql/resourcesql.cpp
+++ b/kabc/plugins/sql/resourcesql.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qsqldatabase.h>
-#include <qsqlcursor.h>
+#include <tqsqldatabase.h>
+#include <tqsqlcursor.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -42,7 +42,7 @@ extern "C"
ResourceSql::ResourceSql( AddressBook *ab, const KConfig *config )
: Resource( ab ), mDb( 0 )
{
- QString user, password, db, host;
+ TQString user, password, db, host;
user = config->readEntry( "SqlUser" );
password = cryptStr( config->readEntry( "SqlPassword " ) );
@@ -52,15 +52,15 @@ ResourceSql::ResourceSql( AddressBook *ab, const KConfig *config )
init( user, password, db, host );
}
-ResourceSql::ResourceSql( AddressBook *ab, const QString &user,
- const QString &password, const QString &db, const QString &host )
+ResourceSql::ResourceSql( AddressBook *ab, const TQString &user,
+ const TQString &password, const TQString &db, const TQString &host )
: Resource( ab ), mDb( 0 )
{
init( user, password, db, host );
}
-void ResourceSql::init( const QString &user, const QString &password,
- const QString &db, const QString &host )
+void ResourceSql::init( const TQString &user, const TQString &password,
+ const TQString &db, const TQString &host )
{
mUser = user;
mPassword = password;
@@ -80,12 +80,12 @@ Ticket *ResourceSql::requestSaveTicket()
bool ResourceSql::open()
{
- QStringList drivers = QSqlDatabase::drivers();
- for ( QStringList::Iterator it = drivers.begin(); it != drivers.end(); ++it ) {
+ TQStringList drivers = TQSqlDatabase::drivers();
+ for ( TQStringList::Iterator it = drivers.begin(); it != drivers.end(); ++it ) {
kdDebug(5700) << "Driver: " << (*it) << endl;
}
- mDb = QSqlDatabase::addDatabase( "QMYSQL3" );
+ mDb = TQSqlDatabase::addDatabase( "QMYSQL3" );
if ( !mDb ) {
kdDebug(5700) << "Error. Unable to connect to database." << endl;
@@ -112,14 +112,14 @@ void ResourceSql::close()
bool ResourceSql::load()
{
- QSqlQuery query( "select addressId, name, familyName, givenName, "
+ TQSqlQuery query( "select addressId, name, familyName, givenName, "
"additionalName, prefix, suffix, nickname, birthday, "
"mailer, timezone, geo_latitude, geo_longitude, title, "
"role, organization, note, productId, revision, "
"sortString, url from kaddressbook_main_" + mUser );
while ( query.next() ) {
- QString addrId = query.value(0).toString();
+ TQString addrId = query.value(0).toString();
Addressee addr;
addr.setResource( this );
@@ -146,7 +146,7 @@ bool ResourceSql::load()
// emails
{
- QSqlQuery emailsQuery( "select email, preferred from kaddressbook_emails "
+ TQSqlQuery emailsQuery( "select email, preferred from kaddressbook_emails "
"where addressId = '" + addrId + "'" );
while ( emailsQuery.next() )
addr.insertEmail( emailsQuery.value( 0 ).toString(),
@@ -155,7 +155,7 @@ bool ResourceSql::load()
// phones
{
- QSqlQuery phonesQuery( "select number, type from kaddressbook_phones "
+ TQSqlQuery phonesQuery( "select number, type from kaddressbook_phones "
"where addressId = '" + addrId + "'" );
while ( phonesQuery.next() )
addr.insertPhoneNumber( PhoneNumber( phonesQuery.value( 0 ).toString(),
@@ -164,7 +164,7 @@ bool ResourceSql::load()
// addresses
{
- QSqlQuery addressesQuery( "select postOfficeBox, extended, street, "
+ TQSqlQuery addressesQuery( "select postOfficeBox, extended, street, "
"locality, region, postalCode, country, label, type "
"from kaddressbook_addresses where addressId = '" + addrId + "'" );
while ( addressesQuery.next() ) {
@@ -185,7 +185,7 @@ bool ResourceSql::load()
// categories
{
- QSqlQuery categoriesQuery( "select category from kaddressbook_categories "
+ TQSqlQuery categoriesQuery( "select category from kaddressbook_categories "
"where addressId = '" + addrId + "'" );
while ( categoriesQuery.next() )
addr.insertCategory( categoriesQuery.value( 0 ).toString() );
@@ -193,7 +193,7 @@ bool ResourceSql::load()
// customs
{
- QSqlQuery customsQuery( "select app, name, value from kaddressbook_customs "
+ TQSqlQuery customsQuery( "select app, name, value from kaddressbook_customs "
"where addressId = '" + addrId + "'" );
while ( customsQuery.next() )
addr.insertCustom( customsQuery.value( 0 ).toString(),
@@ -210,11 +210,11 @@ bool ResourceSql::load()
bool ResourceSql::save( Ticket * )
{
// we have to delete all entries for this user and reinsert them
- QSqlQuery query( "select addressId from kaddressbook_main_" + mUser );
+ TQSqlQuery query( "select addressId from kaddressbook_main_" + mUser );
while ( query.next() ) {
- QString addrId = query.value( 0 ).toString();
- QSqlQuery q;
+ TQString addrId = query.value( 0 ).toString();
+ TQSqlQuery q;
q.exec( "DELETE FROM kaddressbook_emails WHERE addressId = '" + addrId + "'" );
q.exec( "DELETE FROM kaddressbook_phones WHERE addressId = '" + addrId + "'" );
@@ -231,7 +231,7 @@ bool ResourceSql::save( Ticket * )
if ( (*it).resource() != this && (*it).resource() != 0 ) // save only my and new entries
continue;
- QString uid = (*it).uid();
+ TQString uid = (*it).uid();
query.exec( "INSERT INTO kaddressbook_main_" + mUser + " VALUES ('" +
(*it).uid() + "','" +
@@ -244,9 +244,9 @@ bool ResourceSql::save( Ticket * )
(*it).nickName() + "','" +
(*it).birthday().toString( Qt::ISODate ) + "','" +
(*it).mailer() + "','" +
- QString::number( (*it).timeZone().offset() ) + "','" +
- QString::number( (*it).geo().latitude() ) + "','" +
- QString::number( (*it).geo().longitude() ) + "','" +
+ TQString::number( (*it).timeZone().offset() ) + "','" +
+ TQString::number( (*it).geo().latitude() ) + "','" +
+ TQString::number( (*it).geo().longitude() ) + "','" +
(*it).title() + "','" +
(*it).role() + "','" +
(*it).organization() + "','" +
@@ -259,14 +259,14 @@ bool ResourceSql::save( Ticket * )
// emails
{
- QStringList emails = (*it).emails();
- QStringList::ConstIterator it;
+ TQStringList emails = (*it).emails();
+ TQStringList::ConstIterator it;
bool preferred = true;
for( it = emails.begin(); it != emails.end(); ++it ) {
query.exec("INSERT INTO kaddressbook_emails VALUES ('" +
uid + "','" +
(*it) + "','" +
- QString::number(preferred) + "')");
+ TQString::number(preferred) + "')");
preferred = false;
}
}
@@ -279,7 +279,7 @@ bool ResourceSql::save( Ticket * )
query.exec("INSERT INTO kaddressbook_phones VALUES ('" +
uid + "','" +
(*it).number() + "','" +
- QString::number( (*it).type() ) + "')");
+ TQString::number( (*it).type() ) + "')");
}
}
@@ -298,14 +298,14 @@ bool ResourceSql::save( Ticket * )
(*it).postalCode() + "','" +
(*it).country() + "','" +
(*it).label() + "','" +
- QString::number( (*it).type() ) + "')");
+ TQString::number( (*it).type() ) + "')");
}
}
// categories
{
- QStringList categories = (*it).categories();
- QStringList::ConstIterator it;
+ TQStringList categories = (*it).categories();
+ TQStringList::ConstIterator it;
for( it = categories.begin(); it != categories.end(); ++it )
query.exec("INSERT INTO kaddressbook_categories VALUES ('" +
uid + "','" +
@@ -314,14 +314,14 @@ bool ResourceSql::save( Ticket * )
// customs
{
- QStringList list = (*it).customs();
- QStringList::ConstIterator it;
+ TQStringList list = (*it).customs();
+ TQStringList::ConstIterator it;
for( it = list.begin(); it != list.end(); ++it ) {
int dashPos = (*it).find( '-' );
int colonPos = (*it).find( ':' );
- QString app = (*it).left( dashPos );
- QString name = (*it).mid( dashPos + 1, colonPos - dashPos - 1 );
- QString value = (*it).right( (*it).length() - colonPos - 1 );
+ TQString app = (*it).left( dashPos );
+ TQString name = (*it).mid( dashPos + 1, colonPos - dashPos - 1 );
+ TQString value = (*it).right( (*it).length() - colonPos - 1 );
query.exec("INSERT INTO kaddressbook_categories VALUES ('" +
uid + "','" + app + "','" + name + "','" + value + "')");
@@ -332,7 +332,7 @@ bool ResourceSql::save( Ticket * )
return true;
}
-QString ResourceSql::identifier() const
+TQString ResourceSql::identifier() const
{
return mHost + "_" + mDbName;
}
diff --git a/kabc/plugins/sql/resourcesql.h b/kabc/plugins/sql/resourcesql.h
index c0b61b69b..a5fc60b55 100644
--- a/kabc/plugins/sql/resourcesql.h
+++ b/kabc/plugins/sql/resourcesql.h
@@ -33,8 +33,8 @@ namespace KABC {
class ResourceSql : public Resource
{
public:
- ResourceSql( AddressBook *ab, const QString &user, const QString &password,
- const QString &db, const QString &host );
+ ResourceSql( AddressBook *ab, const TQString &user, const TQString &password,
+ const TQString &db, const TQString &host );
ResourceSql( AddressBook *ab, const KConfig * );
bool open();
@@ -45,18 +45,18 @@ public:
bool load();
bool save( Ticket * ticket );
- QString identifier() const;
+ TQString identifier() const;
private:
- void init(const QString &user, const QString &password,
- const QString &db, const QString &host );
+ void init(const TQString &user, const TQString &password,
+ const TQString &db, const TQString &host );
- QString mUser;
- QString mPassword;
- QString mDbName;
- QString mHost;
+ TQString mUser;
+ TQString mPassword;
+ TQString mDbName;
+ TQString mHost;
- QSqlDatabase *mDb;
+ TQSqlDatabase *mDb;
};
}
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp
index d9abffa30..ef1651cde 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/kabc/plugins/sql/resourcesqlconfig.cpp
@@ -18,10 +18,10 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qvbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqvbox.h>
#include <klineedit.h>
#include <klocale.h>
@@ -31,43 +31,43 @@
using namespace KABC;
-ResourceSqlConfig::ResourceSqlConfig( QWidget* parent, const char* name )
+ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name )
: ResourceConfigWidget( parent, name )
{
resize( 290, 170 );
- QGridLayout *mainLayout = new QGridLayout( this, 4, 2 );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2 );
- QLabel *label = new QLabel( i18n( "Username:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Username:" ), this );
mUser = new KLineEdit( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mUser, 0, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this );
mPassword->setEchoMode( KLineEdit::Password );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mPassword, 1, 1 );
- label = new QLabel( i18n( "Host:" ), this );
+ label = new TQLabel( i18n( "Host:" ), this );
mHost = new KLineEdit( this );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mHost, 2, 1 );
- label = new QLabel( i18n( "Port:" ), this );
- QVBox *box = new QVBox(this);
- mPort = new QSpinBox(0, 65535, 1, box );
- mPort->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred));
+ label = new TQLabel( i18n( "Port:" ), this );
+ TQVBox *box = new TQVBox(this);
+ mPort = new TQSpinBox(0, 65535, 1, box );
+ mPort->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
mPort->setValue(389);
- new QWidget(box, "dummy");
+ new TQWidget(box, "dummy");
mainLayout->addWidget( label, 3, 0 );
mainLayout->addWidget( box, 3, 1 );
- label = new QLabel( i18n( "Database:" ), this );
+ label = new TQLabel( i18n( "Database:" ), this );
mDbName = new KLineEdit( this );
mainLayout->addWidget( label, 4, 0 );
diff --git a/kabc/plugins/sql/resourcesqlconfig.h b/kabc/plugins/sql/resourcesqlconfig.h
index d7230870e..cb96563b7 100644
--- a/kabc/plugins/sql/resourcesqlconfig.h
+++ b/kabc/plugins/sql/resourcesqlconfig.h
@@ -33,7 +33,7 @@ class ResourceSqlConfig : public ResourceConfigWidget
Q_OBJECT
public:
- ResourceSqlConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KConfig *config );
@@ -44,7 +44,7 @@ private:
KLineEdit* mPassword;
KLineEdit* mDbName;
KLineEdit* mHost;
- QSpinBox* mPort;
+ TQSpinBox* mPort;
};
}
diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index fb677d9d3..d43c68320 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -266,7 +266,7 @@ void Resource::removeAddressee( const Addressee &addr )
mAddrMap.erase( addr.uid() );
}
-Addressee Resource::findByUid( const QString &uid )
+Addressee Resource::findByUid( const TQString &uid )
{
Addressee::Map::ConstIterator it = mAddrMap.find( uid );
@@ -276,7 +276,7 @@ Addressee Resource::findByUid( const QString &uid )
return Addressee();
}
-Addressee::List Resource::findByName( const QString &name )
+Addressee::List Resource::findByName( const TQString &name )
{
Addressee::List results;
@@ -289,15 +289,15 @@ Addressee::List Resource::findByName( const QString &name )
return results;
}
-Addressee::List Resource::findByEmail( const QString &email )
+Addressee::List Resource::findByEmail( const TQString &email )
{
Addressee::List results;
- const QString lowerEmail = email.lower();
+ const TQString lowerEmail = email.lower();
ConstIterator it;
for ( it = begin(); it != end(); ++it ) {
- const QStringList mailList = (*it).emails();
- for ( QStringList::ConstIterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
+ const TQStringList mailList = (*it).emails();
+ for ( TQStringList::ConstIterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
if ( lowerEmail == (*ite).lower() )
results.append( *it );
}
@@ -306,7 +306,7 @@ Addressee::List Resource::findByEmail( const QString &email )
return results;
}
-Addressee::List Resource::findByCategory( const QString &category )
+Addressee::List Resource::findByCategory( const TQString &category )
{
Addressee::List results;
diff --git a/kabc/resource.h b/kabc/resource.h
index 556c3beae..0412a22b1 100644
--- a/kabc/resource.h
+++ b/kabc/resource.h
@@ -62,7 +62,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@short Resource Iterator
This class provides an iterator for resource entries.
- By default it points to a QValueList<Addressee>::Iterator,
+ By default it points to a TQValueList<Addressee>::Iterator,
but you can reimplement this class to fit your own needs.
*/
class KABC_EXPORT Iterator
@@ -230,7 +230,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@return The addressee with the specified unique identifier or an
empty addressee.
*/
- virtual Addressee findByUid( const QString &uid );
+ virtual Addressee findByUid( const TQString &uid );
/**
Searches all addressees which match the specified name.
@@ -238,7 +238,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@param name The name you are looking for.
@return A list of all matching addressees.
*/
- virtual Addressee::List findByName( const QString &name );
+ virtual Addressee::List findByName( const TQString &name );
/**
Searches all addressees which match the specified email address.
@@ -246,7 +246,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@param email The email address you are looking for.
@return A list of all matching addressees.
*/
- virtual Addressee::List findByEmail( const QString &email );
+ virtual Addressee::List findByEmail( const TQString &email );
/**
Searches all addressees which belongs to the specified category.
@@ -254,7 +254,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@param category The category you are looking for.
@return A list of all matching addressees.
*/
- virtual Addressee::List findByCategory( const QString &category );
+ virtual Addressee::List findByCategory( const TQString &category );
/**
Removes all addressees from the resource.
@@ -284,7 +284,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@param resource The pointer to the resource which emitted this signal.
@param msg A translated error message.
*/
- void loadingError( Resource *resource, const QString &msg );
+ void loadingError( Resource *resource, const TQString &msg );
/**
This signal is emitted when the resource has finished the saving of all
@@ -301,7 +301,7 @@ class KABC_EXPORT Resource : public KRES::Resource
@param resource The pointer to the resource which emitted this signal.
@param msg A translated error message.
*/
- void savingError( Resource *resource, const QString &msg );
+ void savingError( Resource *resource, const TQString &msg );
protected:
Ticket *createTicket( Resource * );
diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp
index f34dcaa63..a52754be3 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/kabc/resourceselectdialog.cpp
@@ -23,8 +23,8 @@
#include <klistbox.h>
#include <kstdguiitem.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
#include "resource.h"
#include "addressbook.h"
@@ -33,16 +33,16 @@
using namespace KABC;
-ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, QWidget *parent, const char *name )
+ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, const char *name )
: KDialog( parent, name, true )
{
setCaption( i18n( "Resource Selection" ) );
resize( 300, 200 );
- QVBoxLayout *mainLayout = new QVBoxLayout( this );
+ TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
mainLayout->setMargin( marginHint() );
- QGroupBox *groupBox = new QGroupBox( 2, Qt::Horizontal, this );
+ TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal, this );
groupBox->setTitle( i18n( "Resources" ) );
mResourceId = new KListBox( groupBox );
@@ -54,15 +54,15 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, QWidget *parent, co
KButtonBox *buttonBox = new KButtonBox( this );
buttonBox->addStretch();
- buttonBox->addButton( KStdGuiItem::ok(), this, SLOT( accept() ) );
- buttonBox->addButton( KStdGuiItem::cancel(), this, SLOT( reject() ) );
+ buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
+ buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
buttonBox->layout();
mainLayout->addWidget( buttonBox );
// setup listbox
uint counter = 0;
- QPtrList<Resource> list = ab->resources();
+ TQPtrList<Resource> list = ab->resources();
for ( uint i = 0; i < list.count(); ++i ) {
Resource *resource = list.at( i );
if ( resource && !resource->readOnly() ) {
@@ -83,9 +83,9 @@ Resource *ResourceSelectDialog::resource()
return 0;
}
-Resource *ResourceSelectDialog::getResource( AddressBook *ab, QWidget *parent )
+Resource *ResourceSelectDialog::getResource( AddressBook *ab, TQWidget *parent )
{
- QPtrList<Resource> resources = ab->resources();
+ TQPtrList<Resource> resources = ab->resources();
if ( resources.count() == 1 ) return resources.first();
Resource *found = 0;
diff --git a/kabc/resourceselectdialog.h b/kabc/resourceselectdialog.h
index df7e4a4bc..6441dc247 100644
--- a/kabc/resourceselectdialog.h
+++ b/kabc/resourceselectdialog.h
@@ -21,7 +21,7 @@
#ifndef KABC_RESOURCESELECTDIALOG_H
#define KABC_RESOURCESELECTDIALOG_H
-#include <qmap.h>
+#include <tqmap.h>
#include <kdialog.h>
#include <kdemacros.h>
@@ -41,15 +41,15 @@ class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog
Q_OBJECT
public:
- ResourceSelectDialog( AddressBook *ab, QWidget *parent = 0,
+ ResourceSelectDialog( AddressBook *ab, TQWidget *parent = 0,
const char *name = 0);
Resource *resource();
- static Resource *getResource( AddressBook *ab, QWidget *parent = 0 );
+ static Resource *getResource( AddressBook *ab, TQWidget *parent = 0 );
private:
KListBox *mResourceId;
- QMap<int, Resource*> mResourceMap;
+ TQMap<int, Resource*> mResourceMap;
};
}
diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp
index 1735da995..36c449f19 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/kabc/scripts/addressee.src.cpp
@@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qregexp.h>
+#include <tqregexp.h>
#include <ksharedptr.h>
#include <kdebug.h>
@@ -39,23 +39,23 @@ using namespace KABC;
static bool matchBinaryPattern( int value, int pattern );
template <class L>
-static bool listEquals( const QValueList<L>&, const QValueList<L>& );
-static bool emailsEquals( const QStringList&, const QStringList& );
+static bool listEquals( const TQValueList<L>&, const TQValueList<L>& );
+static bool emailsEquals( const TQStringList&, const TQStringList& );
KABC::SortMode *Addressee::mSortMode = 0;
struct Addressee::AddresseeData : public KShared
{
- QString uid;
- QString uri;
+ TQString uid;
+ TQString uri;
--VARIABLES--
PhoneNumber::List phoneNumbers;
Address::List addresses;
Key::List keys;
- QStringList emails;
- QStringList categories;
- QStringList custom;
+ TQStringList emails;
+ TQStringList categories;
+ TQStringList custom;
Resource *resource;
@@ -163,7 +163,7 @@ bool Addressee::isEmpty() const
return mData->empty;
}
-void Addressee::setUid( const QString &id )
+void Addressee::setUid( const TQString &id )
{
if ( id == mData->uid ) return;
detach();
@@ -171,17 +171,17 @@ void Addressee::setUid( const QString &id )
mData->uid = id;
}
-QString Addressee::uid() const
+TQString Addressee::uid() const
{
return mData->uid;
}
-QString Addressee::uidLabel()
+TQString Addressee::uidLabel()
{
return i18n("Unique Identifier");
}
-void Addressee::setUri( const QString &id )
+void Addressee::setUri( const TQString &id )
{
if ( id == mData->uri ) return;
detach();
@@ -189,21 +189,21 @@ void Addressee::setUri( const QString &id )
mData->uri = id;
}
-QString Addressee::uri() const
+TQString Addressee::uri() const
{
return mData->uri;
}
-QString Addressee::uriLabel()
+TQString Addressee::uriLabel()
{
return i18n("Unique Resource Identifier");
}
--DEFINITIONS--
-void Addressee::setNameFromString( const QString &s )
+void Addressee::setNameFromString( const TQString &s )
{
- QString str = s;
+ TQString str = s;
//remove enclosing quotes from string
if ( str.length() > 1 && s[ 0 ] == '"' && s[ s.length() - 1 ] == '"' )
str = s.mid( 1, s.length() - 2 );
@@ -212,26 +212,26 @@ void Addressee::setNameFromString( const QString &s )
setName( str );
// clear all name parts
- setPrefix( QString::null );
- setGivenName( QString::null );
- setAdditionalName( QString::null );
- setFamilyName( QString::null );
- setSuffix( QString::null );
+ setPrefix( TQString::null );
+ setGivenName( TQString::null );
+ setAdditionalName( TQString::null );
+ setFamilyName( TQString::null );
+ setSuffix( TQString::null );
if ( str.isEmpty() )
return;
- QString spaceStr = " ";
- QString emptyStr = "";
+ TQString spaceStr = " ";
+ TQString emptyStr = "";
AddresseeHelper *helper = AddresseeHelper::self();
int i = str.find( ',' );
if( i < 0 ) {
- QStringList parts = QStringList::split( spaceStr, str );
+ TQStringList parts = TQStringList::split( spaceStr, str );
int leftOffset = 0;
int rightOffset = parts.count() - 1;
- QString suffix;
+ TQString suffix;
while ( rightOffset >= 0 ) {
if ( helper->containsSuffix( parts[ rightOffset ] ) ) {
suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? emptyStr : spaceStr));
@@ -244,7 +244,7 @@ void Addressee::setNameFromString( const QString &s )
if ( rightOffset < 0 )
return;
- QStringList inclusionList;
+ TQStringList inclusionList;
for ( int n = 1; (rightOffset - n >= 0) && (n < 4); ++n ) {
if ( helper->containsPrefix( parts[ rightOffset - n ].lower() ) ) {
inclusionList.prepend( parts[ rightOffset - n ] );
@@ -262,7 +262,7 @@ void Addressee::setNameFromString( const QString &s )
setGivenName( parts[ rightOffset ] );
}
- QString prefix;
+ TQString prefix;
while ( leftOffset < rightOffset ) {
if ( helper->containsTitle( parts[ leftOffset ] ) ) {
prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
@@ -277,23 +277,23 @@ void Addressee::setNameFromString( const QString &s )
leftOffset++;
}
- QString additionalName;
+ TQString additionalName;
while ( leftOffset < rightOffset ) {
additionalName.append( ( additionalName.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
leftOffset++;
}
setAdditionalName( additionalName );
} else {
- QString part1 = str.left( i );
- QString part2 = str.mid( i + 1 );
+ TQString part1 = str.left( i );
+ TQString part2 = str.mid( i + 1 );
- QStringList parts = QStringList::split( spaceStr, part1 );
+ TQStringList parts = TQStringList::split( spaceStr, part1 );
int leftOffset = 0;
int rightOffset = parts.count() - 1;
if ( parts.count() > 0 ) {
- QString suffix;
+ TQString suffix;
while ( rightOffset >= 0 ) {
if ( helper->containsSuffix( parts[ rightOffset ] ) ) {
suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? emptyStr : spaceStr));
@@ -309,7 +309,7 @@ void Addressee::setNameFromString( const QString &s )
} else
setFamilyName( parts[ rightOffset ] );
- QString prefix;
+ TQString prefix;
while ( leftOffset < rightOffset ) {
if ( helper->containsTitle( parts[ leftOffset ] ) ) {
prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
@@ -323,14 +323,14 @@ void Addressee::setNameFromString( const QString &s )
setSuffix( "" );
}
- parts = QStringList::split( spaceStr, part2 );
+ parts = TQStringList::split( spaceStr, part2 );
leftOffset = 0;
rightOffset = parts.count();
if ( parts.count() > 0 ) {
- QString prefix;
+ TQString prefix;
while ( leftOffset < rightOffset ) {
if ( helper->containsTitle( parts[ leftOffset ] ) ) {
prefix.append( ( prefix.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
@@ -345,7 +345,7 @@ void Addressee::setNameFromString( const QString &s )
leftOffset++;
}
- QString additionalName;
+ TQString additionalName;
while ( leftOffset < rightOffset ) {
additionalName.append( ( additionalName.isEmpty() ? emptyStr : spaceStr) + parts[ leftOffset ] );
leftOffset++;
@@ -358,9 +358,9 @@ void Addressee::setNameFromString( const QString &s )
}
}
-QString Addressee::realName() const
+TQString Addressee::realName() const
{
- QString n( formattedName() );
+ TQString n( formattedName() );
if ( !n.isEmpty() )
return n;
@@ -375,31 +375,31 @@ QString Addressee::realName() const
return organization();
}
-QString Addressee::assembledName() const
+TQString Addressee::assembledName() const
{
- QString name = prefix() + " " + givenName() + " " + additionalName() + " " +
+ TQString name = prefix() + " " + givenName() + " " + additionalName() + " " +
familyName() + " " + suffix();
return name.simplifyWhiteSpace();
}
-QString Addressee::fullEmail( const QString &email ) const
+TQString Addressee::fullEmail( const TQString &email ) const
{
- QString e;
+ TQString e;
if ( email.isNull() ) {
e = preferredEmail();
} else {
e = email;
}
- if ( e.isEmpty() ) return QString::null;
+ if ( e.isEmpty() ) return TQString::null;
- QString text;
+ TQString text;
if ( realName().isEmpty() )
text = e;
else {
- QRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
+ TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
if ( realName().find( needQuotes ) != -1 ) {
- QString name = realName();
+ TQString name = realName();
name.replace( "\"", "\\\"" );
text = "\"" + name + "\" <" + e + ">";
} else
@@ -409,7 +409,7 @@ QString Addressee::fullEmail( const QString &email ) const
return text;
}
-void Addressee::insertEmail( const QString &email, bool preferred )
+void Addressee::insertEmail( const TQString &email, bool preferred )
{
if ( email.simplifyWhiteSpace().isEmpty() )
return;
@@ -417,7 +417,7 @@ void Addressee::insertEmail( const QString &email, bool preferred )
detach();
mData->empty = false;
- QStringList::Iterator it = mData->emails.find( email );
+ TQStringList::Iterator it = mData->emails.find( email );
if ( it != mData->emails.end() ) {
if ( !preferred || it == mData->emails.begin() ) return;
@@ -432,27 +432,27 @@ void Addressee::insertEmail( const QString &email, bool preferred )
}
}
-void Addressee::removeEmail( const QString &email )
+void Addressee::removeEmail( const TQString &email )
{
detach();
- QStringList::Iterator it = mData->emails.find( email );
+ TQStringList::Iterator it = mData->emails.find( email );
if ( it == mData->emails.end() ) return;
mData->emails.remove( it );
}
-QString Addressee::preferredEmail() const
+TQString Addressee::preferredEmail() const
{
- if ( mData->emails.count() == 0 ) return QString::null;
+ if ( mData->emails.count() == 0 ) return TQString::null;
else return mData->emails.first();
}
-QStringList Addressee::emails() const
+TQStringList Addressee::emails() const
{
return mData->emails;
}
-void Addressee::setEmails( const QStringList& emails ) {
+void Addressee::setEmails( const TQStringList& emails ) {
detach();
mData->emails = emails;
@@ -520,7 +520,7 @@ PhoneNumber::List Addressee::phoneNumbers( int type ) const
return list;
}
-PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
+PhoneNumber Addressee::findPhoneNumber( const TQString &id ) const
{
PhoneNumber::List::ConstIterator it;
for( it = mData->phoneNumbers.constBegin(); it != mData->phoneNumbers.constEnd(); ++it ) {
@@ -559,7 +559,7 @@ void Addressee::removeKey( const Key &key )
}
}
-Key Addressee::key( int type, QString customTypeString ) const
+Key Addressee::key( int type, TQString customTypeString ) const
{
Key::List::ConstIterator it;
for( it = mData->keys.constBegin(); it != mData->keys.constEnd(); ++it ) {
@@ -576,7 +576,7 @@ Key Addressee::key( int type, QString customTypeString ) const
}
}
}
- return Key( QString(), type );
+ return Key( TQString(), type );
}
void Addressee::setKeys( const Key::List& list )
@@ -590,7 +590,7 @@ Key::List Addressee::keys() const
return mData->keys;
}
-Key::List Addressee::keys( int type, QString customTypeString ) const
+Key::List Addressee::keys( int type, TQString customTypeString ) const
{
Key::List list;
@@ -612,7 +612,7 @@ Key::List Addressee::keys( int type, QString customTypeString ) const
return list;
}
-Key Addressee::findKey( const QString &id ) const
+Key Addressee::findKey( const TQString &id ) const
{
Key::List::ConstIterator it;
for( it = mData->keys.constBegin(); it != mData->keys.constEnd(); ++it ) {
@@ -623,7 +623,7 @@ Key Addressee::findKey( const QString &id ) const
return Key();
}
-QString Addressee::asString() const
+TQString Addressee::asString() const
{
return "Smith, agent Smith...";
}
@@ -637,8 +637,8 @@ void Addressee::dump() const
--DEBUG--
kdDebug(5700) << " Emails {" << endl;
- const QStringList e = emails();
- QStringList::ConstIterator it;
+ const TQStringList e = emails();
+ TQStringList::ConstIterator it;
for( it = e.begin(); it != e.end(); ++it ) {
kdDebug(5700) << " " << (*it) << endl;
}
@@ -739,7 +739,7 @@ Address::List Addressee::addresses( int type ) const
return list;
}
-Address Addressee::findAddress( const QString &id ) const
+Address Addressee::findAddress( const TQString &id ) const
{
Address::List::ConstIterator it;
for( it = mData->addresses.constBegin(); it != mData->addresses.constEnd(); ++it ) {
@@ -750,7 +750,7 @@ Address Addressee::findAddress( const QString &id ) const
return Address();
}
-void Addressee::insertCategory( const QString &c )
+void Addressee::insertCategory( const TQString &c )
{
detach();
mData->empty = false;
@@ -760,22 +760,22 @@ void Addressee::insertCategory( const QString &c )
mData->categories.append( c );
}
-void Addressee::removeCategory( const QString &c )
+void Addressee::removeCategory( const TQString &c )
{
detach();
- QStringList::Iterator it = mData->categories.find( c );
+ TQStringList::Iterator it = mData->categories.find( c );
if ( it == mData->categories.end() ) return;
mData->categories.remove( it );
}
-bool Addressee::hasCategory( const QString &c ) const
+bool Addressee::hasCategory( const TQString &c ) const
{
return ( mData->categories.findIndex( c ) != -1 );
}
-void Addressee::setCategories( const QStringList &c )
+void Addressee::setCategories( const TQStringList &c )
{
detach();
mData->empty = false;
@@ -783,22 +783,22 @@ void Addressee::setCategories( const QStringList &c )
mData->categories = c;
}
-QStringList Addressee::categories() const
+TQStringList Addressee::categories() const
{
return mData->categories;
}
-void Addressee::insertCustom( const QString &app, const QString &name,
- const QString &value )
+void Addressee::insertCustom( const TQString &app, const TQString &name,
+ const TQString &value )
{
if ( value.isEmpty() || name.isEmpty() || app.isEmpty() ) return;
detach();
mData->empty = false;
- QString qualifiedName = app + "-" + name + ":";
+ TQString qualifiedName = app + "-" + name + ":";
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
if ( (*it).startsWith( qualifiedName ) ) {
(*it) = qualifiedName + value;
@@ -809,13 +809,13 @@ void Addressee::insertCustom( const QString &app, const QString &name,
mData->custom.append( qualifiedName + value );
}
-void Addressee::removeCustom( const QString &app, const QString &name)
+void Addressee::removeCustom( const TQString &app, const TQString &name)
{
detach();
- QString qualifiedName = app + "-" + name + ":";
+ TQString qualifiedName = app + "-" + name + ":";
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
if ( (*it).startsWith( qualifiedName ) ) {
mData->custom.remove( it );
@@ -824,12 +824,12 @@ void Addressee::removeCustom( const QString &app, const QString &name)
}
}
-QString Addressee::custom( const QString &app, const QString &name ) const
+TQString Addressee::custom( const TQString &app, const TQString &name ) const
{
- QString qualifiedName = app + "-" + name + ":";
- QString value;
+ TQString qualifiedName = app + "-" + name + ":";
+ TQString value;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for( it = mData->custom.constBegin(); it != mData->custom.constEnd(); ++it ) {
if ( (*it).startsWith( qualifiedName ) ) {
value = (*it).mid( (*it).find( ":" ) + 1 );
@@ -840,7 +840,7 @@ QString Addressee::custom( const QString &app, const QString &name ) const
return value;
}
-void Addressee::setCustoms( const QStringList &l )
+void Addressee::setCustoms( const TQStringList &l )
{
detach();
mData->empty = false;
@@ -848,13 +848,13 @@ void Addressee::setCustoms( const QStringList &l )
mData->custom = l;
}
-QStringList Addressee::customs() const
+TQStringList Addressee::customs() const
{
return mData->custom;
}
-void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
- QString &email)
+void Addressee::parseEmailAddress( const TQString &rawEmail, TQString &fullName,
+ TQString &email)
{
// This is a simplified version of KPIM::splitAddress().
@@ -864,11 +864,11 @@ void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
return; // KPIM::AddressEmpty;
// The code works on 8-bit strings, so convert the input to UTF-8.
- QCString address = rawEmail.utf8();
+ TQCString address = rawEmail.utf8();
- QCString displayName;
- QCString addrSpec;
- QCString comment;
+ TQCString displayName;
+ TQCString addrSpec;
+ TQCString comment;
// The following is a primitive parser for a mailbox-list (cf. RFC 2822).
// The purpose is to extract a displayable string from the mailboxes.
@@ -980,8 +980,8 @@ ABORT_PARSING:
comment = comment.stripWhiteSpace();
addrSpec = addrSpec.stripWhiteSpace();
- fullName = QString::fromUtf8( displayName );
- email = QString::fromUtf8( addrSpec );
+ fullName = TQString::fromUtf8( displayName );
+ email = TQString::fromUtf8( addrSpec );
// check for errors
if ( inQuotedString )
@@ -999,7 +999,7 @@ ABORT_PARSING:
//displayName.truncate( 0 );
// Address of the form "foo@bar" or "foo@bar (Name)".
email = fullName;
- fullName = QString::fromUtf8( comment );
+ fullName = TQString::fromUtf8( comment );
}
}
@@ -1045,7 +1045,7 @@ bool Addressee::operator< ( const Addressee &addr )
return mSortMode->lesser( *this, addr );
}
-QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
+TQDataStream &KABC::operator<<( TQDataStream &s, const Addressee &a )
{
if (!a.mData) return s;
@@ -1061,7 +1061,7 @@ QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
return s;
}
-QDataStream &KABC::operator>>( QDataStream &s, Addressee &a )
+TQDataStream &KABC::operator>>( TQDataStream &s, Addressee &a )
{
if (!a.mData)
return s;
@@ -1098,7 +1098,7 @@ bool matchBinaryPattern( int value, int pattern )
}
template <class L>
-bool listEquals( const QValueList<L> &list, const QValueList<L> &pattern )
+bool listEquals( const TQValueList<L> &list, const TQValueList<L> &pattern )
{
if ( list.count() != pattern.count() )
return false;
@@ -1110,7 +1110,7 @@ bool listEquals( const QValueList<L> &list, const QValueList<L> &pattern )
return true;
}
-bool emailsEquals( const QStringList &list, const QStringList &pattern )
+bool emailsEquals( const TQStringList &list, const TQStringList &pattern )
{
if ( list.count() != pattern.count() )
return false;
@@ -1118,7 +1118,7 @@ bool emailsEquals( const QStringList &list, const QStringList &pattern )
if ( list.first() != pattern.first() )
return false;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it )
if ( pattern.find( *it ) == pattern.end() )
return false;
diff --git a/kabc/scripts/addressee.src.h b/kabc/scripts/addressee.src.h
index edb63ae60..f87edc5ec 100644
--- a/kabc/scripts/addressee.src.h
+++ b/kabc/scripts/addressee.src.h
@@ -21,10 +21,10 @@
#ifndef KABC_ADDRESSEE_H
#define KABC_ADDRESSEE_H
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
#include <ksharedptr.h>
#include <kurl.h>
@@ -73,12 +73,12 @@ class SortMode;
*/
class KABC_EXPORT Addressee
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Addressee & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Addressee & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Addressee & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Addressee & );
public:
- typedef QValueList<Addressee> List;
- typedef QMap<QString, Addressee> Map;
+ typedef TQValueList<Addressee> List;
+ typedef TQMap<TQString, Addressee> Map;
/**
Construct an empty address book entry.
@@ -100,28 +100,28 @@ class KABC_EXPORT Addressee
/**
Set unique identifier.
*/
- void setUid( const QString &uid );
+ void setUid( const TQString &uid );
/**
Return unique identifier.
*/
- QString uid() const;
+ TQString uid() const;
/**
Return translated label for uid field.
*/
- static QString uidLabel();
+ static TQString uidLabel();
/**
Set unique resource identifier.
*/
- void setUri( const QString &uid );
+ void setUri( const TQString &uid );
/**
Return unique resource identifier.
*/
- QString uri() const;
+ TQString uri() const;
/**
Return translated label for uri field.
*/
- static QString uriLabel();
+ static TQString uriLabel();
--DECLARATIONS--
/**
@@ -129,26 +129,26 @@ class KABC_EXPORT Addressee
parts of the string with according fields. This function should probably
be a bit more clever.
*/
- void setNameFromString( const QString & );
+ void setNameFromString( const TQString & );
/**
Return the name of the addressee. This is calculated from all the name
fields.
*/
- QString realName() const;
+ TQString realName() const;
/**
Return the name that consists of all name parts.
*/
- QString assembledName() const;
+ TQString assembledName() const;
/**
Return email address including real name.
@param email Email address to be used to construct the full email string.
- If this is QString::null the preferred email address is used.
+ If this is TQString::null the preferred email address is used.
*/
- QString fullEmail( const QString &email=QString::null ) const;
+ TQString fullEmail( const TQString &email=TQString::null ) const;
/**
Insert an email address. If the email address already exists in this
@@ -158,30 +158,30 @@ class KABC_EXPORT Addressee
@param preferred Set to true, if this is the preferred email address of
the addressee.
*/
- void insertEmail( const QString &email, bool preferred=false );
+ void insertEmail( const TQString &email, bool preferred=false );
/**
Remove email address. If the email address doesn't exist, nothing happens.
*/
- void removeEmail( const QString &email );
+ void removeEmail( const TQString &email );
/**
Return preferred email address. This is the first email address or the
last one added with insertEmail() with a set preferred parameter.
*/
- QString preferredEmail() const;
+ TQString preferredEmail() const;
/**
Return list of all email addresses.
*/
- QStringList emails() const;
+ TQStringList emails() const;
/**
Set the emails to @p list.
The first email address gets the preferred one!
@param list The list of email addresses.
*/
- void setEmails( const QStringList& list);
+ void setEmails( const TQStringList& list);
/**
Insert a phone number. If a phone number with the same id already exists
@@ -213,7 +213,7 @@ class KABC_EXPORT Addressee
/**
Return phone number with the given id.
*/
- PhoneNumber findPhoneNumber( const QString &id ) const;
+ PhoneNumber findPhoneNumber( const TQString &id ) const;
/**
Insert a key. If a key with the same id already exists
@@ -233,7 +233,7 @@ class KABC_EXPORT Addressee
that should match. If you leave the string empty, the first
key with a custom value is returned.
*/
- Key key( int type, QString customTypeString = QString::null ) const;
+ Key key( int type, TQString customTypeString = TQString::null ) const;
/**
Return list of all keys.
@@ -252,12 +252,12 @@ class KABC_EXPORT Addressee
that should match. If you leave the string empty, all custom
keys will be returned.
*/
- Key::List keys( int type, QString customTypeString = QString::null ) const;
+ Key::List keys( int type, TQString customTypeString = TQString::null ) const;
/**
Return key with the given id.
*/
- Key findKey( const QString &id ) const;
+ Key findKey( const TQString &id ) const;
/**
Insert an address. If an address with the same id already exists
@@ -289,32 +289,32 @@ class KABC_EXPORT Addressee
/**
Return address with the given id.
*/
- Address findAddress( const QString &id ) const;
+ Address findAddress( const TQString &id ) const;
/**
Insert category. If the category already exists it is not duplicated.
*/
- void insertCategory( const QString & );
+ void insertCategory( const TQString & );
/**
Remove category.
*/
- void removeCategory( const QString & );
+ void removeCategory( const TQString & );
/**
Return, if addressee has the given category.
*/
- bool hasCategory( const QString & ) const;
+ bool hasCategory( const TQString & ) const;
/**
Set categories to given value.
*/
- void setCategories( const QStringList & );
+ void setCategories( const TQStringList & );
/**
Return list of all set categories.
*/
- QStringList categories() const;
+ TQStringList categories() const;
/**
Insert custom entry. The entry is identified by the name of the inserting
@@ -324,34 +324,34 @@ class KABC_EXPORT Addressee
An empty value isn't allowed (nothing happens if this is called with
any of the three arguments being empty)
*/
- void insertCustom( const QString &app, const QString &name,
- const QString &value );
+ void insertCustom( const TQString &app, const TQString &name,
+ const TQString &value );
/**
Remove custom entry.
*/
- void removeCustom( const QString &app, const QString &name );
+ void removeCustom( const TQString &app, const TQString &name );
/**
Return value of custom entry, identified by app and entry name.
*/
- QString custom( const QString &app, const QString &name ) const;
+ TQString custom( const TQString &app, const TQString &name ) const;
/**
Set all custom entries.
*/
- void setCustoms( const QStringList & );
+ void setCustoms( const TQStringList & );
/**
Return list of all custom entries.
*/
- QStringList customs() const;
+ TQStringList customs() const;
/**
Parse full email address. The result is given back in fullName and email.
*/
- static void parseEmailAddress( const QString &rawEmail, QString &fullName,
- QString &email );
+ static void parseEmailAddress( const TQString &rawEmail, TQString &fullName,
+ TQString &email );
/**
Debug output.
@@ -361,7 +361,7 @@ class KABC_EXPORT Addressee
/**
Returns string representation of the addressee.
*/
- QString asString() const;
+ TQString asString() const;
/**
Set resource where the addressee is from.
@@ -399,8 +399,8 @@ class KABC_EXPORT Addressee
static KABC::SortMode *mSortMode;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const Addressee & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, Addressee & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Addressee & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Addressee & );
}
diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp
index 205ddaa06..91a27779d 100644
--- a/kabc/scripts/field.src.cpp
+++ b/kabc/scripts/field.src.cpp
@@ -31,9 +31,9 @@ class Field::FieldImpl
{
public:
FieldImpl( int fieldId, int category = 0,
- const QString &label = QString::null,
- const QString &key = QString::null,
- const QString &app = QString::null )
+ const TQString &label = TQString::null,
+ const TQString &key = TQString::null,
+ const TQString &app = TQString::null )
: mFieldId( fieldId ), mCategory( category ), mLabel( label ),
mKey( key ), mApp( app ) {}
@@ -46,17 +46,17 @@ class Field::FieldImpl
int fieldId() { return mFieldId; }
int category() { return mCategory; }
- QString label() { return mLabel; }
- QString key() { return mKey; }
- QString app() { return mApp; }
+ TQString label() { return mLabel; }
+ TQString key() { return mKey; }
+ TQString app() { return mApp; }
private:
int mFieldId;
int mCategory;
- QString mLabel;
- QString mKey;
- QString mApp;
+ TQString mLabel;
+ TQString mKey;
+ TQString mApp;
};
@@ -75,7 +75,7 @@ Field::~Field()
delete mImpl;
}
-QString Field::label()
+TQString Field::label()
{
switch ( mImpl->fieldId() ) {
--CASELABEL--
@@ -91,7 +91,7 @@ int Field::category()
return mImpl->category();
}
-QString Field::categoryLabel( int category )
+TQString Field::categoryLabel( int category )
{
switch ( category ) {
case All:
@@ -113,7 +113,7 @@ QString Field::categoryLabel( int category )
}
}
-QString Field::value( const KABC::Addressee &a )
+TQString Field::value( const KABC::Addressee &a )
{
switch ( mImpl->fieldId() ) {
--CASEVALUE--
@@ -123,7 +123,7 @@ QString Field::value( const KABC::Addressee &a )
if ( a.birthday().isValid() )
return a.birthday().date().toString( Qt::ISODate );
else
- return QString::null;
+ return TQString::null;
case FieldImpl::Url:
return a.url().prettyURL();
case FieldImpl::HomePhone:
@@ -146,7 +146,7 @@ QString Field::value( const KABC::Addressee &a )
return (*it).number();
}
- return QString::null;
+ return TQString::null;
}
case FieldImpl::BusinessPhone:
{
@@ -168,7 +168,7 @@ QString Field::value( const KABC::Addressee &a )
return (*it).number();
}
- return QString::null;
+ return TQString::null;
}
case FieldImpl::MobilePhone:
return a.phoneNumber( PhoneNumber::Cell ).number();
@@ -213,11 +213,11 @@ QString Field::value( const KABC::Addressee &a )
case FieldImpl::CustomField:
return a.custom( mImpl->app(), mImpl->key() );
default:
- return QString::null;
+ return TQString::null;
}
}
-bool Field::setValue( KABC::Addressee &a, const QString &value )
+bool Field::setValue( KABC::Addressee &a, const TQString &value )
{
switch ( mImpl->fieldId() ) {
--CASESETVALUE--
@@ -362,7 +362,7 @@ bool Field::setValue( KABC::Addressee &a, const QString &value )
return true;
}
case FieldImpl::Birthday:
- a.setBirthday( QDate::fromString( value, Qt::ISODate ) );
+ a.setBirthday( TQDate::fromString( value, Qt::ISODate ) );
return true;
case FieldImpl::CustomField:
a.insertCustom( mImpl->app(), mImpl->key(), value );
@@ -372,18 +372,18 @@ bool Field::setValue( KABC::Addressee &a, const QString &value )
}
}
-QString Field::sortKey( const KABC::Addressee &a )
+TQString Field::sortKey( const KABC::Addressee &a )
{
switch ( mImpl->fieldId() ) {
--CASEVALUE--
case FieldImpl::Birthday:
if ( a.birthday().isValid() ) {
- QDate date = a.birthday().date();
- QString key;
+ TQDate date = a.birthday().date();
+ TQString key;
key.sprintf( "%02d-%02d", date.month(), date.day() );
return key;
} else
- return QString( "00-00" );
+ return TQString( "00-00" );
default:
return value( a ).lower();
}
@@ -443,7 +443,7 @@ void Field::deleteFields()
mCustomFields.clear();
}
-void Field::saveFields( const QString &identifier,
+void Field::saveFields( const TQString &identifier,
const Field::List &fields )
{
KConfig *cfg = KGlobal::config();
@@ -452,29 +452,29 @@ void Field::saveFields( const QString &identifier,
saveFields( cfg, identifier, fields );
}
-void Field::saveFields( KConfig *cfg, const QString &identifier,
+void Field::saveFields( KConfig *cfg, const TQString &identifier,
const Field::List &fields )
{
- QValueList<int> fieldIds;
+ TQValueList<int> fieldIds;
int custom = 0;
Field::List::ConstIterator it;
for( it = fields.begin(); it != fields.end(); ++it ) {
fieldIds.append( (*it)->mImpl->fieldId() );
if( (*it)->isCustom() ) {
- QStringList customEntry;
+ TQStringList customEntry;
customEntry << (*it)->mImpl->label();
customEntry << (*it)->mImpl->key();
customEntry << (*it)->mImpl->app();
cfg->writeEntry( "KABC_CustomEntry_" + identifier + "_" +
- QString::number( custom++ ), customEntry );
+ TQString::number( custom++ ), customEntry );
}
}
cfg->writeEntry( identifier, fieldIds );
}
-Field::List Field::restoreFields( const QString &identifier )
+Field::List Field::restoreFields( const TQString &identifier )
{
KConfig *cfg = KGlobal::config();
KConfigGroupSaver( cfg, "KABCFields" );
@@ -482,20 +482,20 @@ Field::List Field::restoreFields( const QString &identifier )
return restoreFields( cfg, identifier );
}
-Field::List Field::restoreFields( KConfig *cfg, const QString &identifier )
+Field::List Field::restoreFields( KConfig *cfg, const TQString &identifier )
{
- const QValueList<int> fieldIds = cfg->readIntListEntry( identifier );
+ const TQValueList<int> fieldIds = cfg->readIntListEntry( identifier );
Field::List fields;
int custom = 0;
- QValueList<int>::ConstIterator it;
+ TQValueList<int>::ConstIterator it;
for( it = fieldIds.begin(); it != fieldIds.end(); ++it ) {
FieldImpl *f = 0;
if ( (*it) == FieldImpl::CustomField ) {
- QStringList customEntry = cfg->readListEntry( "KABC_CustomEntry_" +
+ TQStringList customEntry = cfg->readListEntry( "KABC_CustomEntry_" +
identifier + "_" +
- QString::number( custom++ ) );
+ TQString::number( custom++ ) );
f = new FieldImpl( *it, CustomCategory, customEntry[ 0 ],
customEntry[ 1 ], customEntry[ 2 ] );
} else {
@@ -518,8 +518,8 @@ bool Field::equals( Field *field )
return mImpl->key() == field->mImpl->key();
}
-Field *Field::createCustomField( const QString &label, int category,
- const QString &key, const QString &app )
+Field *Field::createCustomField( const TQString &label, int category,
+ const TQString &key, const TQString &app )
{
Field *field = new Field( new FieldImpl( FieldImpl::CustomField,
category | CustomCategory,
diff --git a/kabc/secrecy.cpp b/kabc/secrecy.cpp
index 1e90d9c81..7ec439b0c 100644
--- a/kabc/secrecy.cpp
+++ b/kabc/secrecy.cpp
@@ -64,7 +64,7 @@ Secrecy::TypeList Secrecy::typeList()
return list;
}
-QString Secrecy::typeLabel( int type )
+TQString Secrecy::typeLabel( int type )
{
switch ( type ) {
case Public:
@@ -82,17 +82,17 @@ QString Secrecy::typeLabel( int type )
}
}
-QString Secrecy::asString() const
+TQString Secrecy::asString() const
{
return typeLabel( mType );
}
-QDataStream &KABC::operator<<( QDataStream &s, const Secrecy &secrecy )
+TQDataStream &KABC::operator<<( TQDataStream &s, const Secrecy &secrecy )
{
return s << secrecy.mType;
}
-QDataStream &KABC::operator>>( QDataStream &s, Secrecy &secrecy )
+TQDataStream &KABC::operator>>( TQDataStream &s, Secrecy &secrecy )
{
s >> secrecy.mType;
diff --git a/kabc/secrecy.h b/kabc/secrecy.h
index e76592fa5..4f9ef6564 100644
--- a/kabc/secrecy.h
+++ b/kabc/secrecy.h
@@ -21,7 +21,7 @@
#ifndef KABC_SECRECY_H
#define KABC_SECRECY_H
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include <kdelibs_export.h>
@@ -29,11 +29,11 @@ namespace KABC {
class KABC_EXPORT Secrecy
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Secrecy & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Secrecy & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Secrecy & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Secrecy & );
public:
- typedef QValueList<int> TypeList;
+ typedef TQValueList<int> TypeList;
/**
* Secrecy types
@@ -82,19 +82,19 @@ public:
/**
* Returns a translated label for a given secrecy type.
*/
- static QString typeLabel( int type );
+ static TQString typeLabel( int type );
/**
* For debug.
*/
- QString asString() const;
+ TQString asString() const;
private:
int mType;
};
-KABC_EXPORT QDataStream& operator<<( QDataStream &s, const Secrecy &secrecy );
-KABC_EXPORT QDataStream& operator>>( QDataStream &s, Secrecy &secrecy );
+KABC_EXPORT TQDataStream& operator<<( TQDataStream &s, const Secrecy &secrecy );
+KABC_EXPORT TQDataStream& operator>>( TQDataStream &s, Secrecy &secrecy );
}
#endif
diff --git a/kabc/sortmode.cpp b/kabc/sortmode.cpp
index c21a871cb..ee9a6f82d 100644
--- a/kabc/sortmode.cpp
+++ b/kabc/sortmode.cpp
@@ -41,13 +41,13 @@ bool NameSortMode::lesser( const KABC::Addressee &first, const KABC::Addressee &
switch ( mNameType ) {
case FormattedName:
- lesser = QString::localeAwareCompare( first.formattedName(), second.formattedName() ) < 0;
+ lesser = TQString::localeAwareCompare( first.formattedName(), second.formattedName() ) < 0;
break;
case FamilyName:
- lesser = QString::localeAwareCompare( first.familyName(), second.familyName() ) < 0;
+ lesser = TQString::localeAwareCompare( first.familyName(), second.familyName() ) < 0;
break;
case GivenName:
- lesser = QString::localeAwareCompare( first.givenName(), second.givenName() ) < 0;
+ lesser = TQString::localeAwareCompare( first.givenName(), second.givenName() ) < 0;
break;
default:
lesser = false;
@@ -70,7 +70,7 @@ bool FieldSortMode::lesser( const KABC::Addressee &first, const KABC::Addressee
if ( !mField )
return false;
else {
- bool lesser = QString::localeAwareCompare( mField->value( first ), mField->value( second ) ) < 0;
+ bool lesser = TQString::localeAwareCompare( mField->value( first ), mField->value( second ) ) < 0;
if ( !mAscendingOrder )
lesser = !lesser;
diff --git a/kabc/sound.cpp b/kabc/sound.cpp
index 48f12e4f1..cf645be83 100644
--- a/kabc/sound.cpp
+++ b/kabc/sound.cpp
@@ -20,7 +20,7 @@
#include "sound.h"
-#include <qdatastream.h>
+#include <tqdatastream.h>
using namespace KABC;
@@ -29,12 +29,12 @@ Sound::Sound()
{
}
-Sound::Sound( const QString &url )
+Sound::Sound( const TQString &url )
: mUrl( url ), mIntern( false )
{
}
-Sound::Sound( const QByteArray &data )
+Sound::Sound( const TQByteArray &data )
: mData( data ), mIntern( true )
{
}
@@ -63,13 +63,13 @@ bool Sound::operator!=( const Sound &s ) const
return !( s == *this );
}
-void Sound::setUrl( const QString &url )
+void Sound::setUrl( const TQString &url )
{
mUrl = url;
mIntern = false;
}
-void Sound::setData( const QByteArray &data )
+void Sound::setData( const TQByteArray &data )
{
mData = data;
mIntern = true;
@@ -86,17 +86,17 @@ bool Sound::isEmpty() const
}
-QString Sound::url() const
+TQString Sound::url() const
{
return mUrl;
}
-QByteArray Sound::data() const
+TQByteArray Sound::data() const
{
return mData;
}
-QString Sound::asString() const
+TQString Sound::asString() const
{
if ( mIntern )
return "intern sound";
@@ -104,13 +104,13 @@ QString Sound::asString() const
return mUrl;
}
-QDataStream &KABC::operator<<( QDataStream &s, const Sound &sound )
+TQDataStream &KABC::operator<<( TQDataStream &s, const Sound &sound )
{
return s << sound.mIntern << sound.mUrl;
// return s << sound.mIntern << sound.mUrl << sound.mData;
}
-QDataStream &KABC::operator>>( QDataStream &s, Sound &sound )
+TQDataStream &KABC::operator>>( TQDataStream &s, Sound &sound )
{
s >> sound.mIntern >> sound.mUrl;
// s >> sound.mIntern >> sound.mUrl >> sound.mData;
diff --git a/kabc/sound.h b/kabc/sound.h
index db488530e..350042cc5 100644
--- a/kabc/sound.h
+++ b/kabc/sound.h
@@ -21,8 +21,8 @@
#ifndef KABC_SOUND_H
#define KABC_SOUND_H
-#include <qcstring.h>
-#include <qstring.h>
+#include <tqcstring.h>
+#include <tqstring.h>
#include <kdelibs_export.h>
@@ -39,7 +39,7 @@ namespace KABC {
* tmp.close();
* KAudioPlayer::play( tmp.name() );
* } else if(!sound.url().isEmpty()) {
- * QString tmpFile;
+ * TQString tmpFile;
* if(!KIO::NetAccess::download(KURL(themeURL.url()), tmpFile, NULL))
* {
* KMessageBox::error(0L,
@@ -58,8 +58,8 @@ namespace KABC {
*/
class KABC_EXPORT Sound
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const Sound & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, Sound & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Sound & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Sound & );
public:
@@ -73,14 +73,14 @@ public:
*
* @param url A URL that describes the position of the sound file.
*/
- Sound( const QString &url );
+ Sound( const TQString &url );
/**
* Consturctor.
*
* @param data The raw data of the sound.
*/
- Sound( const QByteArray &data );
+ Sound( const TQByteArray &data );
/**
* Destructor.
@@ -98,7 +98,7 @@ public:
*
* @param url The location URL of the sound file.
*/
- void setUrl( const QString &url );
+ void setUrl( const TQString &url );
/**
* Test if this sound file has been set.
@@ -113,7 +113,7 @@ public:
*
* @param data The raw data of the sound.
*/
- void setData( const QByteArray &data );
+ void setData( const TQByteArray &data );
/**
* Returns whether the sound is described by a URL (extern) or
@@ -127,27 +127,27 @@ public:
/**
* Returns the location URL of this sound.
*/
- QString url() const;
+ TQString url() const;
/**
* Returns the raw data of this sound.
*/
- QByteArray data() const;
+ TQByteArray data() const;
/**
* Returns string representation of the sound.
*/
- QString asString() const;
+ TQString asString() const;
private:
- QString mUrl;
- QByteArray mData;
+ TQString mUrl;
+ TQByteArray mData;
int mIntern;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const Sound & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, Sound & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Sound & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, Sound & );
}
#endif
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 95c222bf3..6b574d86f 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -40,12 +40,12 @@ bool StdAddressBook::mAutomaticSave = true;
static KStaticDeleter<StdAddressBook> addressBookDeleter;
-QString StdAddressBook::fileName()
+TQString StdAddressBook::fileName()
{
return locateLocal( "data", "kabc/std.vcf" );
}
-QString StdAddressBook::directoryName()
+TQString StdAddressBook::directoryName()
{
return locateLocal( "data", "kabc/stdvcf" );
}
@@ -100,18 +100,18 @@ void StdAddressBook::init( bool asynchronous )
for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
(*it)->setAddressBook( this );
if ( !(*it)->open() ) {
- error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
+ error( TQString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
continue;
}
- connect( *it, SIGNAL( loadingFinished( Resource* ) ),
- this, SLOT( resourceLoadingFinished( Resource* ) ) );
- connect( *it, SIGNAL( savingFinished( Resource* ) ),
- this, SLOT( resourceSavingFinished( Resource* ) ) );
-
- connect( *it, SIGNAL( loadingError( Resource*, const QString& ) ),
- this, SLOT( resourceLoadingError( Resource*, const QString& ) ) );
- connect( *it, SIGNAL( savingError( Resource*, const QString& ) ),
- this, SLOT( resourceSavingError( Resource*, const QString& ) ) );
+ connect( *it, TQT_SIGNAL( loadingFinished( Resource* ) ),
+ this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
+ connect( *it, TQT_SIGNAL( savingFinished( Resource* ) ),
+ this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
+
+ connect( *it, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
+ this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+ connect( *it, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
+ this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
}
Resource *res = standardResource();
diff --git a/kabc/stdaddressbook.h b/kabc/stdaddressbook.h
index fb4afa28b..935b2bad1 100644
--- a/kabc/stdaddressbook.h
+++ b/kabc/stdaddressbook.h
@@ -93,12 +93,12 @@ class KABC_EXPORT StdAddressBook : public AddressBook
/**
Returns the default file name for vcard-based addressbook
*/
- static QString fileName();
+ static TQString fileName();
/**
Returns the default directory name for vcard-based addressbook
*/
- static QString directoryName();
+ static TQString directoryName();
/**
Sets the automatic save property of the address book.
diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp
index 90013a157..0dd6a7a05 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/kabc/tests/bigwrite.cpp
@@ -25,9 +25,9 @@ int main(int argc,char **argv)
for( int i = 0; i < 5000; ++i ) {
Addressee a;
- a.setGivenName( "number" + QString::number( i ) );
+ a.setGivenName( "number" + TQString::number( i ) );
a.setFamilyName( "Name" );
- a.insertEmail( QString::number( i ) + "@domain" );
+ a.insertEmail( TQString::number( i ) + "@domain" );
ab.insertAddressee( a );
}
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index 32251303b..b57724c15 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -42,20 +42,20 @@ int main(int argc,char **argv)
KApplication app;
- QString filename = StdAddressBook::fileName();
+ TQString filename = StdAddressBook::fileName();
- QFile f( filename );
+ TQFile f( filename );
if ( !f.open( IO_ReadOnly ) ) {
kdDebug() << "Error opening file '" << filename << "' for reading." << endl;
return 1;
}
- QTextStream t( &f );
- t.setEncoding(QTextStream::UnicodeUTF8);
- QString text = t.read();
+ TQTextStream t( &f );
+ t.setEncoding(TQTextStream::UnicodeUTF8);
+ TQString text = t.read();
f.close();
- text = QString::fromUtf8( text.local8Bit() );
+ text = TQString::fromUtf8( text.local8Bit() );
text.replace( "\n", "\r\n" );
if ( !f.open( IO_WriteOnly ) ) {
@@ -63,8 +63,8 @@ int main(int argc,char **argv)
return 1;
}
- QTextStream t2( &f );
- t2.setEncoding(QTextStream::UnicodeUTF8);
+ TQTextStream t2( &f );
+ t2.setEncoding(TQTextStream::UnicodeUTF8);
t2 << text;
f.close();
}
diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp
index 70c07b446..0dea6f742 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/kabc/tests/testaddresslineedit.cpp
@@ -21,7 +21,7 @@ int main( int argc,char **argv )
lineEdit->show();
app.setMainWidget( lineEdit );
- QObject::connect( &app, SIGNAL( lastWindowClosed() ), &app, SLOT( quit() ) );
+ TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
app.exec();
diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp
index a81f8c0dc..abf551ace 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/kabc/tests/testdistlist.cpp
@@ -1,4 +1,4 @@
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -30,7 +30,7 @@ int main(int argc,char **argv)
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if (args->isSet("list")) {
- QString name = args->getOption("list");
+ TQString name = args->getOption("list");
DistributionListManager *manager =
new DistributionListManager( StdAddressBook::self() );
@@ -51,7 +51,7 @@ int main(int argc,char **argv)
editor->show();
app.setMainWidget(editor);
- QObject::connect( &app, SIGNAL( lastWindowClosed() ), &app, SLOT( quit() ) );
+ TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
app.exec();
diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp
index 15fa11c44..c5d2d12e4 100644
--- a/kabc/tests/testkabc.cpp
+++ b/kabc/tests/testkabc.cpp
@@ -5,8 +5,8 @@
#include <kcmdlineargs.h>
#include <kstandarddirs.h>
-#include <qfile.h>
-#include <qimage.h>
+#include <tqfile.h>
+#include <tqimage.h>
#include "geo.h"
#include "secrecy.h"
@@ -31,7 +31,7 @@ int main(int argc,char **argv)
#ifdef READ
AddressBook::Iterator it;
for ( it = ab->begin(); it != ab->end(); ++it ) {
- QString vcard;
+ TQString vcard;
VCardConverter converter;
converter.addresseeToVCard( *it, vcard );
kdDebug() << "card=" << vcard << endl;
@@ -44,11 +44,11 @@ int main(int argc,char **argv)
Picture pic;
- QImage img;
+ TQImage img;
img.load("/home/tobias/test.png");
/*
pic.setData(img);
- pic.setType(QImage::imageFormat("/home/tobias/test.png"));
+ pic.setType(TQImage::imageFormat("/home/tobias/test.png"));
*/
pic.setUrl("http://www.mypict.de");
addr.setLogo( pic );
diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp
index c497a9ead..3c9a23792 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/kabc/tests/testkabcdlg.cpp
@@ -1,4 +1,4 @@
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kaboutdata.h>
#include <kapplication.h>
diff --git a/kabc/tests/testldapclient.cpp b/kabc/tests/testldapclient.cpp
index f4616d16c..2fa6a1c72 100644
--- a/kabc/tests/testldapclient.cpp
+++ b/kabc/tests/testldapclient.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kcmdlineargs.h>
-#include <qeventloop.h>
+#include <tqeventloop.h>
#include <assert.h>
#include <stdlib.h>
@@ -50,12 +50,12 @@ void TestLDAPClient::runAll()
testIntevation();
}
-bool TestLDAPClient::check(const QString& txt, QString a, QString b)
+bool TestLDAPClient::check(const TQString& txt, TQString a, TQString b)
{
if (a.isEmpty())
- a = QString::null;
+ a = TQString::null;
if (b.isEmpty())
- b = QString::null;
+ b = TQString::null;
if (a == b) {
kdDebug() << txt << " : checking '" << a << "' against expected value '" << b << "'... " << "ok" << endl;
}
@@ -82,50 +82,50 @@ void TestLDAPClient::testIntevation()
mClient->setBase( "o=Intevation GmbH,c=de" );
// Same list as in kaddressbook's ldapsearchdialog
- QStringList attrs;
+ TQStringList attrs;
attrs << "l" << "Company" << "co" << "department" << "description" << "mail" << "facsimileTelephoneNumber" << "cn" << "homePhone" << "mobile" << "o" << "pager" << "postalAddress" << "st" << "street" << "title" << "uid" << "telephoneNumber" << "postalCode" << "objectClass";
// the list from ldapclient.cpp
//attrs << "cn" << "mail" << "givenname" << "sn" << "objectClass";
mClient->setAttrs( attrs );
// Taken from LdapSearch
- //QString mSearchText = QString::fromUtf8( "Till" );
- //QString filter = QString( "&(|(objectclass=person)(objectclass=groupOfNames)(mail=*))(|(cn=%1*)(mail=%2*)(givenName=%3*)(sn=%4*))" )
+ //TQString mSearchText = TQString::fromUtf8( "Till" );
+ //TQString filter = TQString( "&(|(objectclass=person)(objectclass=groupOfNames)(mail=*))(|(cn=%1*)(mail=%2*)(givenName=%3*)(sn=%4*))" )
// .arg( mSearchText ).arg( mSearchText ).arg( mSearchText ).arg( mSearchText );
// For some reason a fromUtf8 broke the search for me (no results).
// But this certainly looks fishy, it might break on non-utf8 systems.
- QString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*Ägypten MDK*)(sn=*Ägypten MDK*))";
-
- connect( mClient, SIGNAL( result( const KABC::LdapObject& ) ),
- this, SLOT( slotLDAPResult( const KABC::LdapObject& ) ) );
- connect( mClient, SIGNAL( done() ),
- this, SLOT( slotLDAPDone() ) );
- connect( mClient, SIGNAL( error( const QString& ) ),
- this, SLOT( slotLDAPError( const QString& ) ) );
+ TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*Ägypten MDK*)(sn=*Ägypten MDK*))";
+
+ connect( mClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
+ this, TQT_SLOT( slotLDAPResult( const KABC::LdapObject& ) ) );
+ connect( mClient, TQT_SIGNAL( done() ),
+ this, TQT_SLOT( slotLDAPDone() ) );
+ connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
+ this, TQT_SLOT( slotLDAPError( const TQString& ) ) );
mClient->startQuery( filter );
kapp->eventLoop()->enterLoop();
delete mClient; mClient = 0;
}
// from kaddressbook... ugly though...
-static QString asUtf8( const QByteArray &val )
+static TQString asUtf8( const TQByteArray &val )
{
if ( val.isEmpty() )
- return QString::null;
+ return TQString::null;
const char *data = val.data();
- //QString::fromUtf8() bug workaround
+ //TQString::fromUtf8() bug workaround
if ( data[ val.size() - 1 ] == '\0' )
- return QString::fromUtf8( data, val.size() - 1 );
+ return TQString::fromUtf8( data, val.size() - 1 );
else
- return QString::fromUtf8( data, val.size() );
+ return TQString::fromUtf8( data, val.size() );
}
-static QString join( const KABC::LdapAttrValue& lst, const QString& sep )
+static TQString join( const KABC::LdapAttrValue& lst, const TQString& sep )
{
- QString res;
+ TQString res;
bool already = false;
for ( KABC::LdapAttrValue::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
if ( already )
@@ -138,15 +138,15 @@ static QString join( const KABC::LdapAttrValue& lst, const QString& sep )
void TestLDAPClient::slotLDAPResult( const KABC::LdapObject& obj )
{
- QString cn = join( obj.attrs[ "cn" ], ", " );
+ TQString cn = join( obj.attrs[ "cn" ], ", " );
kdDebug() << " cn:" << cn << endl;
assert( !obj.attrs[ "mail" ].isEmpty() );
- QString mail = join( obj.attrs[ "mail" ], ", " );
+ TQString mail = join( obj.attrs[ "mail" ], ", " );
kdDebug() << " mail:" << mail << endl;
assert( mail.contains( '@' ) );
}
-void TestLDAPClient::slotLDAPError( const QString& err )
+void TestLDAPClient::slotLDAPError( const TQString& err )
{
kdDebug() << k_funcinfo << err << endl;
::exit( 1 );
diff --git a/kabc/tests/testldapclient.h b/kabc/tests/testldapclient.h
index 583ead073..ea1293b51 100644
--- a/kabc/tests/testldapclient.h
+++ b/kabc/tests/testldapclient.h
@@ -19,7 +19,7 @@
#ifndef TESTLDAPCLIENT_H
#define TESTLDAPCLIENT_H
-#include <qobject.h>
+#include <tqobject.h>
#include "../ldapclient.h"
typedef KABC::LdapClient LdapClient;
@@ -39,11 +39,11 @@ public:
private slots:
void slotLDAPResult( const KABC::LdapObject& );
- void slotLDAPError( const QString& );
+ void slotLDAPError( const TQString& );
void slotLDAPDone();
private:
- bool check(const QString& txt, QString a, QString b);
+ bool check(const TQString& txt, TQString a, TQString b);
LdapClient* mClient;
};
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index c922c7a7e..4674606e0 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -33,12 +33,12 @@
#include <kmessagebox.h>
#include <kdialog.h>
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlistview.h>
-#include <qdir.h>
+#include <tqwidget.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqlistview.h>
+#include <tqdir.h>
#include <iostream>
@@ -47,9 +47,9 @@
using namespace KABC;
-LockWidget::LockWidget( const QString &identifier )
+LockWidget::LockWidget( const TQString &identifier )
{
- QVBoxLayout *topLayout = new QVBoxLayout( this );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->setMargin( KDialog::marginHint() );
topLayout->setSpacing( KDialog::spacingHint() );
@@ -60,31 +60,31 @@ LockWidget::LockWidget( const QString &identifier )
int pid = getpid();
- QLabel *pidLabel = new QLabel( "Process ID: " + QString::number( pid ),
+ TQLabel *pidLabel = new TQLabel( "Process ID: " + TQString::number( pid ),
this );
topLayout->addWidget( pidLabel );
- QHBoxLayout *identifierLayout = new QHBoxLayout( topLayout );
+ TQHBoxLayout *identifierLayout = new TQHBoxLayout( topLayout );
- QLabel *resourceLabel = new QLabel( "Identifier:", this );
+ TQLabel *resourceLabel = new TQLabel( "Identifier:", this );
identifierLayout->addWidget( resourceLabel );
- QLabel *resourceIdentifier = new QLabel( identifier, this );
+ TQLabel *resourceIdentifier = new TQLabel( identifier, this );
identifierLayout->addWidget( resourceIdentifier );
- mStatus = new QLabel( "Status: Unlocked", this );
+ mStatus = new TQLabel( "Status: Unlocked", this );
topLayout->addWidget( mStatus );
- QPushButton *button = new QPushButton( "Lock", this );
+ TQPushButton *button = new TQPushButton( "Lock", this );
topLayout->addWidget( button );
- connect( button, SIGNAL( clicked() ), SLOT( lock() ) );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ) );
- button = new QPushButton( "Unlock", this );
+ button = new TQPushButton( "Unlock", this );
topLayout->addWidget( button );
- connect( button, SIGNAL( clicked() ), SLOT( unlock() ) );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( unlock() ) );
}
- mLockView = new QListView( this );
+ mLockView = new TQListView( this );
topLayout->addWidget( mLockView );
mLockView->addColumn( "Lock File" );
mLockView->addColumn( "PID" );
@@ -92,17 +92,17 @@ LockWidget::LockWidget( const QString &identifier )
updateLockView();
- QPushButton *quitButton = new QPushButton( "Quit", this );
+ TQPushButton *quitButton = new TQPushButton( "Quit", this );
topLayout->addWidget( quitButton );
- connect( quitButton, SIGNAL( clicked() ), SLOT( close() ) );
+ connect( quitButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) );
KDirWatch *watch = KDirWatch::self();
- connect( watch, SIGNAL( dirty( const QString & ) ),
- SLOT( updateLockView() ) );
- connect( watch, SIGNAL( created( const QString & ) ),
- SLOT( updateLockView() ) );
- connect( watch, SIGNAL( deleted( const QString & ) ),
- SLOT( updateLockView() ) );
+ connect( watch, TQT_SIGNAL( dirty( const TQString & ) ),
+ TQT_SLOT( updateLockView() ) );
+ connect( watch, TQT_SIGNAL( created( const TQString & ) ),
+ TQT_SLOT( updateLockView() ) );
+ connect( watch, TQT_SIGNAL( deleted( const TQString & ) ),
+ TQT_SLOT( updateLockView() ) );
watch->addDir( Lock::locksDir() );
watch->startScan();
}
@@ -116,20 +116,20 @@ void LockWidget::updateLockView()
{
mLockView->clear();
- QDir dir( Lock::locksDir() );
+ TQDir dir( Lock::locksDir() );
- QStringList files = dir.entryList( "*.lock" );
+ TQStringList files = dir.entryList( "*.lock" );
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for( it = files.begin(); it != files.end(); ++it ) {
if ( *it == "." || *it == ".." ) continue;
- QString app;
+ TQString app;
int pid;
if ( !Lock::readLockFile( dir.filePath( *it ), pid, app ) ) {
kdWarning() << "Unable to open lock file '" << *it << "'" << endl;
} else {
- new QListViewItem( mLockView, *it, QString::number( pid ), app );
+ new TQListViewItem( mLockView, *it, TQString::number( pid ), app );
}
}
}
@@ -171,7 +171,7 @@ int main(int argc,char **argv)
KApplication app;
- QString identifier;
+ TQString identifier;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if ( args->count() == 1 ) {
diff --git a/kabc/tests/testlock.h b/kabc/tests/testlock.h
index 16c128bf1..bd59d2f5e 100644
--- a/kabc/tests/testlock.h
+++ b/kabc/tests/testlock.h
@@ -23,7 +23,7 @@
#include "lock.h"
-#include <qwidget.h>
+#include <tqwidget.h>
class QLabel;
class QListView;
@@ -32,7 +32,7 @@ class KABC_EXPORT LockWidget : public QWidget
{
Q_OBJECT
public:
- LockWidget( const QString &identifier );
+ LockWidget( const TQString &identifier );
~LockWidget();
protected slots:
@@ -44,8 +44,8 @@ class KABC_EXPORT LockWidget : public QWidget
private:
KABC::Lock *mLock;
- QLabel *mStatus;
- QListView *mLockView;
+ TQLabel *mStatus;
+ TQListView *mLockView;
};
#endif
diff --git a/kabc/timezone.cpp b/kabc/timezone.cpp
index ddb28e526..59a184c6d 100644
--- a/kabc/timezone.cpp
+++ b/kabc/timezone.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qdatastream.h>
+#include <tqdatastream.h>
#include "timezone.h"
@@ -66,17 +66,17 @@ bool TimeZone::operator!=( const TimeZone &t ) const
return false;
}
-QString TimeZone::asString() const
+TQString TimeZone::asString() const
{
- return QString::number( mOffset );
+ return TQString::number( mOffset );
}
-QDataStream &KABC::operator<<( QDataStream &s, const TimeZone &zone )
+TQDataStream &KABC::operator<<( TQDataStream &s, const TimeZone &zone )
{
return s << zone.mOffset;
}
-QDataStream &KABC::operator>>( QDataStream &s, TimeZone &zone )
+TQDataStream &KABC::operator>>( TQDataStream &s, TimeZone &zone )
{
s >> zone.mOffset;
zone.mValid = true;
diff --git a/kabc/timezone.h b/kabc/timezone.h
index d3cc00d8e..aa0dac676 100644
--- a/kabc/timezone.h
+++ b/kabc/timezone.h
@@ -21,7 +21,7 @@
#ifndef KABC_TIMEZONE_H
#define KABC_TIMEZONE_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdelibs_export.h>
@@ -34,8 +34,8 @@ namespace KABC {
*/
class KABC_EXPORT TimeZone
{
- friend KABC_EXPORT QDataStream &operator<<( QDataStream &, const TimeZone & );
- friend KABC_EXPORT QDataStream &operator>>( QDataStream &, TimeZone & );
+ friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const TimeZone & );
+ friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, TimeZone & );
public:
@@ -74,7 +74,7 @@ public:
/**
* Return string representation of time zone offset.
*/
- QString asString() const;
+ TQString asString() const;
private:
int mOffset; // Offset in minutes
@@ -82,8 +82,8 @@ private:
bool mValid;
};
-KABC_EXPORT QDataStream &operator<<( QDataStream &, const TimeZone & );
-KABC_EXPORT QDataStream &operator>>( QDataStream &, TimeZone & );
+KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const TimeZone & );
+KABC_EXPORT TQDataStream &operator>>( TQDataStream &, TimeZone & );
}
#endif
diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp
index fa46499c3..5ad56f4fb 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/kabc/vcard/AdrParam.cpp
@@ -38,7 +38,7 @@ AdrParam::AdrParam(const AdrParam & x)
{
}
-AdrParam::AdrParam(const QCString & s)
+AdrParam::AdrParam(const TQCString & s)
: Param(s)
{
}
@@ -56,7 +56,7 @@ AdrParam::operator = (AdrParam & x)
}
AdrParam &
-AdrParam::operator = (const QCString & s)
+AdrParam::operator = (const TQCString & s)
{
Param::operator = (s);
@@ -77,7 +77,7 @@ AdrParam::operator == (AdrParam & x)
if (x.adrTypeList().count() != adrTypeList_.count())
return false;
- QStrListIterator it(x.adrTypeList_);
+ TQStrListIterator it(x.adrTypeList_);
for (; it.current(); ++it)
if (!adrTypeList_.find(it.current()))
@@ -114,7 +114,7 @@ AdrParam::_assemble()
return;
}
- QStrListIterator it(adrTypeList_);
+ TQStrListIterator it(adrTypeList_);
for (; it.current(); ++it) {
diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp
index 7ecef332a..535ba6980 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/kabc/vcard/AdrValue.cpp
@@ -45,7 +45,7 @@ AdrValue::AdrValue(const AdrValue & x)
{
}
-AdrValue::AdrValue(const QCString & s)
+AdrValue::AdrValue(const TQCString & s)
: Value(s)
{
}
@@ -68,7 +68,7 @@ AdrValue::operator = (AdrValue & x)
}
AdrValue &
-AdrValue::operator = (const QCString & s)
+AdrValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
@@ -105,7 +105,7 @@ AdrValue::_parse()
{
vDebug("AdrValue::_parse()");
- QStrList l;
+ TQStrList 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 5625e0071..9e4531b02 100644
--- a/kabc/vcard/AgentParam.cpp
+++ b/kabc/vcard/AgentParam.cpp
@@ -39,7 +39,7 @@ AgentParam::AgentParam(const AgentParam & x)
{
}
-AgentParam::AgentParam(const QCString & s)
+AgentParam::AgentParam(const TQCString & s)
: Param(s)
{
}
@@ -57,7 +57,7 @@ AgentParam::operator = (AgentParam & x)
}
AgentParam &
-AgentParam::operator = (const QCString & s)
+AgentParam::operator = (const TQCString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/AgentValue.cpp b/kabc/vcard/AgentValue.cpp
index bccde80cf..7d356f8d7 100644
--- a/kabc/vcard/AgentValue.cpp
+++ b/kabc/vcard/AgentValue.cpp
@@ -37,7 +37,7 @@ AgentValue::AgentValue(const AgentValue & x)
{
}
-AgentValue::AgentValue(const QCString & s)
+AgentValue::AgentValue(const TQCString & s)
: Value(s)
{
}
@@ -52,7 +52,7 @@ AgentValue::operator = (AgentValue & x)
}
AgentValue &
-AgentValue::operator = (const QCString & s)
+AgentValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/ClassValue.cpp b/kabc/vcard/ClassValue.cpp
index f01e5a65b..3dd65aecd 100644
--- a/kabc/vcard/ClassValue.cpp
+++ b/kabc/vcard/ClassValue.cpp
@@ -40,7 +40,7 @@ ClassValue::ClassValue(const ClassValue & x)
{
}
-ClassValue::ClassValue(const QCString & s)
+ClassValue::ClassValue(const TQCString & s)
: Value(s)
{
}
@@ -58,7 +58,7 @@ ClassValue::operator = (ClassValue & x)
}
ClassValue &
-ClassValue::operator = (const QCString & s)
+ClassValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 566eb6a79..52bcdf4f5 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -21,9 +21,9 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qcstring.h>
-#include <qstrlist.h>
-#include <qregexp.h>
+#include <tqcstring.h>
+#include <tqstrlist.h>
+#include <tqregexp.h>
#include <kdebug.h>
@@ -85,7 +85,7 @@ ContentLine::ContentLine(const ContentLine & x)
{
}
-ContentLine::ContentLine(const QCString & s)
+ContentLine::ContentLine(const TQCString & s)
: Entity(s),
value_(0),
paramType_( ParamUnknown ),
@@ -107,7 +107,7 @@ ContentLine::operator = (ContentLine & x)
}
ContentLine &
-ContentLine::operator = (const QCString & s)
+ContentLine::operator = (const TQCString & s)
{
Entity::operator = (s);
delete value_;
@@ -120,7 +120,7 @@ ContentLine::operator == (ContentLine & x)
{
x.parse();
- QPtrListIterator<Param> it(x.paramList());
+ TQPtrListIterator<Param> it(x.paramList());
if (!paramList_.find(it.current()))
return false;
@@ -140,7 +140,7 @@ ContentLine::_parse()
vDebug("parse");
// Unqote newlines
- strRep_ = strRep_.replace( QRegExp( "\\\\n" ), "\n" );
+ strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" );
int split = strRep_.find(':');
@@ -149,8 +149,8 @@ ContentLine::_parse()
return;
}
- QCString firstPart(strRep_.left(split));
- QCString valuePart(strRep_.mid(split + 1));
+ TQCString firstPart(strRep_.left(split));
+ TQCString valuePart(strRep_.mid(split + 1));
split = firstPart.find('.');
@@ -165,7 +165,7 @@ ContentLine::_parse()
// Now we have the group, the name and param list together and the value.
- QStrList l;
+ TQStrList l;
RTokenise(firstPart, ";", l);
@@ -187,11 +187,11 @@ ContentLine::_parse()
// For each parameter, create a new parameter of the correct type.
- QStrListIterator it(l);
+ TQStrListIterator it(l);
for (; it.current(); ++it, i++) {
- QCString str = *it;
+ TQCString str = *it;
split = str.find("=");
if (split < 0 ) {
@@ -199,13 +199,13 @@ ContentLine::_parse()
continue;
}
- QCString paraName = str.left(split);
- QCString paraValue = str.mid(split + 1);
+ TQCString paraName = str.left(split);
+ TQCString paraValue = str.mid(split + 1);
- QStrList paraValues;
+ TQStrList paraValues;
RTokenise(paraValue, ",", paraValues);
- QStrListIterator it2( paraValues );
+ TQStrListIterator it2( paraValues );
for(; it2.current(); ++it2) {
@@ -254,7 +254,7 @@ ContentLine::_assemble()
vDebug("Assemble (argl) - my name is \"" + name_ + "\"");
strRep_.truncate(0);
- QCString line;
+ TQCString line;
if (!group_.isEmpty())
line += group_ + '.';
@@ -275,7 +275,7 @@ ContentLine::_assemble()
}
// Quote newlines
- line = line.replace( QRegExp( "\n" ), "\\n" );
+ line = line.replace( TQRegExp( "\n" ), "\\n" );
// Fold lines longer than 72 chars
const int maxLen = 72;
diff --git a/kabc/vcard/DateParam.cpp b/kabc/vcard/DateParam.cpp
index 52af08997..ffaf4b3f6 100644
--- a/kabc/vcard/DateParam.cpp
+++ b/kabc/vcard/DateParam.cpp
@@ -37,7 +37,7 @@ DateParam::DateParam(const DateParam & x)
{
}
-DateParam::DateParam(const QCString & s)
+DateParam::DateParam(const TQCString & s)
: Param(s)
{
}
@@ -52,7 +52,7 @@ DateParam::operator = (DateParam & x)
}
DateParam &
-DateParam::operator = (const QCString & s)
+DateParam::operator = (const TQCString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp
index c5c5c8554..aedfe5eba 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/kabc/vcard/DateValue.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kdebug.h>
@@ -65,7 +65,7 @@ DateValue::DateValue(
assembled_ = false;
}
-DateValue::DateValue(const QDate & d)
+DateValue::DateValue(const TQDate & d)
: Value (),
year_ (d.year()),
month_ (d.month()),
@@ -76,7 +76,7 @@ DateValue::DateValue(const QDate & d)
assembled_ = false;
}
-DateValue::DateValue(const QDateTime & d)
+DateValue::DateValue(const TQDateTime & d)
: Value (),
year_ (d.date().year()),
month_ (d.date().month()),
@@ -105,7 +105,7 @@ DateValue::DateValue(const DateValue & x)
hasTime_ = x.hasTime_;
}
-DateValue::DateValue(const QCString & s)
+DateValue::DateValue(const TQCString & s)
: Value(s)
{
}
@@ -120,7 +120,7 @@ DateValue::operator = (DateValue & x)
}
DateValue &
-DateValue::operator = (const QCString & s)
+DateValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
@@ -154,8 +154,8 @@ DateValue::_parse()
int timeSep = strRep_.find('T');
- QCString dateStr;
- QCString timeStr;
+ TQCString dateStr;
+ TQCString timeStr;
if (timeSep == -1) {
@@ -173,7 +173,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// DATE
- dateStr.replace(QRegExp("-"), "");
+ dateStr.replace(TQRegExp("-"), "");
kdDebug(5710) << "dateStr: " << dateStr << endl;
@@ -196,7 +196,7 @@ DateValue::_parse()
if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
- QCString zoneStr(timeStr.mid(zoneSep + 1));
+ TQCString zoneStr(timeStr.mid(zoneSep + 1));
vDebug("zoneStr == " + zoneStr);
zonePositive_ = (zoneStr[0] == '+');
@@ -211,13 +211,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);
+ TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
secFrac_ = quirkafleeg.toDouble();
}
/////////////////////////////////////////////////////////////// HMS
- timeStr.replace(QRegExp(":"), "");
+ timeStr.replace(TQRegExp(":"), "");
hour_ = timeStr.left(2).toInt();
minute_ = timeStr.mid(2, 2).toInt();
@@ -229,9 +229,9 @@ DateValue::_assemble()
{
vDebug("DateValue::_assemble");
- QCString year;
- QCString month;
- QCString day;
+ TQCString year;
+ TQCString month;
+ TQCString day;
year.setNum( year_ );
month.setNum( month_ );
@@ -243,9 +243,9 @@ DateValue::_assemble()
strRep_ = year + '-' + month + '-' + day;
if ( hasTime_ ) {
- QCString hour;
- QCString minute;
- QCString second;
+ TQCString hour;
+ TQCString minute;
+ TQCString second;
hour.setNum( hour_ );
minute.setNum( minute_ );
@@ -402,7 +402,7 @@ DateValue::setZoneMinute(unsigned int i)
DateValue::qdate()
{
parse();
- QDate d(year_, month_, day_);
+ TQDate d(year_, month_, day_);
return d;
}
@@ -410,7 +410,7 @@ DateValue::qdate()
DateValue::qtime()
{
parse();
- QTime t(hour_, minute_, second_);
+ TQTime t(hour_, minute_, second_);
// t.setMs(1 / secFrac_);
return t;
}
@@ -419,7 +419,7 @@ DateValue::qtime()
DateValue::qdt()
{
parse();
- QDateTime dt;
+ TQDateTime dt;
dt.setDate(qdate());
dt.setTime(qtime());
return dt;
diff --git a/kabc/vcard/EmailParam.cpp b/kabc/vcard/EmailParam.cpp
index 8c87477bc..9027494ad 100644
--- a/kabc/vcard/EmailParam.cpp
+++ b/kabc/vcard/EmailParam.cpp
@@ -40,7 +40,7 @@ EmailParam::EmailParam(const EmailParam & x)
{
}
-EmailParam::EmailParam(const QCString & s)
+EmailParam::EmailParam(const TQCString & s)
: Param(s)
{
}
@@ -58,7 +58,7 @@ EmailParam::operator = (EmailParam & x)
}
EmailParam &
-EmailParam::operator = (const QCString & s)
+EmailParam::operator = (const TQCString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/Entity.cpp b/kabc/vcard/Entity.cpp
index b7d09e08e..83ee8d40d 100644
--- a/kabc/vcard/Entity.cpp
+++ b/kabc/vcard/Entity.cpp
@@ -40,7 +40,7 @@ Entity::Entity(const Entity & e)
// empty
}
-Entity::Entity(const QCString & s)
+Entity::Entity(const TQCString & s)
: strRep_ (s),
parsed_ (false),
assembled_ (true)
@@ -61,7 +61,7 @@ Entity::operator = (const Entity & e)
}
Entity &
-Entity::operator = (const QCString & s)
+Entity::operator = (const TQCString & s)
{
strRep_ = s;
parsed_ = false;
@@ -83,13 +83,13 @@ Entity::operator != (Entity & e)
}
bool
-Entity::operator == (const QCString & s)
+Entity::operator == (const TQCString & s)
{
return asString() == s;
}
bool
-Entity::operator != (const QCString & s)
+Entity::operator != (const TQCString & s)
{
return !(*this == s);
}
diff --git a/kabc/vcard/Enum.cpp b/kabc/vcard/Enum.cpp
index 3ed4a67c5..4d8d167a0 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 <tqcstring.h>
#include <ctype.h>
#include <VCardEnum.h>
@@ -236,7 +236,7 @@ VCARD::EntityTypeToParamName(EntityType e)
}
EntityType
-VCARD::EntityNameToEntityType(const QCString & s)
+VCARD::EntityNameToEntityType(const TQCString & s)
{
if (s.isEmpty()) return EntityUnknown;
diff --git a/kabc/vcard/FloatValue.cpp b/kabc/vcard/FloatValue.cpp
index 15bb664b0..ac1f2c6b5 100644
--- a/kabc/vcard/FloatValue.cpp
+++ b/kabc/vcard/FloatValue.cpp
@@ -45,7 +45,7 @@ FloatValue::FloatValue(const FloatValue & x)
value_ = x.value_;
}
-FloatValue::FloatValue(const QCString & s)
+FloatValue::FloatValue(const TQCString & s)
: Value(s)
{
}
@@ -63,7 +63,7 @@ FloatValue::operator = (FloatValue & x)
}
FloatValue &
-FloatValue::operator = (const QCString & s)
+FloatValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
@@ -101,7 +101,7 @@ FloatValue::_parse()
void
FloatValue::_assemble()
{
- strRep_ = QCString().setNum(value_);
+ strRep_ = TQCString().setNum(value_);
}
float
diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp
index 848890a2c..2bac28c1e 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/kabc/vcard/GeoValue.cpp
@@ -36,7 +36,7 @@ GeoValue::GeoValue(const GeoValue & x)
{
}
-GeoValue::GeoValue(const QCString & s)
+GeoValue::GeoValue(const TQCString & s)
: Value(s)
{
}
@@ -54,7 +54,7 @@ GeoValue::operator = (GeoValue & x)
}
GeoValue &
-GeoValue::operator = (const QCString & s)
+GeoValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/ImageParam.cpp b/kabc/vcard/ImageParam.cpp
index c9cf6fdc7..69611eeab 100644
--- a/kabc/vcard/ImageParam.cpp
+++ b/kabc/vcard/ImageParam.cpp
@@ -37,7 +37,7 @@ ImageParam::ImageParam(const ImageParam & x)
{
}
-ImageParam::ImageParam(const QCString & s)
+ImageParam::ImageParam(const TQCString & s)
: Param(s)
{
}
@@ -52,7 +52,7 @@ ImageParam::operator = (ImageParam & x)
}
ImageParam &
-ImageParam::operator = (const QCString & s)
+ImageParam::operator = (const TQCString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/ImageValue.cpp b/kabc/vcard/ImageValue.cpp
index 4630fac85..5d8d29bb7 100644
--- a/kabc/vcard/ImageValue.cpp
+++ b/kabc/vcard/ImageValue.cpp
@@ -37,7 +37,7 @@ ImageValue::ImageValue(const ImageValue & x)
{
}
-ImageValue::ImageValue(const QCString & s)
+ImageValue::ImageValue(const TQCString & s)
: Value(s)
{
}
@@ -52,7 +52,7 @@ ImageValue::operator = (ImageValue & x)
}
ImageValue &
-ImageValue::operator = (const QCString & s)
+ImageValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/ImgValue.cpp b/kabc/vcard/ImgValue.cpp
index 7b961f82e..42889acd8 100644
--- a/kabc/vcard/ImgValue.cpp
+++ b/kabc/vcard/ImgValue.cpp
@@ -37,7 +37,7 @@ ImgValue::ImgValue(const ImgValue & x)
{
}
-ImgValue::ImgValue(const QCString & s)
+ImgValue::ImgValue(const TQCString & s)
: Value(s)
{
}
@@ -52,7 +52,7 @@ ImgValue::operator = (ImgValue & x)
}
ImgValue &
-ImgValue::operator = (const QCString & s)
+ImgValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp
index edf180460..6ef46c98f 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/kabc/vcard/LangValue.cpp
@@ -39,7 +39,7 @@ LangValue::LangValue(const LangValue & x)
{
}
-LangValue::LangValue(const QCString & s)
+LangValue::LangValue(const TQCString & s)
: Value(s)
{
}
@@ -54,7 +54,7 @@ LangValue::operator = (LangValue & x)
}
LangValue &
-LangValue::operator = (const QCString & s)
+LangValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
@@ -74,7 +74,7 @@ LangValue::~LangValue()
void
LangValue::_parse()
{
- QStrList l;
+ TQStrList l;
RTokenise(strRep_, "-", l);
if (l.count() == 0) return;
@@ -91,10 +91,10 @@ LangValue::_assemble()
{
strRep_ = primary_;
- QStrListIterator it(subtags_);
+ TQStrListIterator it(subtags_);
for (; it.current(); ++it)
- strRep_ += QCString('-') + it.current();
+ strRep_ += TQCString('-') + it.current();
}
QCString
@@ -112,14 +112,14 @@ LangValue::subtags()
}
void
-LangValue::setPrimary(const QCString & s)
+LangValue::setPrimary(const TQCString & s)
{
parse();
primary_ = s;
}
void
-LangValue::setSubTags(const QStrList & l)
+LangValue::setSubTags(const TQStrList & l)
{
parse();
subtags_ = l;
diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp
index cdec621c3..e63268134 100644
--- a/kabc/vcard/NValue.cpp
+++ b/kabc/vcard/NValue.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qstrlist.h>
+#include <tqstrlist.h>
#include <VCardRToken.h>
#include <VCardNValue.h>
@@ -46,7 +46,7 @@ NValue::NValue(const NValue & x)
{
}
-NValue::NValue(const QCString & s)
+NValue::NValue(const TQCString & s)
: Value(s)
{
vDebug("ctor");
@@ -68,7 +68,7 @@ NValue::operator = (NValue & x)
}
NValue &
-NValue::operator = (const QCString & s)
+NValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
@@ -100,7 +100,7 @@ NValue::clone()
void
NValue::_parse()
{
- QStrList l;
+ TQStrList 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 c3134c835..cfd9c6f73 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/kabc/vcard/OrgValue.cpp
@@ -39,7 +39,7 @@ OrgValue::OrgValue(const OrgValue & x)
{
}
-OrgValue::OrgValue(const QCString & s)
+OrgValue::OrgValue(const TQCString & s)
: Value(s)
{
}
@@ -54,7 +54,7 @@ OrgValue::operator = (OrgValue & x)
}
OrgValue &
-OrgValue::operator = (const QCString & s)
+OrgValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
@@ -82,7 +82,7 @@ OrgValue::_assemble()
{
bool first(true);
- QStrListIterator it(valueList_);
+ TQStrListIterator it(valueList_);
for (; it.current(); ++it) {
if (!first) strRep_ += ';';
diff --git a/kabc/vcard/Param.cpp b/kabc/vcard/Param.cpp
index c51361328..d631f2319 100644
--- a/kabc/vcard/Param.cpp
+++ b/kabc/vcard/Param.cpp
@@ -43,7 +43,7 @@ Param::Param(const Param & x)
{
}
-Param::Param(const QCString & s)
+Param::Param(const TQCString & s)
: Entity(s),
name_(""),
value_("")
@@ -63,7 +63,7 @@ Param::operator = (Param & x)
}
Param &
-Param::operator = (const QCString & s)
+Param::operator = (const TQCString & s)
{
Entity::operator = (s);
return *this;
@@ -91,7 +91,7 @@ Param::_assemble()
strRep_ = name_ + "=" + value_;
}
-Param::Param(const QCString &name, const QCString &value)
+Param::Param(const TQCString &name, const TQCString &value)
: Entity(),
name_(name),
value_(value)
@@ -101,7 +101,7 @@ Param::Param(const QCString &name, const QCString &value)
}
void
-Param::setName(const QCString & name)
+Param::setName(const TQCString & name)
{
name_ = name;
@@ -109,7 +109,7 @@ Param::setName(const QCString & name)
}
void
-Param::setValue(const QCString & value)
+Param::setValue(const TQCString & value)
{
value_ = value;
diff --git a/kabc/vcard/PhoneNumberValue.cpp b/kabc/vcard/PhoneNumberValue.cpp
index 17b1400d3..02a1266fe 100644
--- a/kabc/vcard/PhoneNumberValue.cpp
+++ b/kabc/vcard/PhoneNumberValue.cpp
@@ -37,7 +37,7 @@ PhoneNumberValue::PhoneNumberValue(const PhoneNumberValue & x)
{
}
-PhoneNumberValue::PhoneNumberValue(const QCString & s)
+PhoneNumberValue::PhoneNumberValue(const TQCString & s)
: Value(s)
{
}
@@ -52,7 +52,7 @@ PhoneNumberValue::operator = (PhoneNumberValue & x)
}
PhoneNumberValue &
-PhoneNumberValue::operator = (const QCString & s)
+PhoneNumberValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp
index 2a85820bd..b0e251a87 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 <tqcstring.h>
+#include <tqstrlist.h>
namespace VCARD
{
Q_UINT32
-RTokenise(const char * str, const char * delim, QStrList & l)
+RTokenise(const char * str, const char * delim, TQStrList & l)
{
// FIXME no stderr !
l.clear();
diff --git a/kabc/vcard/SoundValue.cpp b/kabc/vcard/SoundValue.cpp
index 81040d118..5be75d358 100644
--- a/kabc/vcard/SoundValue.cpp
+++ b/kabc/vcard/SoundValue.cpp
@@ -37,7 +37,7 @@ SoundValue::SoundValue(const SoundValue & x)
{
}
-SoundValue::SoundValue(const QCString & s)
+SoundValue::SoundValue(const TQCString & s)
: Value(s)
{
}
@@ -52,7 +52,7 @@ SoundValue::operator = (SoundValue & x)
}
SoundValue &
-SoundValue::operator = (const QCString & s)
+SoundValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp
index cd51cbdaa..d66d87498 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/kabc/vcard/SourceParam.cpp
@@ -41,7 +41,7 @@ SourceParam::SourceParam(const SourceParam & x)
{
}
-SourceParam::SourceParam(const QCString & s)
+SourceParam::SourceParam(const TQCString & s)
: Param(s),
type_(SourceParam::TypeUnknown)
{
@@ -60,7 +60,7 @@ SourceParam::operator = (SourceParam & x)
}
SourceParam &
-SourceParam::operator = (const QCString & s)
+SourceParam::operator = (const TQCString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/TelParam.cpp b/kabc/vcard/TelParam.cpp
index 9d9fe4d7f..072b1dc81 100644
--- a/kabc/vcard/TelParam.cpp
+++ b/kabc/vcard/TelParam.cpp
@@ -37,7 +37,7 @@ TelParam::TelParam(const TelParam & x)
{
}
-TelParam::TelParam(const QCString & s)
+TelParam::TelParam(const TQCString & s)
: Param(s)
{
}
@@ -52,7 +52,7 @@ TelParam::operator = (TelParam & x)
}
TelParam &
-TelParam::operator = (const QCString & s)
+TelParam::operator = (const TQCString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/TelValue.cpp b/kabc/vcard/TelValue.cpp
index 349f99af9..c9c1b85aa 100644
--- a/kabc/vcard/TelValue.cpp
+++ b/kabc/vcard/TelValue.cpp
@@ -37,7 +37,7 @@ TelValue::TelValue(const TelValue & x)
{
}
-TelValue::TelValue(const QCString & s)
+TelValue::TelValue(const TQCString & s)
: Value(s)
{
}
@@ -52,7 +52,7 @@ TelValue::operator = (TelValue & x)
}
TelValue &
-TelValue::operator = (const QCString & s)
+TelValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/TextBinParam.cpp b/kabc/vcard/TextBinParam.cpp
index 66f29467d..4e0ebadff 100644
--- a/kabc/vcard/TextBinParam.cpp
+++ b/kabc/vcard/TextBinParam.cpp
@@ -37,7 +37,7 @@ TextBinParam::TextBinParam(const TextBinParam & x)
{
}
-TextBinParam::TextBinParam(const QCString & s)
+TextBinParam::TextBinParam(const TQCString & s)
: Param(s)
{
}
@@ -52,7 +52,7 @@ TextBinParam::operator = (TextBinParam & x)
}
TextBinParam &
-TextBinParam::operator = (const QCString & s)
+TextBinParam::operator = (const TQCString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/TextBinValue.cpp b/kabc/vcard/TextBinValue.cpp
index c58400967..e7da0b7c6 100644
--- a/kabc/vcard/TextBinValue.cpp
+++ b/kabc/vcard/TextBinValue.cpp
@@ -41,7 +41,7 @@ TextBinValue::TextBinValue(const TextBinValue & x)
mUrl_ = x.mUrl_;
}
-TextBinValue::TextBinValue(const QCString & s)
+TextBinValue::TextBinValue(const TQCString & s)
: Value(s)
{
}
@@ -60,7 +60,7 @@ TextBinValue::operator = (TextBinValue & x)
}
TextBinValue &
-TextBinValue::operator = (const QCString & s)
+TextBinValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp
index c4ac1e38b..e29a8dcc2 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/kabc/vcard/TextListValue.cpp
@@ -39,7 +39,7 @@ TextListValue::TextListValue(const TextListValue & x)
{
}
-TextListValue::TextListValue(const QCString & s)
+TextListValue::TextListValue(const TQCString & s)
: Value(s)
{
}
@@ -54,7 +54,7 @@ TextListValue::operator = (TextListValue & x)
}
TextListValue &
-TextListValue::operator = (const QCString & s)
+TextListValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
@@ -82,7 +82,7 @@ TextListValue::_assemble()
{
bool first(true);
- QStrListIterator it(valueList_);
+ TQStrListIterator it(valueList_);
for (; it.current(); ++it) {
if (!first) strRep_ += ';';
diff --git a/kabc/vcard/TextParam.cpp b/kabc/vcard/TextParam.cpp
index 7c6870093..b353483ec 100644
--- a/kabc/vcard/TextParam.cpp
+++ b/kabc/vcard/TextParam.cpp
@@ -37,7 +37,7 @@ TextParam::TextParam(const TextParam & x)
{
}
-TextParam::TextParam(const QCString & s)
+TextParam::TextParam(const TQCString & s)
: Param(s)
{
}
@@ -52,7 +52,7 @@ TextParam::operator = (TextParam & x)
}
TextParam &
-TextParam::operator = (const QCString & s)
+TextParam::operator = (const TQCString & s)
{
Param::operator = (s);
return *this;
diff --git a/kabc/vcard/TextValue.cpp b/kabc/vcard/TextValue.cpp
index 9708398ad..cf8e0673f 100644
--- a/kabc/vcard/TextValue.cpp
+++ b/kabc/vcard/TextValue.cpp
@@ -37,7 +37,7 @@ TextValue::TextValue(const TextValue & x)
{
}
-TextValue::TextValue(const QCString & s)
+TextValue::TextValue(const TQCString & s)
: Value(s)
{
}
@@ -52,7 +52,7 @@ TextValue::operator = (TextValue & x)
}
TextValue &
-TextValue::operator = (const QCString & s)
+TextValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp
index c1d1022e8..98f75cb8e 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/kabc/vcard/URIValue.cpp
@@ -32,7 +32,7 @@ URIValue::URIValue()
{
}
-URIValue::URIValue(const QCString & scheme, const QCString & schemeSpecificPart)
+URIValue::URIValue(const TQCString & scheme, const TQCString & schemeSpecificPart)
: Value(),
scheme_ (scheme),
schemeSpecificPart_ (schemeSpecificPart)
@@ -47,7 +47,7 @@ URIValue::URIValue(const URIValue & x)
{
}
-URIValue::URIValue(const QCString & s)
+URIValue::URIValue(const TQCString & s)
: Value(s)
{
}
@@ -65,7 +65,7 @@ URIValue::operator = (URIValue & x)
}
URIValue &
-URIValue::operator = (const QCString & s)
+URIValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
@@ -118,14 +118,14 @@ URIValue::schemeSpecificPart()
}
void
-URIValue::setScheme(const QCString & s)
+URIValue::setScheme(const TQCString & s)
{
parse();
scheme_ = s;
}
void
-URIValue::setSchemeSpecificPart(const QCString & s)
+URIValue::setSchemeSpecificPart(const TQCString & s)
{
parse();
schemeSpecificPart_ = s;
diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp
index 374306c5f..30473661f 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/kabc/vcard/UTCValue.cpp
@@ -38,7 +38,7 @@ UTCValue::UTCValue(const UTCValue & x)
{
}
-UTCValue::UTCValue(const QCString & s)
+UTCValue::UTCValue(const TQCString & s)
: Value(s)
{
}
@@ -57,7 +57,7 @@ UTCValue::operator = (UTCValue & x)
}
UTCValue &
-UTCValue::operator = (const QCString & s)
+UTCValue::operator = (const TQCString & s)
{
Value::operator = (s);
return *this;
diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp
index 8a65ecfd4..50c25da59 100644
--- a/kabc/vcard/VCard.cpp
+++ b/kabc/vcard/VCard.cpp
@@ -21,8 +21,8 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <tqcstring.h>
+#include <tqstrlist.h>
#include <VCardEntity.h>
#include <VCardVCard.h>
@@ -46,7 +46,7 @@ VCard::VCard(const VCard & x)
{
}
-VCard::VCard(const QCString & s)
+VCard::VCard(const TQCString & s)
: Entity(s)
{
}
@@ -64,7 +64,7 @@ VCard::operator = (VCard & x)
}
VCard &
-VCard::operator = (const QCString & s)
+VCard::operator = (const TQCString & s)
{
Entity::operator = (s);
return *this;
@@ -85,7 +85,7 @@ VCard::~VCard()
VCard::_parse()
{
vDebug("parse() called");
- QStrList l;
+ TQStrList l;
RTokenise(strRep_, "\r\n", l);
@@ -95,16 +95,16 @@ VCard::_parse()
}
// Get the first line
- QCString beginLine = QCString(l.at(0)).stripWhiteSpace();
+ TQCString beginLine = TQCString(l.at(0)).stripWhiteSpace();
vDebug("Begin line == \"" + beginLine + "\"");
// Remove extra blank lines
- while (QCString(l.last()).isEmpty())
+ while (TQCString(l.last()).isEmpty())
l.remove(l.last());
// Now we know this is the last line
- QCString endLine = l.last();
+ TQCString endLine = l.last();
// Trash the first and last lines as we have seen them.
l.remove(0u);
@@ -120,8 +120,8 @@ VCard::_parse()
return;
}
- QCString firstPart(beginLine.left(split));
- QCString valuePart(beginLine.mid(split + 1));
+ TQCString firstPart(beginLine.left(split));
+ TQCString valuePart(beginLine.mid(split + 1));
split = firstPart.find('.');
@@ -147,11 +147,11 @@ VCard::_parse()
// Handle folded lines.
- QStrList refolded;
+ TQStrList refolded;
- QStrListIterator it(l);
+ TQStrListIterator it(l);
- QCString cur;
+ TQCString cur;
for (; it.current(); ++it) {
@@ -173,11 +173,11 @@ VCard::_parse()
refolded.append(cur);
}
- QStrListIterator it2(refolded);
+ TQStrListIterator it2(refolded);
for (; it2.current(); ++it2) {
- vDebug("New contentline using \"" + QCString(it2.current()) + "\"");
+ vDebug("New contentline using \"" + TQCString(it2.current()) + "\"");
ContentLine * cl = new ContentLine(it2.current());
cl->parse();
@@ -217,7 +217,7 @@ VCard::_assemble()
strRep_ = "BEGIN:VCARD\r\n";
strRep_ += "VERSION:3.0\r\n";
- QPtrListIterator<ContentLine> it(contentLineList_);
+ TQPtrListIterator<ContentLine> it(contentLineList_);
for (; it.current(); ++it)
strRep_ += it.current()->asString() + "\r\n";
@@ -233,7 +233,7 @@ VCard::has(EntityType t)
}
bool
-VCard::has(const QCString & s)
+VCard::has(const TQCString & s)
{
parse();
return contentLine(s) == 0 ? false : true;
@@ -248,7 +248,7 @@ VCard::add(const ContentLine & cl)
}
void
-VCard::add(const QCString & s)
+VCard::add(const TQCString & s)
{
parse();
ContentLine * c = new ContentLine(s);
@@ -259,7 +259,7 @@ VCard::add(const QCString & s)
VCard::contentLine(EntityType t)
{
parse();
- QPtrListIterator<ContentLine> it(contentLineList_);
+ TQPtrListIterator<ContentLine> it(contentLineList_);
for (; it.current(); ++it)
if (it.current()->entityType() == t)
@@ -269,10 +269,10 @@ VCard::contentLine(EntityType t)
}
ContentLine *
-VCard::contentLine(const QCString & s)
+VCard::contentLine(const TQCString & s)
{
parse();
- QPtrListIterator<ContentLine> it(contentLineList_);
+ TQPtrListIterator<ContentLine> it(contentLineList_);
for (; it.current(); ++it)
if (it.current()->entityType() == EntityNameToEntityType(s))
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index 0c21e2f70..1f8cea5b1 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qregexp.h>
+#include <tqregexp.h>
#include <VCardDefines.h>
#include <VCardVCardEntity.h>
@@ -38,7 +38,7 @@ VCardEntity::VCardEntity(const VCardEntity & x)
{
}
-VCardEntity::VCardEntity(const QCString & s)
+VCardEntity::VCardEntity(const TQCString & s)
: Entity(s)
{
}
@@ -53,7 +53,7 @@ VCardEntity::operator = (VCardEntity & x)
}
VCardEntity &
-VCardEntity::operator = (const QCString & s)
+VCardEntity::operator = (const TQCString & s)
{
Entity::operator = (s);
return *this;
@@ -74,15 +74,15 @@ VCardEntity::~VCardEntity()
VCardEntity::_parse()
{
vDebug("parse");
- QCString s(strRep_);
+ TQCString s(strRep_);
- int i = s.find(QRegExp("BEGIN:VCARD", false));
+ int i = s.find(TQRegExp("BEGIN:VCARD", false));
while (i != -1) {
- i = s.find(QRegExp("BEGIN:VCARD", false), 11);
+ i = s.find(TQRegExp("BEGIN:VCARD", false), 11);
- QCString cardStr(s.left(i));
+ TQCString cardStr(s.left(i));
VCard * v = new VCard(cardStr);
diff --git a/kabc/vcard/Value.cpp b/kabc/vcard/Value.cpp
index 33b7a509e..c95c0712b 100644
--- a/kabc/vcard/Value.cpp
+++ b/kabc/vcard/Value.cpp
@@ -36,7 +36,7 @@ Value::Value(const Value & x)
{
}
-Value::Value(const QCString & s)
+Value::Value(const TQCString & s)
: Entity(s)
{
}
@@ -51,7 +51,7 @@ Value::operator = (Value & x)
}
Value &
-Value::operator = (const QCString & s)
+Value::operator = (const TQCString & s)
{
Entity::operator = (s);
return *this;
diff --git a/kabc/vcard/include/VCardAdrParam.h b/kabc/vcard/include/VCardAdrParam.h
index 783d79129..ed5497deb 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 <tqcstring.h>
+#include <tqstrlist.h>
#include <VCardParam.h>
@@ -37,16 +37,16 @@ class KVCARD_EXPORT AdrParam : public Param
#include "AdrParam-generated.h"
- QStrList adrTypeList()
+ TQStrList adrTypeList()
{ parse(); return adrTypeList_; }
- QCString textParam()
+ TQCString textParam()
{ parse(); return textParam_; }
- void setAdrTypeList(const QStrList & l)
+ void setAdrTypeList(const TQStrList & l)
{ adrTypeList_ = l; assembled_ = false; }
- void setTextParam(const QCString & s)
+ void setTextParam(const TQCString & s)
{ textParam_ = s; assembled_ = false; }
enum AdrType {
diff --git a/kabc/vcard/include/VCardAdrValue.h b/kabc/vcard/include/VCardAdrValue.h
index e17ee347f..94ed93aee 100644
--- a/kabc/vcard/include/VCardAdrValue.h
+++ b/kabc/vcard/include/VCardAdrValue.h
@@ -24,7 +24,7 @@
#ifndef ADRVALUE_H
#define ADRVALUE_H
-#include <qstrlist.h>
+#include <tqstrlist.h>
#include <VCardValue.h>
namespace VCARD
@@ -37,44 +37,44 @@ class KVCARD_EXPORT AdrValue : public Value
AdrValue *clone();
- void setPOBox(const QCString & s)
+ void setPOBox(const TQCString & s)
{ poBox_ = s; assembled_ = false; }
- void setExtAddress(const QCString & s)
+ void setExtAddress(const TQCString & s)
{ extAddress_ = s; assembled_ = false; }
- void setStreet(const QCString & s)
+ void setStreet(const TQCString & s)
{ street_ = s; assembled_ = false; }
- void setLocality(const QCString & s)
+ void setLocality(const TQCString & s)
{ locality_ = s; assembled_ = false; }
- void setRegion(const QCString & s)
+ void setRegion(const TQCString & s)
{ region_ = s; assembled_ = false; }
- void setPostCode(const QCString & s)
+ void setPostCode(const TQCString & s)
{ postCode_ = s; assembled_ = false; }
- void setCountryName(const QCString & s)
+ void setCountryName(const TQCString & 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_; }
+ TQCString poBox() { parse(); return poBox_; }
+ TQCString extAddress() { parse(); return extAddress_; }
+ TQCString street() { parse(); return street_; }
+ TQCString locality() { parse(); return locality_; }
+ TQCString region() { parse(); return region_; }
+ TQCString postCode() { parse(); return postCode_; }
+ TQCString countryName() { parse(); return countryName_; }
private:
- QCString poBox_;
- QCString extAddress_;
- QCString street_;
- QCString locality_;
- QCString region_;
- QCString postCode_;
- QCString countryName_;
+ TQCString poBox_;
+ TQCString extAddress_;
+ TQCString street_;
+ TQCString locality_;
+ TQCString region_;
+ TQCString postCode_;
+ TQCString countryName_;
};
}
diff --git a/kabc/vcard/include/VCardAgentParam.h b/kabc/vcard/include/VCardAgentParam.h
index aed1ade19..90c3bd528 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 <tqcstring.h>
#include <VCardParam.h>
#include <VCardURIValue.h>
@@ -46,7 +46,7 @@ class KVCARD_EXPORT AgentParam : public Param
void setRefer(bool b)
{ refer_ = b; assembled_ = false; }
- void setURI(const QCString & s)
+ void setURI(const TQCString & s)
{ uri_ = s; assembled_ = false; }
private:
diff --git a/kabc/vcard/include/VCardAgentValue.h b/kabc/vcard/include/VCardAgentValue.h
index 0d103be41..dd68145c9 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 <tqcstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardClassValue.h b/kabc/vcard/include/VCardClassValue.h
index 23e9b6d28..5de79167b 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 <tqcstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardContentLine.h b/kabc/vcard/include/VCardContentLine.h
index 6cb26d7bd..20d5c5033 100644
--- a/kabc/vcard/include/VCardContentLine.h
+++ b/kabc/vcard/include/VCardContentLine.h
@@ -24,7 +24,7 @@
#ifndef CONTENTLINE_H
#define CONTENTLINE_H
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include "VCardEnum.h"
#include "VCardEntity.h"
@@ -47,10 +47,10 @@ class KVCARD_EXPORT ContentLine : public Entity
ValueType valueType() { parse(); return valueType_; }
EntityType entityType() { parse(); return entityType_; }
- void setGroup (const QCString & s)
+ void setGroup (const TQCString & s)
{ group_ = s; assembled_ = false; }
- void setName (const QCString & s)
+ void setName (const TQCString & s)
{ name_ = s; assembled_ = false; }
void setValue (Value *s)
@@ -65,7 +65,7 @@ class KVCARD_EXPORT ContentLine : public Entity
QCString group_;
QCString name_;
- QPtrList<Param> paramList_;
+ TQPtrList<Param> paramList_;
Value * value_;
ParamType paramType_;
diff --git a/kabc/vcard/include/VCardDateParam.h b/kabc/vcard/include/VCardDateParam.h
index 32179be43..410eae6b7 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 <tqcstring.h>
#include <VCardParam.h>
diff --git a/kabc/vcard/include/VCardDateValue.h b/kabc/vcard/include/VCardDateValue.h
index f97b21113..4f2e2fe7f 100644
--- a/kabc/vcard/include/VCardDateValue.h
+++ b/kabc/vcard/include/VCardDateValue.h
@@ -24,8 +24,8 @@
#ifndef DATEVALUE_H
#define DATEVALUE_H
-#include <qcstring.h>
-#include <qdatetime.h>
+#include <tqcstring.h>
+#include <tqdatetime.h>
#include <VCardValue.h>
@@ -48,8 +48,8 @@ class KVCARD_EXPORT DateValue : public Value
unsigned int zoneHour = 0,
unsigned int zoneMinute = 0);
- DateValue(const QDate &);
- DateValue(const QDateTime &);
+ DateValue(const TQDate &);
+ DateValue(const TQDateTime &);
DateValue *clone();
@@ -77,9 +77,9 @@ class KVCARD_EXPORT DateValue : public Value
void setZoneHour (unsigned int);
void setZoneMinute (unsigned int);
- QDate qdate();
- QTime qtime();
- QDateTime qdt();
+ TQDate qdate();
+ TQTime qtime();
+ TQDateTime qdt();
private:
diff --git a/kabc/vcard/include/VCardDefines.h b/kabc/vcard/include/VCardDefines.h
index dd38ae28b..e778bc24f 100644
--- a/kabc/vcard/include/VCardDefines.h
+++ b/kabc/vcard/include/VCardDefines.h
@@ -34,14 +34,14 @@
#if 0
#ifndef NDEBUG
-# include <qcstring.h>
+# include <tqcstring.h>
# include <iostream>
# ifdef __GNUG__
# define vDebug(a) cerr << className() << ":" << __FUNCTION__ << " (" \
- << __LINE__ << "): " << QCString((a)).data() << endl;
+ << __LINE__ << "): " << TQCString((a)).data() << endl;
# else
# define vDebug(a) cerr << className() << ": " \
- << QCString((a)).data() << endl;
+ << TQCString((a)).data() << endl;
# endif
#else
# define vDebug(a)
diff --git a/kabc/vcard/include/VCardEmailParam.h b/kabc/vcard/include/VCardEmailParam.h
index c879fac49..55086faec 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 <tqcstring.h>
#include <VCardParam.h>
@@ -39,7 +39,7 @@ class KVCARD_EXPORT EmailParam : public Param
QCString emailType() { parse(); return emailType_; }
bool pref() { parse(); return pref_; }
- void setEmailType(const QCString & s)
+ void setEmailType(const TQCString & s)
{ emailType_ = s; assembled_ = false; }
void setPref(bool b)
diff --git a/kabc/vcard/include/VCardEntity.h b/kabc/vcard/include/VCardEntity.h
index ed503f896..ab17d6b8c 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 <tqcstring.h>
#include <kdelibs_export.h>
namespace VCARD
@@ -36,19 +36,19 @@ class KVCARD_EXPORT Entity
Entity();
Entity(const Entity & e);
- Entity(const QCString & s);
+ Entity(const TQCString & s);
virtual Entity & operator = (const Entity & e);
- virtual Entity & operator = (const QCString & s);
+ virtual Entity & operator = (const TQCString & 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 TQCString & s);
+ virtual bool operator != (const TQCString & s);
virtual ~Entity();
- QCString asString();
+ TQCString asString();
virtual void parse();
virtual void assemble();
@@ -58,7 +58,7 @@ class KVCARD_EXPORT Entity
protected:
- QCString strRep_;
+ TQCString strRep_;
bool parsed_;
bool assembled_;
};
diff --git a/kabc/vcard/include/VCardEnum.h b/kabc/vcard/include/VCardEnum.h
index cd55632f6..5f7902bac 100644
--- a/kabc/vcard/include/VCardEnum.h
+++ b/kabc/vcard/include/VCardEnum.h
@@ -24,14 +24,14 @@
#ifndef ENUM_H
#define ENUM_H
-#include <qcstring.h>
+#include <tqcstring.h>
#include <kdelibs_export.h>
namespace VCARD
{
-extern const QCString paramNames [];
+extern const TQCString paramNames [];
enum EntityType {
EntityName,
@@ -111,8 +111,8 @@ extern const ParamType paramTypesTable[];
KVCARD_EXPORT ParamType EntityTypeToParamType(EntityType);
KVCARD_EXPORT ValueType EntityTypeToValueType(EntityType);
-KVCARD_EXPORT QCString EntityTypeToParamName(EntityType);
-KVCARD_EXPORT EntityType EntityNameToEntityType(const QCString &);
+KVCARD_EXPORT TQCString EntityTypeToParamName(EntityType);
+KVCARD_EXPORT EntityType EntityNameToEntityType(const TQCString &);
KVCARD_EXPORT char * encodeBase64(const char *, unsigned long, unsigned long &);
KVCARD_EXPORT char * decodeBase64(const char *, unsigned long, unsigned long &);
diff --git a/kabc/vcard/include/VCardFloatValue.h b/kabc/vcard/include/VCardFloatValue.h
index 3e158774f..45a6823be 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 <tqcstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardImageParam.h b/kabc/vcard/include/VCardImageParam.h
index a78ebd4a6..10ab8a3f5 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 <tqcstring.h>
#include <VCardParam.h>
diff --git a/kabc/vcard/include/VCardImageValue.h b/kabc/vcard/include/VCardImageValue.h
index 7a9b29c1e..45fbcad9c 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 <tqcstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardLangValue.h b/kabc/vcard/include/VCardLangValue.h
index 22c50a9d4..7767d52fa 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 <tqcstring.h>
+#include <tqstrlist.h>
#include <VCardValue.h>
@@ -36,14 +36,14 @@ class KVCARD_EXPORT LangValue : public Value
{
#include "LangValue-generated.h"
- QCString primary();
- QStrList subtags();
+ TQCString primary();
+ TQStrList subtags();
- void setPrimary(const QCString &);
- void setSubTags(const QStrList &);
+ void setPrimary(const TQCString &);
+ void setSubTags(const TQStrList &);
- QCString primary_;
- QStrList subtags_;
+ TQCString primary_;
+ TQStrList subtags_;
};
}
diff --git a/kabc/vcard/include/VCardNValue.h b/kabc/vcard/include/VCardNValue.h
index 41a6e9b28..9db37fbbc 100644
--- a/kabc/vcard/include/VCardNValue.h
+++ b/kabc/vcard/include/VCardNValue.h
@@ -34,21 +34,21 @@ class KVCARD_EXPORT 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_; }
-
- 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; }
+ TQCString family() { parse(); return family_; }
+ TQCString given() { parse(); return given_; }
+ TQCString middle() { parse(); return middle_; }
+ TQCString prefix() { parse(); return prefix_; }
+ TQCString suffix() { parse(); return suffix_; }
+
+ void setFamily (const TQCString & s) { family_ = s; assembled_ = false; }
+ void setGiven (const TQCString & s) { given_ = s; assembled_ = false; }
+ void setMiddle (const TQCString & s) { middle_ = s; assembled_ = false; }
+ void setPrefix (const TQCString & s) { prefix_ = s; assembled_ = false; }
+ void setSuffix (const TQCString & s) { suffix_ = s; assembled_ = false; }
private:
- QCString family_, given_, middle_, prefix_, suffix_;
+ TQCString family_, given_, middle_, prefix_, suffix_;
};
}
diff --git a/kabc/vcard/include/VCardOrgValue.h b/kabc/vcard/include/VCardOrgValue.h
index cc5633501..a2bd803e5 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 <tqcstring.h>
+#include <tqstrlist.h>
#include <VCardValue.h>
@@ -38,11 +38,11 @@ class KVCARD_EXPORT OrgValue : public Value
#include "OrgValue-generated.h"
unsigned int numValues();
- QCString value(unsigned int);
+ TQCString value(unsigned int);
private:
- QStrList valueList_;
+ TQStrList valueList_;
};
}
diff --git a/kabc/vcard/include/VCardParam.h b/kabc/vcard/include/VCardParam.h
index f805634c0..93d70f06b 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 <tqcstring.h>
+#include <tqptrlist.h>
#include <VCardEntity.h>
@@ -37,22 +37,22 @@ class KVCARD_EXPORT Param : public Entity
#include "Param-generated.h"
- Param(const QCString &name, const QCString &value);
+ Param(const TQCString &name, const TQCString &value);
- void setName(const QCString &);
- void setValue(const QCString &);
+ void setName(const TQCString &);
+ void setValue(const TQCString &);
- QCString name();
- QCString value();
+ TQCString name();
+ TQCString value();
private:
- QCString name_;
- QCString value_;
+ TQCString name_;
+ TQCString value_;
};
-typedef QPtrList<Param> ParamList;
-typedef QPtrListIterator<Param> ParamListIterator;
+typedef TQPtrList<Param> ParamList;
+typedef TQPtrListIterator<Param> ParamListIterator;
}
diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h
index 06e644b20..0ea380267 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -25,14 +25,14 @@
#ifndef RTOKEN_H
#define RTOKEN_H
-#include <qstrlist.h>
+#include <tqstrlist.h>
#include <kdelibs_export.h>
namespace VCARD
{
-KVCARD_EXPORT Q_UINT32 RTokenise(const char * str, const char * delim, QStrList & l);
+KVCARD_EXPORT Q_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l);
}
diff --git a/kabc/vcard/include/VCardSoundValue.h b/kabc/vcard/include/VCardSoundValue.h
index 0a7af1fbc..61858f058 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 <tqcstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardSourceParam.h b/kabc/vcard/include/VCardSourceParam.h
index bb28ffe62..1d9d03d47 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 <tqcstring.h>
#include <VCardParam.h>
@@ -39,18 +39,18 @@ class KVCARD_EXPORT SourceParam : public Param
enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
SourceParamType type() { parse(); return type_;}
- QCString par() { parse(); return par_; }
- QCString val() { parse(); return val_; }
+ TQCString par() { parse(); return par_; }
+ TQCString 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 TQCString & s) { par_ = s; assembled_ = false; }
+ void setVal(const TQCString & 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
+ TQCString par_, val_; // Sub-parameter, value
};
}
diff --git a/kabc/vcard/include/VCardTelParam.h b/kabc/vcard/include/VCardTelParam.h
index 0eff82390..9eea5da2f 100644
--- a/kabc/vcard/include/VCardTelParam.h
+++ b/kabc/vcard/include/VCardTelParam.h
@@ -24,7 +24,7 @@
#ifndef TELPARAM_H
#define TELPARAM_H
-#include <qcstring.h>
+#include <tqcstring.h>
#include <VCardParam.h>
@@ -43,7 +43,7 @@ class KVCARD_EXPORT TelParam : public Param
private:
- QPtrList<TelType> types_;
+ TQPtrList<TelType> types_;
};
}
diff --git a/kabc/vcard/include/VCardTelValue.h b/kabc/vcard/include/VCardTelValue.h
index 1d3563192..043a45aa9 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 <tqcstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardTextBinParam.h b/kabc/vcard/include/VCardTextBinParam.h
index 5085d5d36..5a681ad48 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 <tqcstring.h>
#include <VCardParam.h>
diff --git a/kabc/vcard/include/VCardTextBinValue.h b/kabc/vcard/include/VCardTextBinValue.h
index 9835acf9b..316fa7832 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 <tqcstring.h>
#include <VCardValue.h>
@@ -39,17 +39,17 @@ class KVCARD_EXPORT TextBinValue : public Value
TextBinValue *clone();
bool isBinary() { parse(); return mIsBinary_; }
- QByteArray data() { parse(); return mData_; }
- QString url() { parse(); return mUrl_; }
+ TQByteArray data() { parse(); return mData_; }
+ TQString url() { parse(); return mUrl_; }
- void setData( const QByteArray &data )
+ void setData( const TQByteArray &data )
{
mData_ = data;
mIsBinary_ = true;
assembled_ = false;
}
- void setUrl( const QString &url )
+ void setUrl( const TQString &url )
{
mUrl_ = url;
mIsBinary_ = false;
@@ -58,8 +58,8 @@ class KVCARD_EXPORT TextBinValue : public Value
private:
int mIsBinary_;
- QByteArray mData_;
- QString mUrl_;
+ TQByteArray mData_;
+ TQString mUrl_;
};
}
diff --git a/kabc/vcard/include/VCardTextListValue.h b/kabc/vcard/include/VCardTextListValue.h
index 14242312a..53760c75a 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 <tqstrlist.h>
-#include <qcstring.h>
+#include <tqcstring.h>
#include <VCardValue.h>
@@ -39,11 +39,11 @@ class KVCARD_EXPORT TextListValue : public Value
#include "TextListValue-generated.h"
unsigned int numValues();
- QCString value(unsigned int);
+ TQCString value(unsigned int);
private:
- QStrList valueList_;
+ TQStrList valueList_;
};
}
diff --git a/kabc/vcard/include/VCardTextParam.h b/kabc/vcard/include/VCardTextParam.h
index d241f42d0..d593c0578 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 <tqcstring.h>
#include <VCardParam.h>
diff --git a/kabc/vcard/include/VCardURIValue.h b/kabc/vcard/include/VCardURIValue.h
index de56d49e6..696887774 100644
--- a/kabc/vcard/include/VCardURIValue.h
+++ b/kabc/vcard/include/VCardURIValue.h
@@ -33,18 +33,18 @@ class KVCARD_EXPORT URIValue : public Value
{
#include "URIValue-generated.h"
- URIValue(const QCString & scheme, const QCString & schemeSpecificPart);
+ URIValue(const TQCString & scheme, const TQCString & schemeSpecificPart);
- QCString scheme();
- QCString schemeSpecificPart();
+ TQCString scheme();
+ TQCString schemeSpecificPart();
- void setScheme (const QCString &);
- void setSchemeSpecificPart (const QCString &);
+ void setScheme (const TQCString &);
+ void setSchemeSpecificPart (const TQCString &);
private:
- QCString scheme_;
- QCString schemeSpecificPart_;
+ TQCString scheme_;
+ TQCString schemeSpecificPart_;
};
}
diff --git a/kabc/vcard/include/VCardUTCValue.h b/kabc/vcard/include/VCardUTCValue.h
index 6674ff7db..cb09ccf00 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 <tqcstring.h>
#include <VCardValue.h>
diff --git a/kabc/vcard/include/VCardVCard.h b/kabc/vcard/include/VCardVCard.h
index 120682212..64ed5c787 100644
--- a/kabc/vcard/include/VCardVCard.h
+++ b/kabc/vcard/include/VCardVCard.h
@@ -24,8 +24,8 @@
#ifndef VCARD_VCARD_H
#define VCARD_VCARD_H
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <VCardEnum.h>
#include <VCardEntity.h>
@@ -40,22 +40,22 @@ class KVCARD_EXPORT VCard : public Entity
#include "VCard-generated.h"
bool has(EntityType);
- bool has(const QCString &);
+ bool has(const TQCString &);
void add(const ContentLine &);
- void add(const QCString &);
+ void add(const TQCString &);
ContentLine * contentLine(EntityType);
- ContentLine * contentLine(const QCString &);
+ ContentLine * contentLine(const TQCString &);
- QCString group() { parse(); return group_; }
+ TQCString group() { parse(); return group_; }
- QPtrList<ContentLine> contentLineList() { parse(); return contentLineList_; }
+ TQPtrList<ContentLine> contentLineList() { parse(); return contentLineList_; }
private:
QCString group_;
- QPtrList<ContentLine> contentLineList_;
+ TQPtrList<ContentLine> contentLineList_;
};
}
diff --git a/kabc/vcard/include/VCardVCardEntity.h b/kabc/vcard/include/VCardVCardEntity.h
index d45d43c26..422790c22 100644
--- a/kabc/vcard/include/VCardVCardEntity.h
+++ b/kabc/vcard/include/VCardVCardEntity.h
@@ -24,8 +24,8 @@
#ifndef VCARD_ENTITY_H
#define VCARD_ENTITY_H
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <VCardEnum.h>
#include <VCardVCard.h>
@@ -34,8 +34,8 @@
namespace VCARD
{
-typedef QPtrList<VCard> VCardList;
-typedef QPtrListIterator<VCard> VCardListIterator;
+typedef TQPtrList<VCard> VCardList;
+typedef TQPtrListIterator<VCard> VCardListIterator;
class KVCARD_EXPORT VCardEntity : public Entity
{
diff --git a/kabc/vcard/include/VCardValue.h b/kabc/vcard/include/VCardValue.h
index 9019f2b1a..3c167d70a 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 <tqptrlist.h>
#include <VCardEntity.h>
@@ -38,8 +38,8 @@ class KVCARD_EXPORT Value : public Entity
virtual Value *clone() { return new Value( *this ); }
};
-typedef QPtrList<Value> ValueList;
-typedef QPtrListIterator<Value> ValueListIterator;
+typedef TQPtrList<Value> ValueList;
+typedef TQPtrListIterator<Value> ValueListIterator;
}
diff --git a/kabc/vcard/include/generated/AdrParam-generated.h b/kabc/vcard/include/generated/AdrParam-generated.h
index 3e265d8a7..1afdcd36a 100644
--- a/kabc/vcard/include/generated/AdrParam-generated.h
+++ b/kabc/vcard/include/generated/AdrParam-generated.h
@@ -3,13 +3,13 @@
public:
AdrParam();
AdrParam(const AdrParam&);
-AdrParam(const QCString&);
+AdrParam(const TQCString&);
AdrParam & operator = (AdrParam&);
-AdrParam & operator = (const QCString&);
+AdrParam & operator = (const TQCString&);
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 TQCString& s) {AdrParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 e1d93e425..9882d1186 100644
--- a/kabc/vcard/include/generated/AdrValue-generated.h
+++ b/kabc/vcard/include/generated/AdrValue-generated.h
@@ -3,13 +3,13 @@
public:
AdrValue();
AdrValue(const AdrValue&);
-AdrValue(const QCString&);
+AdrValue(const TQCString&);
AdrValue & operator = (AdrValue&);
-AdrValue & operator = (const QCString&);
+AdrValue & operator = (const TQCString&);
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 TQCString& s) {AdrValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 6423867d9..07b87d106 100644
--- a/kabc/vcard/include/generated/AgentParam-generated.h
+++ b/kabc/vcard/include/generated/AgentParam-generated.h
@@ -3,13 +3,13 @@
public:
AgentParam();
AgentParam(const AgentParam&);
-AgentParam(const QCString&);
+AgentParam(const TQCString&);
AgentParam & operator = (AgentParam&);
-AgentParam & operator = (const QCString&);
+AgentParam & operator = (const TQCString&);
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 TQCString& s) {AgentParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 76bb81c53..e2866bb8f 100644
--- a/kabc/vcard/include/generated/AgentValue-generated.h
+++ b/kabc/vcard/include/generated/AgentValue-generated.h
@@ -3,13 +3,13 @@
public:
AgentValue();
AgentValue(const AgentValue&);
-AgentValue(const QCString&);
+AgentValue(const TQCString&);
AgentValue & operator = (AgentValue&);
-AgentValue & operator = (const QCString&);
+AgentValue & operator = (const TQCString&);
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 TQCString& s) {AgentValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 df4ed5ff0..e10c65568 100644
--- a/kabc/vcard/include/generated/ClassValue-generated.h
+++ b/kabc/vcard/include/generated/ClassValue-generated.h
@@ -3,13 +3,13 @@
public:
ClassValue();
ClassValue(const ClassValue&);
-ClassValue(const QCString&);
+ClassValue(const TQCString&);
ClassValue & operator = (ClassValue&);
-ClassValue & operator = (const QCString&);
+ClassValue & operator = (const TQCString&);
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 TQCString& s) {ClassValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 9efe2731a..ad2ac7649 100644
--- a/kabc/vcard/include/generated/ContentLine-generated.h
+++ b/kabc/vcard/include/generated/ContentLine-generated.h
@@ -3,13 +3,13 @@
public:
ContentLine();
ContentLine(const ContentLine&);
-ContentLine(const QCString&);
+ContentLine(const TQCString&);
ContentLine & operator = (ContentLine&);
-ContentLine & operator = (const QCString&);
+ContentLine & operator = (const TQCString&);
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 TQCString& s) {ContentLine a(s);return(*this==a);}
+bool operator != (const TQCString& 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 ff1da58c9..75e7ad72d 100644
--- a/kabc/vcard/include/generated/DateParam-generated.h
+++ b/kabc/vcard/include/generated/DateParam-generated.h
@@ -3,13 +3,13 @@
public:
DateParam();
DateParam(const DateParam&);
-DateParam(const QCString&);
+DateParam(const TQCString&);
DateParam & operator = (DateParam&);
-DateParam & operator = (const QCString&);
+DateParam & operator = (const TQCString&);
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 TQCString& s) {DateParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 a38282379..cf0eb40d8 100644
--- a/kabc/vcard/include/generated/DateValue-generated.h
+++ b/kabc/vcard/include/generated/DateValue-generated.h
@@ -3,13 +3,13 @@
public:
DateValue();
DateValue(const DateValue&);
-DateValue(const QCString&);
+DateValue(const TQCString&);
DateValue & operator = (DateValue&);
-DateValue & operator = (const QCString&);
+DateValue & operator = (const TQCString&);
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 TQCString& s) {DateValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 428a6fc20..46ae1f80f 100644
--- a/kabc/vcard/include/generated/EmailParam-generated.h
+++ b/kabc/vcard/include/generated/EmailParam-generated.h
@@ -3,13 +3,13 @@
public:
EmailParam();
EmailParam(const EmailParam&);
-EmailParam(const QCString&);
+EmailParam(const TQCString&);
EmailParam & operator = (EmailParam&);
-EmailParam & operator = (const QCString&);
+EmailParam & operator = (const TQCString&);
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 TQCString& s) {EmailParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 cac55cfef..155f52ae1 100644
--- a/kabc/vcard/include/generated/FloatValue-generated.h
+++ b/kabc/vcard/include/generated/FloatValue-generated.h
@@ -3,13 +3,13 @@
public:
FloatValue();
FloatValue(const FloatValue&);
-FloatValue(const QCString&);
+FloatValue(const TQCString&);
FloatValue & operator = (FloatValue&);
-FloatValue & operator = (const QCString&);
+FloatValue & operator = (const TQCString&);
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 TQCString& s) {FloatValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 594f3ad67..b525e8c21 100644
--- a/kabc/vcard/include/generated/GeoValue-generated.h
+++ b/kabc/vcard/include/generated/GeoValue-generated.h
@@ -3,13 +3,13 @@
public:
GeoValue();
GeoValue(const GeoValue&);
-GeoValue(const QCString&);
+GeoValue(const TQCString&);
GeoValue & operator = (GeoValue&);
-GeoValue & operator = (const QCString&);
+GeoValue & operator = (const TQCString&);
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 TQCString& s) {GeoValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 f39302dd3..38e1c2a3a 100644
--- a/kabc/vcard/include/generated/Group-generated.h
+++ b/kabc/vcard/include/generated/Group-generated.h
@@ -3,13 +3,13 @@
public:
Group();
Group(const Group&);
-Group(const QCString&);
+Group(const TQCString&);
Group & operator = (Group&);
-Group & operator = (const QCString&);
+Group & operator = (const TQCString&);
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 TQCString& s) {Group a(s);return(*this==a);}
+bool operator != (const TQCString& 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 81edfd29a..78a5a97cf 100644
--- a/kabc/vcard/include/generated/ImageParam-generated.h
+++ b/kabc/vcard/include/generated/ImageParam-generated.h
@@ -3,13 +3,13 @@
public:
ImageParam();
ImageParam(const ImageParam&);
-ImageParam(const QCString&);
+ImageParam(const TQCString&);
ImageParam & operator = (ImageParam&);
-ImageParam & operator = (const QCString&);
+ImageParam & operator = (const TQCString&);
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 TQCString& s) {ImageParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 5a2c493ee..882081fbc 100644
--- a/kabc/vcard/include/generated/ImageValue-generated.h
+++ b/kabc/vcard/include/generated/ImageValue-generated.h
@@ -3,13 +3,13 @@
public:
ImageValue();
ImageValue(const ImageValue&);
-ImageValue(const QCString&);
+ImageValue(const TQCString&);
ImageValue & operator = (ImageValue&);
-ImageValue & operator = (const QCString&);
+ImageValue & operator = (const TQCString&);
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 TQCString& s) {ImageValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 46a6ca031..04132c857 100644
--- a/kabc/vcard/include/generated/ImgParam-generated.h
+++ b/kabc/vcard/include/generated/ImgParam-generated.h
@@ -3,13 +3,13 @@
public:
ImgParam();
ImgParam(const ImgParam&);
-ImgParam(const QCString&);
+ImgParam(const TQCString&);
ImgParam & operator = (ImgParam&);
-ImgParam & operator = (const QCString&);
+ImgParam & operator = (const TQCString&);
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 TQCString& s) {ImgParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 d75d54550..0774de9bf 100644
--- a/kabc/vcard/include/generated/ImgValue-generated.h
+++ b/kabc/vcard/include/generated/ImgValue-generated.h
@@ -3,13 +3,13 @@
public:
ImgValue();
ImgValue(const ImgValue&);
-ImgValue(const QCString&);
+ImgValue(const TQCString&);
ImgValue & operator = (ImgValue&);
-ImgValue & operator = (const QCString&);
+ImgValue & operator = (const TQCString&);
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 TQCString& s) {ImgValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 23e138b2f..c4930c59e 100644
--- a/kabc/vcard/include/generated/LangValue-generated.h
+++ b/kabc/vcard/include/generated/LangValue-generated.h
@@ -3,13 +3,13 @@
public:
LangValue();
LangValue(const LangValue&);
-LangValue(const QCString&);
+LangValue(const TQCString&);
LangValue & operator = (LangValue&);
-LangValue & operator = (const QCString&);
+LangValue & operator = (const TQCString&);
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 TQCString& s) {LangValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 082c2534d..d78715ec0 100644
--- a/kabc/vcard/include/generated/NValue-generated.h
+++ b/kabc/vcard/include/generated/NValue-generated.h
@@ -3,13 +3,13 @@
public:
NValue();
NValue(const NValue&);
-NValue(const QCString&);
+NValue(const TQCString&);
NValue & operator = (NValue&);
-NValue & operator = (const QCString&);
+NValue & operator = (const TQCString&);
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 TQCString& s) {NValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 0e69abd1d..17d56e680 100644
--- a/kabc/vcard/include/generated/Name-generated.h
+++ b/kabc/vcard/include/generated/Name-generated.h
@@ -3,13 +3,13 @@
public:
V_Name();
V_Name(const V_Name&);
-V_Name(const QCString&);
+V_Name(const TQCString&);
V_Name & operator = (V_Name&);
-V_Name & operator = (const QCString&);
+V_Name & operator = (const TQCString&);
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 TQCString& s) {V_Name a(s);return(*this==a);}
+bool operator != (const TQCString& 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 51eb1b738..661ecf5a3 100644
--- a/kabc/vcard/include/generated/OrgValue-generated.h
+++ b/kabc/vcard/include/generated/OrgValue-generated.h
@@ -3,13 +3,13 @@
public:
OrgValue();
OrgValue(const OrgValue&);
-OrgValue(const QCString&);
+OrgValue(const TQCString&);
OrgValue & operator = (OrgValue&);
-OrgValue & operator = (const QCString&);
+OrgValue & operator = (const TQCString&);
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 TQCString& s) {OrgValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 cf4666a4b..bf63e7166 100644
--- a/kabc/vcard/include/generated/Param-generated.h
+++ b/kabc/vcard/include/generated/Param-generated.h
@@ -3,13 +3,13 @@
public:
Param();
Param(const Param&);
-Param(const QCString&);
+Param(const TQCString&);
Param & operator = (Param&);
-Param & operator = (const QCString&);
+Param & operator = (const TQCString&);
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 TQCString& s) {Param a(s);return(*this==a);}
+bool operator != (const TQCString& 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 ef673c392..60b1e12d5 100644
--- a/kabc/vcard/include/generated/ParamName-generated.h
+++ b/kabc/vcard/include/generated/ParamName-generated.h
@@ -3,13 +3,13 @@
public:
V_ParamName();
V_ParamName(const V_ParamName&);
-V_ParamName(const QCString&);
+V_ParamName(const TQCString&);
V_ParamName & operator = (V_ParamName&);
-V_ParamName & operator = (const QCString&);
+V_ParamName & operator = (const TQCString&);
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 TQCString& s) {V_ParamName a(s);return(*this==a);}
+bool operator != (const TQCString& 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 e73500f67..f31a166c6 100644
--- a/kabc/vcard/include/generated/ParamValue-generated.h
+++ b/kabc/vcard/include/generated/ParamValue-generated.h
@@ -3,13 +3,13 @@
public:
V_ParamValue();
V_ParamValue(const V_ParamValue&);
-V_ParamValue(const QCString&);
+V_ParamValue(const TQCString&);
V_ParamValue & operator = (V_ParamValue&);
-V_ParamValue & operator = (const QCString&);
+V_ParamValue & operator = (const TQCString&);
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 TQCString& s) {V_ParamValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 1320f186c..f0eb6b4f4 100644
--- a/kabc/vcard/include/generated/PhoneNumberValue-generated.h
+++ b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
@@ -3,13 +3,13 @@
public:
PhoneNumberValue();
PhoneNumberValue(const PhoneNumberValue&);
-PhoneNumberValue(const QCString&);
+PhoneNumberValue(const TQCString&);
PhoneNumberValue & operator = (PhoneNumberValue&);
-PhoneNumberValue & operator = (const QCString&);
+PhoneNumberValue & operator = (const TQCString&);
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 TQCString& s) {PhoneNumberValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 a9ab2e8c5..64081be0b 100644
--- a/kabc/vcard/include/generated/SoundValue-generated.h
+++ b/kabc/vcard/include/generated/SoundValue-generated.h
@@ -3,13 +3,13 @@
public:
SoundValue();
SoundValue(const SoundValue&);
-SoundValue(const QCString&);
+SoundValue(const TQCString&);
SoundValue & operator = (SoundValue&);
-SoundValue & operator = (const QCString&);
+SoundValue & operator = (const TQCString&);
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 TQCString& s) {SoundValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 75fefb862..e3b13bca1 100644
--- a/kabc/vcard/include/generated/SourceParam-generated.h
+++ b/kabc/vcard/include/generated/SourceParam-generated.h
@@ -3,13 +3,13 @@
public:
SourceParam();
SourceParam(const SourceParam&);
-SourceParam(const QCString&);
+SourceParam(const TQCString&);
SourceParam & operator = (SourceParam&);
-SourceParam & operator = (const QCString&);
+SourceParam & operator = (const TQCString&);
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 TQCString& s) {SourceParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 3ee77cc3c..9f8f24270 100644
--- a/kabc/vcard/include/generated/TelParam-generated.h
+++ b/kabc/vcard/include/generated/TelParam-generated.h
@@ -3,13 +3,13 @@
public:
TelParam();
TelParam(const TelParam&);
-TelParam(const QCString&);
+TelParam(const TQCString&);
TelParam & operator = (TelParam&);
-TelParam & operator = (const QCString&);
+TelParam & operator = (const TQCString&);
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 TQCString& s) {TelParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 3213e1cd1..600da7727 100644
--- a/kabc/vcard/include/generated/TelValue-generated.h
+++ b/kabc/vcard/include/generated/TelValue-generated.h
@@ -3,13 +3,13 @@
public:
TelValue();
TelValue(const TelValue&);
-TelValue(const QCString&);
+TelValue(const TQCString&);
TelValue & operator = (TelValue&);
-TelValue & operator = (const QCString&);
+TelValue & operator = (const TQCString&);
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 TQCString& s) {TelValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 d075c102b..37dc56e55 100644
--- a/kabc/vcard/include/generated/TextBinParam-generated.h
+++ b/kabc/vcard/include/generated/TextBinParam-generated.h
@@ -3,13 +3,13 @@
public:
TextBinParam();
TextBinParam(const TextBinParam&);
-TextBinParam(const QCString&);
+TextBinParam(const TQCString&);
TextBinParam & operator = (TextBinParam&);
-TextBinParam & operator = (const QCString&);
+TextBinParam & operator = (const TQCString&);
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 TQCString& s) {TextBinParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 e9553ac2c..4c9580421 100644
--- a/kabc/vcard/include/generated/TextBinValue-generated.h
+++ b/kabc/vcard/include/generated/TextBinValue-generated.h
@@ -3,13 +3,13 @@
public:
TextBinValue();
TextBinValue(const TextBinValue&);
-TextBinValue(const QCString&);
+TextBinValue(const TQCString&);
TextBinValue & operator = (TextBinValue&);
-TextBinValue & operator = (const QCString&);
+TextBinValue & operator = (const TQCString&);
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 TQCString& s) {TextBinValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 9f46124bf..8babb0d9f 100644
--- a/kabc/vcard/include/generated/TextListValue-generated.h
+++ b/kabc/vcard/include/generated/TextListValue-generated.h
@@ -3,13 +3,13 @@
public:
TextListValue();
TextListValue(const TextListValue&);
-TextListValue(const QCString&);
+TextListValue(const TQCString&);
TextListValue & operator = (TextListValue&);
-TextListValue & operator = (const QCString&);
+TextListValue & operator = (const TQCString&);
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 TQCString& s) {TextListValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 d7f58caae..bd8e74b07 100644
--- a/kabc/vcard/include/generated/TextNSParam-generated.h
+++ b/kabc/vcard/include/generated/TextNSParam-generated.h
@@ -3,13 +3,13 @@
public:
TextNSParam();
TextNSParam(const TextNSParam&);
-TextNSParam(const QCString&);
+TextNSParam(const TQCString&);
TextNSParam & operator = (TextNSParam&);
-TextNSParam & operator = (const QCString&);
+TextNSParam & operator = (const TQCString&);
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 TQCString& s) {TextNSParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 154e1bf4c..54ae611a5 100644
--- a/kabc/vcard/include/generated/TextParam-generated.h
+++ b/kabc/vcard/include/generated/TextParam-generated.h
@@ -3,13 +3,13 @@
public:
TextParam();
TextParam(const TextParam&);
-TextParam(const QCString&);
+TextParam(const TQCString&);
TextParam & operator = (TextParam&);
-TextParam & operator = (const QCString&);
+TextParam & operator = (const TQCString&);
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 TQCString& s) {TextParam a(s);return(*this==a);}
+bool operator != (const TQCString& 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 e1c4dcc09..5b56b54a7 100644
--- a/kabc/vcard/include/generated/TextValue-generated.h
+++ b/kabc/vcard/include/generated/TextValue-generated.h
@@ -3,13 +3,13 @@
public:
TextValue();
TextValue(const TextValue&);
-TextValue(const QCString&);
+TextValue(const TQCString&);
TextValue & operator = (TextValue&);
-TextValue & operator = (const QCString&);
+TextValue & operator = (const TQCString&);
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 TQCString& s) {TextValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 dbcb5c1ed..5a691e6d6 100644
--- a/kabc/vcard/include/generated/URIValue-generated.h
+++ b/kabc/vcard/include/generated/URIValue-generated.h
@@ -3,13 +3,13 @@
public:
URIValue();
URIValue(const URIValue&);
-URIValue(const QCString&);
+URIValue(const TQCString&);
URIValue & operator = (URIValue&);
-URIValue & operator = (const QCString&);
+URIValue & operator = (const TQCString&);
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 TQCString& s) {URIValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 46e447b3b..0c6edfb46 100644
--- a/kabc/vcard/include/generated/UTCValue-generated.h
+++ b/kabc/vcard/include/generated/UTCValue-generated.h
@@ -3,13 +3,13 @@
public:
UTCValue();
UTCValue(const UTCValue&);
-UTCValue(const QCString&);
+UTCValue(const TQCString&);
UTCValue & operator = (UTCValue&);
-UTCValue & operator = (const QCString&);
+UTCValue & operator = (const TQCString&);
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 TQCString& s) {UTCValue a(s);return(*this==a);}
+bool operator != (const TQCString& 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 4d7d96d48..4f36d11da 100644
--- a/kabc/vcard/include/generated/VCard-generated.h
+++ b/kabc/vcard/include/generated/VCard-generated.h
@@ -3,13 +3,13 @@
public:
VCard();
VCard(const VCard&);
-VCard(const QCString&);
+VCard(const TQCString&);
VCard & operator = (VCard&);
-VCard & operator = (const QCString&);
+VCard & operator = (const TQCString&);
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 TQCString& s) {VCard a(s);return(*this==a);}
+bool operator != (const TQCString& 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 9f2dfbce8..4e973e62a 100644
--- a/kabc/vcard/include/generated/VCardEntity-generated.h
+++ b/kabc/vcard/include/generated/VCardEntity-generated.h
@@ -3,13 +3,13 @@
public:
VCardEntity();
VCardEntity(const VCardEntity&);
-VCardEntity(const QCString&);
+VCardEntity(const TQCString&);
VCardEntity & operator = (VCardEntity&);
-VCardEntity & operator = (const QCString&);
+VCardEntity & operator = (const TQCString&);
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 TQCString& s) {VCardEntity a(s);return(*this==a);}
+bool operator != (const TQCString& 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 7afac34b6..935d137b6 100644
--- a/kabc/vcard/include/generated/Value-generated.h
+++ b/kabc/vcard/include/generated/Value-generated.h
@@ -3,13 +3,13 @@
public:
Value();
Value(const Value&);
-Value(const QCString&);
+Value(const TQCString&);
Value & operator = (Value&);
-Value & operator = (const QCString&);
+Value & operator = (const TQCString&);
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 TQCString& s) {Value a(s);return(*this==a);}
+bool operator != (const TQCString& 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 919c6616d..3a33c7d54 100644
--- a/kabc/vcard/testread.cpp
+++ b/kabc/vcard/testread.cpp
@@ -2,8 +2,8 @@
#include <stdlib.h>
#include <assert.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <VCard.h>
@@ -16,16 +16,16 @@ int main(int argc, char * argv[])
exit(1);
}
- QFile f(argv[1]);
+ TQFile f(argv[1]);
- QCString str;
+ TQCString str;
if (!f.open(IO_ReadOnly)) {
cerr << "Couldn't open file \"" << argv[1] << endl;
exit(1);
}
- QTextStream t(&f);
+ TQTextStream t(&f);
while (!t.eof())
str += t.readLine().utf8() + '\n';
@@ -52,7 +52,7 @@ int main(int argc, char * argv[])
if (v.has(EntityEmail)) {
cerr << "Email parameter found" << endl;
- QCString s = v.contentLine(EntityEmail)->value()->asString();
+ TQCString s = v.contentLine(EntityEmail)->value()->asString();
cerr << "Email value == " << s << endl;
}
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index e4bbe7bc0..f9b8944d7 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -33,7 +33,7 @@ int main(int argc,char **argv)
cl2.setParamList( p );
v.add(cl2);
- QCString str = v.asString();
+ TQCString str = v.asString();
kdDebug() << "--- VCard begin ---" << endl
<< str
diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index aebef680c..d7354539b 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qmap.h>
-#include <qregexp.h>
+#include <tqmap.h>
+#include <tqregexp.h>
#include <kmdcodec.h>
#include "vcard21parser.h"
@@ -199,17 +199,17 @@ VCard21Parser::~VCard21Parser()
{
}
-void VCard21Parser::readFromString(KABC::AddressBook *addressbook, const QString &data)
+void VCard21Parser::readFromString(KABC::AddressBook *addressbook, const TQString &data)
{
KABC::Addressee mAddressee = readFromString(data);
addressbook->insertAddressee(mAddressee);
}
-KABC::Addressee VCard21Parser::readFromString( const QString &data)
+KABC::Addressee VCard21Parser::readFromString( const TQString &data)
{
KABC::Addressee addressee;
VCard21ParserImpl *vCard = VCard21ParserImpl::parseVCard(data);
- QString tmpStr;
+ TQString tmpStr;
// Check if parsing failed
if (vCard == 0)
@@ -218,8 +218,8 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
return addressee;
}
//set the addressees name and formated name
- QStringList tmpList = vCard->getValues(VCARD_N);
- QString formattedName = "";
+ TQStringList tmpList = vCard->getValues(VCARD_N);
+ TQString formattedName = "";
if (tmpList.count() > 0)
addressee.setFamilyName(tmpList[0]);
if (tmpList.count() > 1)
@@ -262,7 +262,7 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
addressee.setBirthday(VCardStringToDate(tmpStr));
//set the addressee's phone numbers
- for ( QValueListIterator<VCardLineX> i = vCard->_vcdata->begin();i != vCard->_vcdata->end(); ++i ) {
+ for ( TQValueListIterator<VCardLineX> i = vCard->_vcdata->begin();i != vCard->_vcdata->end(); ++i ) {
if ( (*i).name == VCARD_TEL ) {
int type = 0;
if ( (*i).qualified ) {
@@ -300,7 +300,7 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
}
//set the addressee's addresses
- for ( QValueListIterator<VCardLineX> i = vCard->_vcdata->begin();i != vCard->_vcdata->end(); ++i ) {
+ for ( TQValueListIterator<VCardLineX> i = vCard->_vcdata->begin();i != vCard->_vcdata->end(); ++i ) {
if ( (*i).name == VCARD_ADR ) {
int type = 0;
if ( (*i).qualified ) {
@@ -369,7 +369,7 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
-KABC::Address VCard21Parser::readAddressFromQStringList ( const QStringList &data, const int type )
+KABC::Address VCard21Parser::readAddressFromQStringList ( const TQStringList &data, const int type )
{
KABC::Address mAddress;
mAddress.setType( type );
@@ -393,20 +393,20 @@ KABC::Address VCard21Parser::readAddressFromQStringList ( const QStringList &dat
}
-VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
+VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err )
{
int _err = 0;
int _state = VC_STATE_BEGIN;
- QValueList<VCardLineX> *vcdata;
- QValueList<QString> lines;
+ TQValueList<VCardLineX> *vcdata;
+ TQValueList<TQString> lines;
- vcdata = new QValueList<VCardLineX>;
+ vcdata = new TQValueList<VCardLineX>;
- lines = QStringList::split( QRegExp( "[\x0d\x0a]" ), vc );
+ lines = TQStringList::split( TQRegExp( "[\x0d\x0a]" ), vc );
// for each line in the vCard
- for ( QStringList::Iterator j = lines.begin(); j != lines.end(); ++j ) {
+ for ( TQStringList::Iterator j = lines.begin(); j != lines.end(); ++j ) {
VCardLineX _vcl;
// take spaces off the end - ugly but necessary hack
@@ -436,12 +436,12 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
break;
}
- QString key = (*j).left( colon );
- QString value = (*j).mid( colon + 1 );
+ TQString key = (*j).left( colon );
+ TQString value = (*j).mid( colon + 1 );
// check for qualifiers and
// set name, qualified, qualifier(s)
- QStringList keyTokens = QStringList::split( ';', key );
+ TQStringList keyTokens = TQStringList::split( ';', key );
bool qp = false, first_pass = true;
bool b64 = false;
@@ -449,8 +449,8 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
_vcl.qualified = false;
_vcl.name = keyTokens[ 0 ].lower();
- for ( QStringList::Iterator z = keyTokens.begin(); z != keyTokens.end(); ++z ) {
- QString zz = (*z).lower();
+ for ( TQStringList::Iterator z = keyTokens.begin(); z != keyTokens.end(); ++z ) {
+ TQString zz = (*z).lower();
if ( zz == VCARD_QUOTED_PRINTABLE || zz == VCARD_ENCODING_QUOTED_PRINTABLE ) {
qp = true;
} else if ( zz == VCARD_BASE64 ) {
@@ -489,9 +489,9 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
value.append(*( ++j ));
}
}
- _vcl.parameters = QStringList::split( ';', value, true );
+ _vcl.parameters = TQStringList::split( ';', value, true );
if ( qp ) { // decode the quoted printable
- for ( QStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
+ for ( TQStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
*z = KCodecs::quotedPrintableDecode( (*z).latin1() );
}
}
@@ -538,7 +538,7 @@ VCard21ParserImpl::VCard21ParserImpl()
{
}
-VCard21ParserImpl::VCard21ParserImpl(QValueList<VCardLineX> *_vcd)
+VCard21ParserImpl::VCard21ParserImpl(TQValueList<VCardLineX> *_vcd)
: _vcdata(_vcd)
{
}
@@ -549,13 +549,13 @@ VCard21ParserImpl::~VCard21ParserImpl()
_vcdata = 0;
}
-QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifier)
+TQString VCard21ParserImpl::getValue(const TQString& name, const TQString& qualifier)
{
- QString failed;
- const QString lowname = name.lower();
- const QString lowqualifier = qualifier.lower();
+ TQString failed;
+ const TQString lowname = name.lower();
+ const TQString lowqualifier = qualifier.lower();
- for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+ for (TQValueListIterator<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];
@@ -566,12 +566,12 @@ QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifie
}
-QString VCard21ParserImpl::getValue(const QString& name)
+TQString VCard21ParserImpl::getValue(const TQString& name)
{
- QString failed;
- const QString lowname = name.lower();
+ TQString failed;
+ const TQString lowname = name.lower();
- for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+ for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && !(*i).qualified) {
if ((*i).parameters.count() > 0)
return (*i).parameters[0];
@@ -582,27 +582,27 @@ QString VCard21ParserImpl::getValue(const QString& name)
}
-QStringList VCard21ParserImpl::getValues(const QString& name)
+TQStringList VCard21ParserImpl::getValues(const TQString& name)
{
- const QString lowname = name.lower();
- for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+ const TQString lowname = name.lower();
+ for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && !(*i).qualified)
return (*i).parameters;
}
// failed.
- return QStringList();
+ return TQStringList();
}
-QStringList VCard21ParserImpl::getValues(const QString& name, const QString& qualifier)
+TQStringList VCard21ParserImpl::getValues(const TQString& name, const TQString& qualifier)
{
- const QString lowname = name.lower();
- const QString lowqualifier = qualifier.lower();
- for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+ const TQString lowname = name.lower();
+ const TQString lowqualifier = qualifier.lower();
+ for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier))
return (*i).parameters;
}
// failed.
- return QStringList();
+ return TQStringList();
}
diff --git a/kabc/vcard21parser.h b/kabc/vcard21parser.h
index 0c9e3db8a..0eb66fa93 100644
--- a/kabc/vcard21parser.h
+++ b/kabc/vcard21parser.h
@@ -22,12 +22,12 @@
#ifndef KABC_VCARD21FORMAT_H
#define KABC_VCARD21FORMAT_H
-#include <qdatetime.h>
+#include <tqdatetime.h>
#include <kdebug.h>
-#include <qregexp.h>
-#include <qstring.h>
+#include <tqregexp.h>
+#include <tqstring.h>
#include <kurl.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
#include "addressee.h"
#include "addressbook.h"
@@ -160,17 +160,17 @@ public:
* @param ab The address book.
* @param str The vcard string.
*/
- void readFromString( KABC::AddressBook *ab, const QString &str );
+ void readFromString( KABC::AddressBook *ab, const TQString &str );
/**
* FIXME: we need a writeToString method
- * QString writeToString (KABC::AddressBook *);
+ * TQString writeToString (KABC::AddressBook *);
*/
/**
* Parses a string in vcard2.1 format and returns the inherent addressee.
*/
- KABC::Addressee readFromString( const QString &data);
+ KABC::Addressee readFromString( const TQString &data);
/**
* Helper method to store a address.
@@ -178,7 +178,7 @@ public:
* @param data A string list, that is filled with 'street', 'house number' ...
* @param type The type of the returned address.
*/
- static KABC::Address readAddressFromQStringList (const QStringList &data, const int type);
+ static KABC::Address readAddressFromQStringList (const TQStringList &data, const int type);
};
}
@@ -189,10 +189,10 @@ public:
class KABC_EXPORT VCardLineX
{
public:
- QString name;
+ TQString name;
bool qualified;
- QValueList<QString> qualifiers;
- QValueList<QString> parameters;
+ TQValueList<TQString> qualifiers;
+ TQValueList<TQString> parameters;
bool isValid() const;
};
@@ -206,16 +206,16 @@ class KABC_EXPORT VCard21ParserImpl
public:
VCard21ParserImpl();
virtual ~VCard21ParserImpl();
- static VCard21ParserImpl *parseVCard(const QString& vc, int *err = NULL);
- QString getValue(const QString& name, const QString& qualifier);
- QString getValue(const QString& name);
- QStringList getValues(const QString& name, const QString& qualifier);
- QStringList getValues(const QString& name);
+ static VCard21ParserImpl *parseVCard(const TQString& vc, int *err = NULL);
+ TQString getValue(const TQString& name, const TQString& qualifier);
+ TQString getValue(const TQString& name);
+ TQStringList getValues(const TQString& name, const TQString& qualifier);
+ TQStringList getValues(const TQString& name);
- QValueList<VCardLineX> *_vcdata;
+ TQValueList<VCardLineX> *_vcdata;
private:
- VCard21ParserImpl (QValueList<VCardLineX> *_vcd);
+ VCard21ParserImpl (TQValueList<VCardLineX> *_vcd);
};
#endif
diff --git a/kabc/vcardconverter.cpp b/kabc/vcardconverter.cpp
index 42283488a..d575b019c 100644
--- a/kabc/vcardconverter.cpp
+++ b/kabc/vcardconverter.cpp
@@ -43,7 +43,7 @@ VCardConverter::~VCardConverter()
d = 0;
}
-QString VCardConverter::createVCard( const Addressee &addr, Version version )
+TQString VCardConverter::createVCard( const Addressee &addr, Version version )
{
Addressee::List list;
list.append( addr );
@@ -51,21 +51,21 @@ QString VCardConverter::createVCard( const Addressee &addr, Version version )
return createVCards( list, version );
}
-QString VCardConverter::createVCards( Addressee::List list, Version version )
+TQString VCardConverter::createVCards( Addressee::List list, Version version )
{
VCardTool tool;
return tool.createVCards( list, ( version == v3_0 ? VCard::v3_0 : VCard::v2_1 ) );
}
-Addressee VCardConverter::parseVCard( const QString& vcard )
+Addressee VCardConverter::parseVCard( const TQString& vcard )
{
Addressee::List list = parseVCards( vcard );
return list[ 0 ];
}
-Addressee::List VCardConverter::parseVCards( const QString& vcard )
+Addressee::List VCardConverter::parseVCards( const TQString& vcard )
{
VCardTool tool;
@@ -74,7 +74,7 @@ Addressee::List VCardConverter::parseVCards( const QString& vcard )
// ---------------------------- deprecated stuff ---------------------------- //
-bool VCardConverter::vCardToAddressee( const QString &str, Addressee &addr, Version version )
+bool VCardConverter::vCardToAddressee( const TQString &str, Addressee &addr, Version version )
{
if ( version == v2_1 ) {
addr = d->vcard21parser.readFromString( str );
@@ -87,7 +87,7 @@ bool VCardConverter::vCardToAddressee( const QString &str, Addressee &addr, Vers
return false;
}
-bool VCardConverter::addresseeToVCard( const Addressee &addr, QString &str, Version version )
+bool VCardConverter::addresseeToVCard( const Addressee &addr, TQString &str, Version version )
{
if ( version == v2_1 )
return false;
@@ -101,29 +101,29 @@ bool VCardConverter::addresseeToVCard( const Addressee &addr, QString &str, Vers
/* Helper functions */
-QString KABC::dateToVCardString( const QDateTime &dateTime )
+TQString KABC::dateToVCardString( const TQDateTime &dateTime )
{
return dateTime.toString("yyyyMMddThhmmssZ");
}
-QString KABC::dateToVCardString( const QDate &date )
+TQString KABC::dateToVCardString( const TQDate &date )
{
return date.toString("yyyyMMdd");
}
-QDateTime KABC::VCardStringToDate( const QString &dateString )
+TQDateTime KABC::VCardStringToDate( const TQString &dateString )
{
- QDate date;
- QTime time;
- QString d( dateString );
+ TQDate date;
+ TQTime time;
+ TQString d( dateString );
d = d.remove('-').remove(':');
if (d.length()>=8)
- date = QDate( d.mid(0,4).toUInt(), d.mid(4,2).toUInt(), d.mid(6,2).toUInt() );
+ date = TQDate( d.mid(0,4).toUInt(), d.mid(4,2).toUInt(), d.mid(6,2).toUInt() );
if (d.length()>9 && d[8].upper()=='T')
- time = QTime( d.mid(9,2).toUInt(), d.mid(11,2).toUInt(), d.mid(13,2).toUInt() );
+ time = TQTime( d.mid(9,2).toUInt(), d.mid(11,2).toUInt(), d.mid(13,2).toUInt() );
- return QDateTime( date, time );
+ return TQDateTime( date, time );
}
diff --git a/kabc/vcardconverter.h b/kabc/vcardconverter.h
index 6c427d0a9..dbc45f27a 100644
--- a/kabc/vcardconverter.h
+++ b/kabc/vcardconverter.h
@@ -21,7 +21,7 @@
#ifndef KABC_VCARDCONVERTER_H
#define KABC_VCARDCONVERTER_H
-#include <qstring.h>
+#include <tqstring.h>
#include "addressee.h"
@@ -37,10 +37,10 @@ namespace KABC {
\code
- QFile file( "myfile.vcf" );
+ TQFile file( "myfile.vcf" );
file.open( IO_ReadOnly );
- QString data = file.readAll();
+ TQString data = file.readAll();
VCardConverter converter;
Addressee::List list = converter.parseVCards( data );
@@ -81,7 +81,7 @@ class KABC_EXPORT VCardConverter
@param addr The contact object
@param version The version of the generated vCard format
*/
- QString createVCard( const Addressee &addr, Version version = v3_0 );
+ TQString createVCard( const Addressee &addr, Version version = v3_0 );
/**
Creates a string in vCard format which contains the given
@@ -91,39 +91,39 @@ class KABC_EXPORT VCardConverter
@param version The version of the generated vCard format
*/
// FIXME: Add error handling
- QString createVCards( Addressee::List list, Version version = v3_0 );
+ TQString createVCards( Addressee::List list, Version version = v3_0 );
// FIXME: Add "createVCards( AddressBook * )"
/**
Parses a string in vCard format and returns the first contact.
*/
- Addressee parseVCard( const QString& vcard );
+ Addressee parseVCard( const TQString& vcard );
/**
Parses a string in vCard format and returns a list of contact objects.
*/
// FIXME: Add error handling
- Addressee::List parseVCards( const QString& vcard );
+ Addressee::List parseVCards( const TQString& vcard );
- // FIXME: Add "bool parseVCards( AddressBook *, const QString &vcard )"
+ // FIXME: Add "bool parseVCards( AddressBook *, const TQString &vcard )"
/**
@deprecated
*/
- bool vCardToAddressee( const QString&, Addressee &, Version version = v3_0 ) KDE_DEPRECATED;
+ bool vCardToAddressee( const TQString&, Addressee &, Version version = v3_0 ) KDE_DEPRECATED;
/**
@deprecated
*/
- bool addresseeToVCard( const Addressee&, QString&, Version version = v3_0 ) KDE_DEPRECATED;
+ bool addresseeToVCard( const Addressee&, TQString&, Version version = v3_0 ) KDE_DEPRECATED;
private:
/**
Split a string and replaces escaped separators on the fly with
unescaped ones.
*/
- QStringList splitString( const QChar &sep, const QString &value );
+ TQStringList splitString( const TQChar &sep, const TQString &value );
struct VCardConverterData;
VCardConverterData *d;
@@ -135,29 +135,29 @@ class KABC_EXPORT VCardConverter
*/
/**
- * Converts a QDateTime to a date string as it is used in VCard and LDIF files.
+ * Converts a TQDateTime to a date string as it is used in VCard and LDIF files.
* The return value is in the form "yyyyMMddThhmmssZ" (e.g. "20031201T120000Z")
* @param dateTime date and time to be converted
* @since 3.2
*/
-KABC_EXPORT QString dateToVCardString( const QDateTime &dateTime );
+KABC_EXPORT TQString dateToVCardString( const TQDateTime &dateTime );
/**
- * Converts a QDate to a short date string as it is used in VCard and LDIF files.
+ * Converts a TQDate to a short date string as it is used in VCard and LDIF files.
* The return value is in the form "yyyyMMdd" (e.g. "20031201")
* @param date date to be converted
* @since 3.2
*/
-KABC_EXPORT QString dateToVCardString( const QDate &date );
+KABC_EXPORT TQString dateToVCardString( const TQDate &date );
/**
- * Converts a date string as it is used in VCard and LDIF files to a QDateTime value.
+ * Converts a date string as it is used in VCard and LDIF files to a TQDateTime value.
* If the date string does not contain a time value, it will be returned as 00:00:00.
- * (e.g. "20031201T120000" will return a QDateTime for 2003-12-01 at 12:00)
+ * (e.g. "20031201T120000" will return a TQDateTime for 2003-12-01 at 12:00)
* @param dateString string representing the date and time.
* @since 3.2
*/
-KABC_EXPORT QDateTime VCardStringToDate( const QString &dateString );
+KABC_EXPORT TQDateTime VCardStringToDate( const TQString &dateString );
}
#endif
diff --git a/kabc/vcardformat.cpp b/kabc/vcardformat.cpp
index ec2d4806e..147aa4259 100644
--- a/kabc/vcardformat.cpp
+++ b/kabc/vcardformat.cpp
@@ -34,9 +34,9 @@ VCardFormat::~VCardFormat()
delete mImpl;
}
-bool VCardFormat::load( AddressBook *addressBook, const QString &fileName )
+bool VCardFormat::load( AddressBook *addressBook, const TQString &fileName )
{
- QFile f( fileName );
+ TQFile f( fileName );
if ( !f.open( IO_ReadOnly ) ) return false;
bool result = mImpl->loadAll( addressBook, 0, &f );
@@ -46,9 +46,9 @@ bool VCardFormat::load( AddressBook *addressBook, const QString &fileName )
return result;
}
-bool VCardFormat::save( AddressBook *addressBook, const QString &fileName )
+bool VCardFormat::save( AddressBook *addressBook, const TQString &fileName )
{
- QFile f( fileName );
+ TQFile f( fileName );
if ( !f.open( IO_WriteOnly ) ) return false;
mImpl->saveAll( addressBook, 0, &f );
diff --git a/kabc/vcardformat.h b/kabc/vcardformat.h
index 6d90c4836..8194056cb 100644
--- a/kabc/vcardformat.h
+++ b/kabc/vcardformat.h
@@ -20,7 +20,7 @@
#ifndef KABC_VCARDFORMAT_H
#define KABC_VCARDFORMAT_H
-#include <qstring.h>
+#include <tqstring.h>
#include "format.h"
@@ -37,8 +37,8 @@ class KABC_EXPORT_DEPRECATED VCardFormat : public Format {
VCardFormat();
virtual ~VCardFormat();
- bool load( AddressBook *, const QString &fileName );
- bool save( AddressBook *, const QString &fileName );
+ bool load( AddressBook *, const TQString &fileName );
+ bool save( AddressBook *, const TQString &fileName );
private:
VCardFormatImpl *mImpl;
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index 51e6f2eb5..38d95294c 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -17,8 +17,8 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kmdcodec.h>
@@ -33,12 +33,12 @@
using namespace KABC;
using namespace VCARD;
-bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
+bool VCardFormatImpl::load( Addressee &addressee, TQFile *file )
{
kdDebug(5700) << "VCardFormat::load()" << endl;
- QByteArray fdata = file->readAll();
- QCString data(fdata.data(), fdata.size()+1);
+ TQByteArray fdata = file->readAll();
+ TQCString data(fdata.data(), fdata.size()+1);
VCardEntity e( data );
@@ -53,12 +53,12 @@ bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
return false;
}
-bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
+bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, TQFile *file )
{
kdDebug(5700) << "VCardFormat::loadAll()" << endl;
- QByteArray fdata = file->readAll();
- QCString data(fdata.data(), fdata.size()+1);
+ TQByteArray fdata = file->readAll();
+ TQCString data(fdata.data(), fdata.size()+1);
VCardEntity e( data );
@@ -75,7 +75,7 @@ bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFi
return true;
}
-void VCardFormatImpl::save( const Addressee &addressee, QFile *file )
+void VCardFormatImpl::save( const Addressee &addressee, TQFile *file )
{
VCardEntity vcards;
VCardList vcardlist;
@@ -88,11 +88,11 @@ void VCardFormatImpl::save( const Addressee &addressee, QFile *file )
vcardlist.append( v );
vcards.setCardList( vcardlist );
- QCString vcardData = vcards.asString();
+ TQCString vcardData = vcards.asString();
file->writeBlock( (const char*)vcardData, vcardData.length() );
}
-void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file )
+void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, TQFile *file )
{
VCardEntity vcards;
VCardList vcardlist;
@@ -110,23 +110,23 @@ void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file
vcards.setCardList( vcardlist );
- QCString vcardData = vcards.asString();
+ TQCString vcardData = vcards.asString();
file->writeBlock( (const char*)vcardData, vcardData.length() );
}
bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
{
- QPtrList<ContentLine> contentLines = v.contentLineList();
+ TQPtrList<ContentLine> contentLines = v.contentLineList();
ContentLine *cl;
for( cl = contentLines.first(); cl; cl = contentLines.next() ) {
- QCString n = cl->name();
+ TQCString n = cl->name();
if ( n.left( 2 ) == "X-" ) {
n = n.mid( 2 );
int posDash = n.find( "-" );
- addressee.insertCustom( QString::fromUtf8( n.left( posDash ) ),
- QString::fromUtf8( n.mid( posDash + 1 ) ),
- QString::fromUtf8( cl->value()->asString() ) );
+ addressee.insertCustom( TQString::fromUtf8( n.left( posDash ) ),
+ TQString::fromUtf8( n.mid( posDash + 1 ) ),
+ TQString::fromUtf8( cl->value()->asString() ) );
continue;
}
@@ -206,7 +206,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
break;
case EntityCategories:
- addressee.setCategories( QStringList::split( ",", readTextValue( cl ) ) );
+ addressee.setCategories( TQStringList::split( ",", readTextValue( cl ) ) );
break;
case EntityBirthday:
@@ -267,7 +267,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
if ( address.isEmpty() )
address.setType( type );
- address.setLabel( QString::fromUtf8( cl->value()->asString() ) );
+ address.setLabel( TQString::fromUtf8( cl->value()->asString() ) );
addressee.insertAddress( address );
}
}
@@ -278,21 +278,21 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v, bool intern )
{
ContentLine cl;
- QString value;
+ TQString value;
addTextValue( v, EntityName, addressee.name() );
addTextValue( v, EntityUID, addressee.uid() );
addTextValue( v, EntityURI, addressee.uri() );
addTextValue( v, EntityFullName, addressee.formattedName() );
- QStringList emails = addressee.emails();
- QStringList::ConstIterator it4;
+ TQStringList emails = addressee.emails();
+ TQStringList::ConstIterator it4;
for( it4 = emails.begin(); it4 != emails.end(); ++it4 ) {
addTextValue( v, EntityEmail, *it4 );
}
- QStringList customs = addressee.customs();
- QStringList::ConstIterator it5;
+ TQStringList customs = addressee.customs();
+ TQStringList::ConstIterator it5;
for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) {
addCustomValue( v, *it5 );
}
@@ -346,20 +346,20 @@ void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v
addSoundValue( v, addressee.sound(), addressee, intern );
}
-void VCardFormatImpl::addCustomValue( VCARD::VCard *v, const QString &txt )
+void VCardFormatImpl::addCustomValue( VCARD::VCard *v, const TQString &txt )
{
if ( txt.isEmpty() ) return;
ContentLine cl;
cl.setName( "X-" + txt.left( txt.find( ":" ) ).utf8() );
- QString value = txt.mid( txt.find( ":" ) + 1 );
+ TQString value = txt.mid( txt.find( ":" ) + 1 );
if ( value.isEmpty() )
return;
cl.setValue( new TextValue( value.utf8() ) );
v->add(cl);
}
-void VCardFormatImpl::addTextValue( VCARD::VCard *v, EntityType type, const QString &txt )
+void VCardFormatImpl::addTextValue( VCARD::VCard *v, EntityType type, const TQString &txt )
{
if ( txt.isEmpty() ) return;
@@ -370,7 +370,7 @@ void VCardFormatImpl::addTextValue( VCARD::VCard *v, EntityType type, const QStr
}
void VCardFormatImpl::addDateValue( VCARD::VCard *vcard, EntityType type,
- const QDate &date )
+ const TQDate &date )
{
if ( !date.isValid() ) return;
@@ -383,7 +383,7 @@ void VCardFormatImpl::addDateValue( VCARD::VCard *vcard, EntityType type,
}
void VCardFormatImpl::addDateTimeValue( VCARD::VCard *vcard, EntityType type,
- const QDateTime &dateTime )
+ const TQDateTime &dateTime )
{
if ( !dateTime.isValid() ) return;
@@ -503,13 +503,13 @@ Address VCardFormatImpl::readAddressValue( ContentLine *cl )
{
Address a;
AdrValue *v = (AdrValue *)cl->value();
- a.setPostOfficeBox( QString::fromUtf8( v->poBox() ) );
- a.setExtended( QString::fromUtf8( v->extAddress() ) );
- a.setStreet( QString::fromUtf8( v->street() ) );
- a.setLocality( QString::fromUtf8( v->locality() ) );
- a.setRegion( QString::fromUtf8( v->region() ) );
- a.setPostalCode( QString::fromUtf8( v->postCode() ) );
- a.setCountry( QString::fromUtf8( v->countryName() ) );
+ a.setPostOfficeBox( TQString::fromUtf8( v->poBox() ) );
+ a.setExtended( TQString::fromUtf8( v->extAddress() ) );
+ a.setStreet( TQString::fromUtf8( v->street() ) );
+ a.setLocality( TQString::fromUtf8( v->locality() ) );
+ a.setRegion( TQString::fromUtf8( v->region() ) );
+ a.setPostalCode( TQString::fromUtf8( v->postCode() ) );
+ a.setCountry( TQString::fromUtf8( v->countryName() ) );
a.setType( readAddressParam( cl ) );
@@ -553,11 +553,11 @@ void VCardFormatImpl::addNValue( VCARD::VCard *vcard, const Addressee &a )
void VCardFormatImpl::readNValue( ContentLine *cl, Addressee &a )
{
NValue *v = (NValue *)cl->value();
- a.setFamilyName( QString::fromUtf8( v->family() ) );
- a.setGivenName( QString::fromUtf8( v->given() ) );
- a.setAdditionalName( QString::fromUtf8( v->middle() ) );
- a.setPrefix( QString::fromUtf8( v->prefix() ) );
- a.setSuffix( QString::fromUtf8( v->suffix() ) );
+ a.setFamilyName( TQString::fromUtf8( v->family() ) );
+ a.setGivenName( TQString::fromUtf8( v->given() ) );
+ a.setAdditionalName( TQString::fromUtf8( v->middle() ) );
+ a.setPrefix( TQString::fromUtf8( v->prefix() ) );
+ a.setSuffix( TQString::fromUtf8( v->suffix() ) );
}
void VCardFormatImpl::addTelephoneValue( VCARD::VCard *v, const PhoneNumber &p )
@@ -593,7 +593,7 @@ PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
{
PhoneNumber p;
TelValue *value = (TelValue *)cl->value();
- p.setNumber( QString::fromUtf8( value->asString() ) );
+ p.setNumber( TQString::fromUtf8( value->asString() ) );
int type = 0;
ParamList params = cl->paramList();
@@ -621,33 +621,33 @@ PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
return p;
}
-QString VCardFormatImpl::readTextValue( ContentLine *cl )
+TQString VCardFormatImpl::readTextValue( ContentLine *cl )
{
VCARD::Value *value = cl->value();
if ( value ) {
- return QString::fromUtf8( value->asString() );
+ return TQString::fromUtf8( value->asString() );
} else {
kdDebug(5700) << "No value: " << cl->asString() << endl;
- return QString::null;
+ return TQString::null;
}
}
-QDate VCardFormatImpl::readDateValue( ContentLine *cl )
+TQDate VCardFormatImpl::readDateValue( ContentLine *cl )
{
DateValue *dateValue = (DateValue *)cl->value();
if ( dateValue )
return dateValue->qdate();
else
- return QDate();
+ return TQDate();
}
-QDateTime VCardFormatImpl::readDateTimeValue( ContentLine *cl )
+TQDateTime VCardFormatImpl::readDateTimeValue( ContentLine *cl )
{
DateValue *dateValue = (DateValue *)cl->value();
if ( dateValue )
return dateValue->qdt();
else
- return QDateTime();
+ return TQDateTime();
}
Geo VCardFormatImpl::readGeoValue( ContentLine *cl )
@@ -742,18 +742,18 @@ Key VCardFormatImpl::readKeyValue( VCARD::ContentLine *cl )
key.setType( Key::PGP );
else {
key.setType( Key::Custom );
- key.setCustomTypeString( QString::fromUtf8( (*it)->value() ) );
+ key.setCustomTypeString( TQString::fromUtf8( (*it)->value() ) );
}
}
}
if ( isBinary ) {
- QByteArray data;
+ TQByteArray data;
KCodecs::base64Decode( v->asString().stripWhiteSpace(), data );
key.setBinaryData( data );
} else {
- key.setTextData( QString::fromUtf8( v->asString() ) );
+ key.setTextData( TQString::fromUtf8( v->asString() ) );
}
return key;
@@ -773,7 +773,7 @@ void VCardFormatImpl::addAgentValue( VCARD::VCard *vcard, const Agent &agent )
ParamList params;
if ( agent.isIntern() ) {
- QString vstr;
+ TQString vstr;
Addressee *addr = agent.addressee();
if ( addr ) {
writeToString( (*addr), vstr );
@@ -807,7 +807,7 @@ Agent VCardFormatImpl::readAgentValue( VCARD::ContentLine *cl )
}
if ( isIntern ) {
- QString vstr = QString::fromUtf8( v->asString() );
+ TQString vstr = TQString::fromUtf8( v->asString() );
vstr.replace( "\\n", "\r\n" );
vstr.replace( "\\:", ":" );
vstr.replace( "\\,", "," );
@@ -816,7 +816,7 @@ Agent VCardFormatImpl::readAgentValue( VCARD::ContentLine *cl )
readFromString( vstr, *addr );
agent.setAddressee( addr );
} else {
- agent.setUrl( QString::fromUtf8( v->asString() ) );
+ agent.setUrl( TQString::fromUtf8( v->asString() ) );
}
return agent;
@@ -835,15 +835,15 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty
ParamList params;
if ( pic.isIntern() ) {
- QImage img = pic.data();
+ TQImage img = pic.data();
if ( intern ) { // only for vCard export we really write the data inline
- QByteArray data;
- QDataStream s( data, IO_WriteOnly );
+ TQByteArray data;
+ TQDataStream s( data, IO_WriteOnly );
s.setVersion( 4 ); // to produce valid png files
s << img;
cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
} else { // save picture in cache
- QString dir;
+ TQString dir;
if ( type == EntityPhoto )
dir = "photos";
if ( type == EntityLogo )
@@ -868,7 +868,7 @@ Picture VCardFormatImpl::readPictureValue( VCARD::ContentLine *cl, VCARD::Entity
{
Picture pic;
bool isInline = false;
- QString picType;
+ TQString picType;
TextValue *v = (TextValue *)cl->value();
ParamList params = cl->paramList();
@@ -877,13 +877,13 @@ Picture VCardFormatImpl::readPictureValue( VCARD::ContentLine *cl, VCARD::Entity
if ( (*it)->name() == "ENCODING" && (*it)->value() == "b" )
isInline = true;
if ( (*it)->name() == "TYPE" && !(*it)->value().isEmpty() )
- picType = QString::fromUtf8( (*it)->value() );
+ picType = TQString::fromUtf8( (*it)->value() );
}
if ( isInline ) {
- QImage img;
+ TQImage img;
if ( v->asString() == "<dummy>" ) { // no picture inline stored => picture is in cache
- QString dir;
+ TQString dir;
if ( type == EntityPhoto )
dir = "photos";
if ( type == EntityLogo )
@@ -891,14 +891,14 @@ Picture VCardFormatImpl::readPictureValue( VCARD::ContentLine *cl, VCARD::Entity
img.load( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ) );
} else {
- QByteArray data;
+ TQByteArray data;
KCodecs::base64Decode( v->asString(), data );
img.loadFromData( data );
}
pic.setData( img );
pic.setType( picType );
} else {
- pic.setUrl( QString::fromUtf8( v->asString() ) );
+ pic.setUrl( TQString::fromUtf8( v->asString() ) );
}
return pic;
@@ -917,11 +917,11 @@ void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, co
ParamList params;
if ( sound.isIntern() ) {
- QByteArray data = sound.data();
+ TQByteArray data = sound.data();
if ( intern ) { // only for vCard export we really write the data inline
cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
} else { // save sound in cache
- QFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+ TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
if ( file.open( IO_WriteOnly ) ) {
file.writeBlock( data );
}
@@ -951,9 +951,9 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
}
if ( isInline ) {
- QByteArray data;
+ TQByteArray data;
if ( v->asString() == "<dummy>" ) { // no sound inline stored => sound is in cache
- QFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+ TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
if ( file.open( IO_ReadOnly ) ) {
data = file.readAll();
file.close();
@@ -963,13 +963,13 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
}
sound.setData( data );
} else {
- sound.setUrl( QString::fromUtf8( v->asString() ) );
+ sound.setUrl( TQString::fromUtf8( v->asString() ) );
}
return sound;
}
-bool VCardFormatImpl::readFromString( const QString &vcard, Addressee &addressee )
+bool VCardFormatImpl::readFromString( const TQString &vcard, Addressee &addressee )
{
VCardEntity e( vcard.utf8() );
VCardListIterator it( e.cardList() );
@@ -983,7 +983,7 @@ bool VCardFormatImpl::readFromString( const QString &vcard, Addressee &addressee
return false;
}
-bool VCardFormatImpl::writeToString( const Addressee &addressee, QString &vcard )
+bool VCardFormatImpl::writeToString( const Addressee &addressee, TQString &vcard )
{
VCardEntity vcards;
VCardList vcardlist;
@@ -995,7 +995,7 @@ bool VCardFormatImpl::writeToString( const Addressee &addressee, QString &vcard
vcardlist.append( v );
vcards.setCardList( vcardlist );
- vcard = QString::fromUtf8( vcards.asString() );
+ vcard = TQString::fromUtf8( vcards.asString() );
return true;
}
diff --git a/kabc/vcardformatimpl.h b/kabc/vcardformatimpl.h
index 3a29e3a92..78c466a86 100644
--- a/kabc/vcardformatimpl.h
+++ b/kabc/vcardformatimpl.h
@@ -21,8 +21,8 @@
#ifndef KABC_VCARDFORMATIMPL_H
#define KABC_VCARDFORMATIMPL_H
-#include <qstring.h>
-#include <qfile.h>
+#include <tqstring.h>
+#include <tqfile.h>
#include "address.h"
#include "addressee.h"
@@ -43,26 +43,26 @@ class AddressBook;
class KABC_EXPORT_DEPRECATED VCardFormatImpl
{
public:
- bool load( Addressee &, QFile *file );
- bool loadAll( AddressBook *, Resource *, QFile *file );
- void save( const Addressee &, QFile *file );
- void saveAll( AddressBook *, Resource *, QFile *file );
+ bool load( Addressee &, TQFile *file );
+ bool loadAll( AddressBook *, Resource *, TQFile *file );
+ void save( const Addressee &, TQFile *file );
+ void saveAll( AddressBook *, Resource *, TQFile *file );
- bool readFromString( const QString &vcard, Addressee &addr );
- bool writeToString( const Addressee &addressee, QString &vcard );
+ bool readFromString( const TQString &vcard, Addressee &addr );
+ bool writeToString( const Addressee &addressee, TQString &vcard );
protected:
bool loadAddressee( Addressee &, VCARD::VCard & );
void saveAddressee( const Addressee &, VCARD::VCard *, bool intern );
- void addTextValue (VCARD::VCard *, VCARD::EntityType, const QString & );
- QString readTextValue( VCARD::ContentLine * );
+ void addTextValue (VCARD::VCard *, VCARD::EntityType, const TQString & );
+ TQString readTextValue( VCARD::ContentLine * );
- void addDateValue( VCARD::VCard *, VCARD::EntityType, const QDate & );
- QDate readDateValue( VCARD::ContentLine * );
+ void addDateValue( VCARD::VCard *, VCARD::EntityType, const TQDate & );
+ TQDate readDateValue( VCARD::ContentLine * );
- void addDateTimeValue( VCARD::VCard *, VCARD::EntityType, const QDateTime & );
- QDateTime readDateTimeValue( VCARD::ContentLine * );
+ void addDateTimeValue( VCARD::VCard *, VCARD::EntityType, const TQDateTime & );
+ TQDateTime readDateTimeValue( VCARD::ContentLine * );
void addAddressValue( VCARD::VCard *, const Address & );
Address readAddressValue( VCARD::ContentLine * );
@@ -75,7 +75,7 @@ class KABC_EXPORT_DEPRECATED VCardFormatImpl
void addNValue( VCARD::VCard *, const Addressee & );
void readNValue( VCARD::ContentLine *, Addressee & );
- void addCustomValue( VCARD::VCard *, const QString & );
+ void addCustomValue( VCARD::VCard *, const TQString & );
void addAddressParam( VCARD::ContentLine *, int );
int readAddressParam( VCARD::ContentLine * );
diff --git a/kabc/vcardformatplugin.cpp b/kabc/vcardformatplugin.cpp
index 6725e3b65..6194cd0fe 100644
--- a/kabc/vcardformatplugin.cpp
+++ b/kabc/vcardformatplugin.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
+#include <tqfile.h>
#include "address.h"
#include "addressee.h"
@@ -36,12 +36,12 @@ VCardFormatPlugin::~VCardFormatPlugin()
{
}
-bool VCardFormatPlugin::load( Addressee &addressee, QFile *file )
+bool VCardFormatPlugin::load( Addressee &addressee, TQFile *file )
{
- QString data;
+ TQString data;
- QTextStream t( file );
- t.setEncoding( QTextStream::Latin1 );
+ TQTextStream t( file );
+ t.setEncoding( TQTextStream::Latin1 );
data = t.read();
VCardConverter converter;
@@ -55,12 +55,12 @@ bool VCardFormatPlugin::load( Addressee &addressee, QFile *file )
return false;
}
-bool VCardFormatPlugin::loadAll( AddressBook*, Resource *resource, QFile *file )
+bool VCardFormatPlugin::loadAll( AddressBook*, Resource *resource, TQFile *file )
{
- QString data;
+ TQString data;
- QTextStream t( file );
- t.setEncoding( QTextStream::Latin1 );
+ TQTextStream t( file );
+ t.setEncoding( TQTextStream::Latin1 );
data = t.read();
VCardConverter converter;
@@ -78,7 +78,7 @@ bool VCardFormatPlugin::loadAll( AddressBook*, Resource *resource, QFile *file )
return true;
}
-void VCardFormatPlugin::save( const Addressee &addressee, QFile *file )
+void VCardFormatPlugin::save( const Addressee &addressee, TQFile *file )
{
VCardConverter converter ;
Addressee::List vcardlist;
@@ -86,12 +86,12 @@ void VCardFormatPlugin::save( const Addressee &addressee, QFile *file )
vcardlist.append( addressee );
- QTextStream t( file );
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream t( file );
+ t.setEncoding( TQTextStream::UnicodeUTF8 );
t << converter.createVCards( vcardlist );
}
-void VCardFormatPlugin::saveAll( AddressBook*, Resource *resource, QFile *file )
+void VCardFormatPlugin::saveAll( AddressBook*, Resource *resource, TQFile *file )
{
VCardConverter converter;
Addressee::List vcardlist;
@@ -102,14 +102,14 @@ void VCardFormatPlugin::saveAll( AddressBook*, Resource *resource, QFile *file )
vcardlist.append( *it );
}
- QTextStream t( file );
- t.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream t( file );
+ t.setEncoding( TQTextStream::UnicodeUTF8 );
t << converter.createVCards( vcardlist );
}
-bool VCardFormatPlugin::checkFormat( QFile *file ) const
+bool VCardFormatPlugin::checkFormat( TQFile *file ) const
{
- QString line;
+ TQString line;
file->readLine( line, 1024 );
line = line.stripWhiteSpace();
diff --git a/kabc/vcardformatplugin.h b/kabc/vcardformatplugin.h
index 7733438ba..5ac7e49c2 100644
--- a/kabc/vcardformatplugin.h
+++ b/kabc/vcardformatplugin.h
@@ -40,12 +40,12 @@ class KABC_EXPORT VCardFormatPlugin : public FormatPlugin
VCardFormatPlugin();
virtual ~VCardFormatPlugin();
- bool load( Addressee &, QFile *file );
- bool loadAll( AddressBook *, Resource *, QFile *file );
- void save( const Addressee &, QFile *file );
- void saveAll( AddressBook *, Resource *, QFile *file );
+ bool load( Addressee &, TQFile *file );
+ bool loadAll( AddressBook *, Resource *, TQFile *file );
+ void save( const Addressee &, TQFile *file );
+ void saveAll( AddressBook *, Resource *, TQFile *file );
- bool checkFormat( QFile *file ) const;
+ bool checkFormat( TQFile *file ) const;
private:
struct VCardFormatPrivate;
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index 52fe81a11..bad2ceb78 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -20,8 +20,8 @@
#include <iostream>
#include <stdlib.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <kprocess.h>
#include <kdebug.h>
@@ -59,18 +59,18 @@ int main( int argc, char **argv )
return 1;
}
- QString inputFile( args->arg( 0 ) );
+ TQString inputFile( args->arg( 0 ) );
- QFile file( inputFile );
+ TQFile file( inputFile );
if ( !file.open( IO_ReadOnly ) ) {
qDebug( "Unable to open file '%s' for reading!", file.name().latin1() );
return 1;
}
- QString text;
+ TQString text;
- QTextStream s( &file );
- s.setEncoding( QTextStream::Latin1 );
+ TQTextStream s( &file );
+ s.setEncoding( TQTextStream::Latin1 );
text = s.read();
file.close();
diff --git a/kabc/vcardparser/testread2.cpp b/kabc/vcardparser/testread2.cpp
index 19a02e3c9..ba73081e7 100644
--- a/kabc/vcardparser/testread2.cpp
+++ b/kabc/vcardparser/testread2.cpp
@@ -9,7 +9,7 @@ int
main()
{
Addressee::List l = vCardsAsAddresseeList();
- QString vcards = vCardsAsText();
+ TQString vcards = vCardsAsText();
VCardConverter vct;
diff --git a/kabc/vcardparser/testutils.cpp b/kabc/vcardparser/testutils.cpp
index 086dd297e..df4b60c9c 100644
--- a/kabc/vcardparser/testutils.cpp
+++ b/kabc/vcardparser/testutils.cpp
@@ -1,6 +1,6 @@
#include <vcardparser.h>
#include <kabc/addressee.h>
-#include <qfile.h>
+#include <tqfile.h>
using namespace KABC;
@@ -62,12 +62,12 @@ vcard3()
QString
-vcardAsText( const QString& location )
+vcardAsText( const TQString& location )
{
- QString line;
- QFile file( location );
+ TQString line;
+ TQFile file( location );
if ( file.open( IO_ReadOnly ) ) {
- QTextStream stream( &file );
+ TQTextStream stream( &file );
if ( !stream.eof() ) {
line = stream.read();
}
@@ -91,7 +91,7 @@ vCardsAsAddresseeList()
QString
vCardsAsText()
{
- QString vcards = vcardAsText( "tests/vcard1.vcf" );
+ TQString vcards = vcardAsText( "tests/vcard1.vcf" );
vcards += vcardAsText( "tests/vcard2.vcf" );
vcards += vcardAsText( "tests/vcard3.vcf" );
diff --git a/kabc/vcardparser/testutils.h b/kabc/vcardparser/testutils.h
index 369912ac0..4f2024177 100644
--- a/kabc/vcardparser/testutils.h
+++ b/kabc/vcardparser/testutils.h
@@ -2,13 +2,13 @@
#define TESTUTILS_H
#include <kabc/addressee.h>
-#include <qstring.h>
+#include <tqstring.h>
KABC::Addressee vcard1();
KABC::Addressee vcard2();
KABC::Addressee vcard3();
KABC::Addressee::List vCardsAsAddresseeList();
-QString vCardAsText( const QString& location );
-QString vCardsAsText();
+TQString vCardAsText( const TQString& location );
+TQString vCardsAsText();
#endif
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index 7d2f77c83..f6e894f4b 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -28,8 +28,8 @@
#include <kapplication.h>
#include <kcmdlineargs.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include "vcardconverter.h"
@@ -46,7 +46,7 @@ int main( int argc, char **argv )
addressee.setNameFromString( "Mr. Tobias Koenig Jr." );
addressee.setNickName( "tokoe" );
- addressee.setBirthday( QDate( 1982, 7, 19 ) );
+ addressee.setBirthday( TQDate( 1982, 7, 19 ) );
addressee.setMailer( "mutt1.2" );
addressee.setTimeZone( KABC::TimeZone( +2 ) );
@@ -60,26 +60,26 @@ int main( int argc, char **argv )
addressee.setOrganization( "KDE" );
addressee.setNote( "nerver\ntouch a running system" );
addressee.setProductId( "testId" );
- addressee.setRevision( QDateTime::currentDateTime() );
+ addressee.setRevision( TQDateTime::currentDateTime() );
addressee.setSortString( "koenig" );
addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
addressee.setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) );
/*
- QImage img;
+ TQImage img;
img.load( "testimg.png", "PNG" );
KABC::Picture photo;
photo.setData( img );
addressee.setPhoto( photo );
- QImage img2;
+ TQImage img2;
img2.load( "testimg.png", "PNG" );
KABC::Picture logo;
logo.setData( img2 );
addressee.setLogo( logo );
- QFile soundFile( "testsound.wav" );
+ TQFile soundFile( "testsound.wav" );
soundFile.open( IO_ReadOnly );
- QByteArray data = soundFile.readAll();
+ TQByteArray data = soundFile.readAll();
soundFile.close();
KABC::Sound sound;
sound.setData( data );
@@ -96,7 +96,7 @@ int main( int argc, char **argv )
KABC::Key key( "secret key", KABC::Key::X509 );
addressee.insertKey( key );
- QStringList categories;
+ TQStringList categories;
categories << "Friends" << "School" << "KDE";
addressee.setCategories( categories );
@@ -115,18 +115,18 @@ int main( int argc, char **argv )
KABC::Addressee::List list;
for ( int i = 0; i < 1000; ++i ) {
KABC::Addressee addr = addressee;
- addr.setUid( QString::number( i ) );
+ addr.setUid( TQString::number( i ) );
list.append( addr );
}
KABC::VCardConverter converter;
- QString txt = converter.createVCards( list );
+ TQString txt = converter.createVCards( list );
- QFile file( "out.vcf" );
+ TQFile file( "out.vcf" );
file.open( IO_WriteOnly );
- QTextStream s( &file );
- s.setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream s( &file );
+ s.setEncoding( TQTextStream::UnicodeUTF8 );
s << txt;
file.close();
diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp
index 410a958d1..30a8e1c49 100644
--- a/kabc/vcardparser/vcard.cpp
+++ b/kabc/vcardparser/vcard.cpp
@@ -50,7 +50,7 @@ void VCard::clear()
mLineMap.clear();
}
-QStringList VCard::identifiers() const
+TQStringList VCard::identifiers() const
{
return mLineMap.keys();
}
@@ -60,7 +60,7 @@ void VCard::addLine( const VCardLine& line )
mLineMap[ line.identifier() ].append( line );
}
-VCardLine::List VCard::lines( const QString& identifier ) const
+VCardLine::List VCard::lines( const TQString& identifier ) const
{
LineMap::ConstIterator it = mLineMap.find( identifier );
if ( it == mLineMap.end() )
@@ -69,7 +69,7 @@ VCardLine::List VCard::lines( const QString& identifier ) const
return *it;
}
-VCardLine VCard::line( const QString& identifier ) const
+VCardLine VCard::line( const TQString& identifier ) const
{
LineMap::ConstIterator it = mLineMap.find( identifier );
if ( it == mLineMap.end() )
diff --git a/kabc/vcardparser/vcard.h b/kabc/vcardparser/vcard.h
index 73fcd1ea2..6afeeda26 100644
--- a/kabc/vcardparser/vcard.h
+++ b/kabc/vcardparser/vcard.h
@@ -22,17 +22,17 @@
#define VCARDPARSER_VCARD_H
#include "vcardline.h"
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <tqmap.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
namespace KABC {
class VCard
{
public:
- typedef QValueList<VCard> List;
- typedef QMap< QString, VCardLine::List > LineMap;
+ typedef TQValueList<VCard> List;
+ typedef TQMap< TQString, VCardLine::List > LineMap;
enum Version { v2_1, v3_0 };
@@ -52,7 +52,7 @@ class VCard
* Returns a list of all identifiers that exists in the
* vCard.
*/
- QStringList identifiers() const;
+ TQStringList identifiers() const;
/**
* Adds a VCardLine to the VCard
@@ -62,12 +62,12 @@ class VCard
/**
* Returns all lines of the vcard with a special identifier.
*/
- VCardLine::List lines( const QString& identifier ) const;
+ VCardLine::List lines( const TQString& identifier ) const;
/**
* Returns only the first line of the vcard with a special identifier.
*/
- VCardLine line( const QString& identifier ) const;
+ VCardLine line( const TQString& identifier ) const;
/**
* Set the version of the vCard.
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index 247604ebb..6680cf7d0 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -25,7 +25,7 @@ using namespace KABC;
class VCardLine::VCardLinePrivate
{
public:
- QString mGroup;
+ TQString mGroup;
};
VCardLine::VCardLine()
@@ -33,13 +33,13 @@ VCardLine::VCardLine()
{
}
-VCardLine::VCardLine( const QString &identifier )
+VCardLine::VCardLine( const TQString &identifier )
: d( 0 )
{
mIdentifier = identifier;
}
-VCardLine::VCardLine( const QString &identifier, const QVariant &value )
+VCardLine::VCardLine( const TQString &identifier, const TQVariant &value )
: d( 0 )
{
mIdentifier = identifier;
@@ -72,27 +72,27 @@ VCardLine& VCardLine::operator=( const VCardLine& line )
return *this;
}
-void VCardLine::setIdentifier( const QString& identifier )
+void VCardLine::setIdentifier( const TQString& identifier )
{
mIdentifier = identifier;
}
-QString VCardLine::identifier() const
+TQString VCardLine::identifier() const
{
return mIdentifier;
}
-void VCardLine::setValue( const QVariant& value )
+void VCardLine::setValue( const TQVariant& value )
{
mValue = value;
}
-QVariant VCardLine::value() const
+TQVariant VCardLine::value() const
{
return mValue;
}
-void VCardLine::setGroup( const QString& group )
+void VCardLine::setGroup( const TQString& group )
{
if ( !d )
d = new VCardLinePrivate();
@@ -100,12 +100,12 @@ void VCardLine::setGroup( const QString& group )
d->mGroup = group;
}
-QString VCardLine::group() const
+TQString VCardLine::group() const
{
if ( d )
return d->mGroup;
else
- return QString();
+ return TQString();
}
bool VCardLine::hasGroup() const
@@ -116,35 +116,35 @@ bool VCardLine::hasGroup() const
return d->mGroup.isEmpty();
}
-QStringList VCardLine::parameterList() const
+TQStringList VCardLine::parameterList() const
{
return mParamMap.keys();
}
-void VCardLine::addParameter( const QString& param, const QString& value )
+void VCardLine::addParameter( const TQString& param, const TQString& value )
{
- QStringList &list = mParamMap[ param ];
+ TQStringList &list = mParamMap[ param ];
if ( list.findIndex( value ) == -1 ) // not included yet
list.append( value );
}
-QStringList VCardLine::parameters( const QString& param ) const
+TQStringList VCardLine::parameters( const TQString& param ) const
{
ParamMap::ConstIterator it = mParamMap.find( param );
if ( it == mParamMap.end() )
- return QStringList();
+ return TQStringList();
else
return *it;
}
-QString VCardLine::parameter( const QString& param ) const
+TQString VCardLine::parameter( const TQString& param ) const
{
ParamMap::ConstIterator it = mParamMap.find( param );
if ( it == mParamMap.end() )
- return QString::null;
+ return TQString::null;
else {
if ( (*it).isEmpty() )
- return QString::null;
+ return TQString::null;
else
return (*it).first();
}
diff --git a/kabc/vcardparser/vcardline.h b/kabc/vcardparser/vcardline.h
index d6ad9dd77..92fe743f6 100644
--- a/kabc/vcardparser/vcardline.h
+++ b/kabc/vcardparser/vcardline.h
@@ -21,23 +21,23 @@
#ifndef VCARDLINE_H
#define VCARDLINE_H
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qvariant.h>
-#include <qmap.h>
-#include <qstring.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqvariant.h>
+#include <tqmap.h>
+#include <tqstring.h>
namespace KABC {
class VCardLine
{
public:
- typedef QValueList<VCardLine> List;
- typedef QMap<QString, QStringList> ParamMap;
+ typedef TQValueList<VCardLine> List;
+ typedef TQMap<TQString, TQStringList> ParamMap;
VCardLine();
- VCardLine( const QString &identifier );
- VCardLine( const QString &identifier, const QVariant &value );
+ VCardLine( const TQString &identifier );
+ VCardLine( const TQString &identifier, const TQVariant &value );
VCardLine( const VCardLine& );
~VCardLine();
@@ -47,32 +47,32 @@ class VCardLine
/**
* Sets the identifier of this line e.g. UID, FN, CLASS
*/
- void setIdentifier( const QString& identifier );
+ void setIdentifier( const TQString& identifier );
/**
* Returns the identifier of this line.
*/
- QString identifier() const;
+ TQString identifier() const;
/**
* Sets the value of of this line.
*/
- void setValue( const QVariant& value );
+ void setValue( const TQVariant& value );
/**
* Returns the value of this line.
*/
- QVariant value() const;
+ TQVariant value() const;
/**
* Sets the group the line belongs to.
*/
- void setGroup( const QString& group );
+ void setGroup( const TQString& group );
/**
* Returns the group the line belongs to.
*/
- QString group() const;
+ TQString group() const;
/**
* Returns whether the line belongs to a group.
@@ -82,29 +82,29 @@ class VCardLine
/**
* Returns all parameters.
*/
- QStringList parameterList() const;
+ TQStringList parameterList() const;
/**
* Add a new parameter to the line.
*/
- void addParameter( const QString& param, const QString& value );
+ void addParameter( const TQString& param, const TQString& value );
/**
* Returns the values of a special parameter.
* You can get a list of all parameters with paramList().
*/
- QStringList parameters( const QString& param ) const;
+ TQStringList parameters( const TQString& param ) const;
/**
* Returns only the first value of a special parameter.
* You can get a list of all parameters with paramList().
*/
- QString parameter( const QString& param ) const;
+ TQString parameter( const TQString& param ) const;
private:
ParamMap mParamMap;
- QString mIdentifier;
- QVariant mValue;
+ TQString mIdentifier;
+ TQVariant mValue;
class VCardLinePrivate;
VCardLinePrivate *d;
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index df622b22f..67b1bc306 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qregexp.h>
-#include <qtextcodec.h>
+#include <tqregexp.h>
+#include <tqtextcodec.h>
#include <kmdcodec.h>
@@ -29,12 +29,12 @@
using namespace KABC;
-static QString backslash( "\\\\" );
-static QString comma( "\\," );
-static QString newline( "\\n" );
-static QString cr( "\\r" );
+static TQString backslash( "\\\\" );
+static TQString comma( "\\," );
+static TQString newline( "\\n" );
+static TQString cr( "\\r" );
-static void addEscapes( QString &str )
+static void addEscapes( TQString &str )
{
str.replace( '\\', backslash );
str.replace( ',', comma );
@@ -42,7 +42,7 @@ static void addEscapes( QString &str )
str.replace( '\n', newline );
}
-static void removeEscapes( QString &str )
+static void removeEscapes( TQString &str )
{
str.replace( cr, "\\r" );
str.replace( newline, "\n" );
@@ -58,26 +58,26 @@ VCardParser::~VCardParser()
{
}
-VCard::List VCardParser::parseVCards( const QString& text )
+VCard::List VCardParser::parseVCards( const TQString& text )
{
- static QRegExp sep( "[\x0d\x0a]" );
+ static TQRegExp sep( "[\x0d\x0a]" );
VCard currentVCard;
VCard::List vCardList;
- QString currentLine;
+ TQString currentLine;
- const QStringList lines = QStringList::split( sep, text );
- QStringList::ConstIterator it;
+ const TQStringList lines = TQStringList::split( sep, text );
+ TQStringList::ConstIterator it;
bool inVCard = false;
- QStringList::ConstIterator linesEnd( lines.end() );
+ TQStringList::ConstIterator linesEnd( lines.end() );
for ( it = lines.begin(); it != linesEnd; ++it ) {
if ( (*it).isEmpty() ) // empty line
continue;
if ( (*it)[ 0 ] == ' ' || (*it)[ 0 ] == '\t' ) { // folded line => append to previous
- currentLine += QString( *it ).remove( 0, 1 );
+ currentLine += TQString( *it ).remove( 0, 1 );
continue;
} else {
if ( inVCard && !currentLine.isEmpty() ) { // now parse the line
@@ -88,23 +88,23 @@ VCard::List VCardParser::parseVCards( const QString& text )
}
VCardLine vCardLine;
- const QString key = currentLine.left( colon ).stripWhiteSpace();
- QString value = currentLine.mid( colon + 1 );
+ const TQString key = currentLine.left( colon ).stripWhiteSpace();
+ TQString value = currentLine.mid( colon + 1 );
- QStringList params = QStringList::split( ';', key );
+ TQStringList params = TQStringList::split( ';', key );
// check for group
if ( params[0].find( '.' ) != -1 ) {
- const QStringList groupList = QStringList::split( '.', params[0] );
+ const TQStringList groupList = TQStringList::split( '.', params[0] );
vCardLine.setGroup( groupList[0] );
vCardLine.setIdentifier( groupList[1] );
} else
vCardLine.setIdentifier( params[0] );
if ( params.count() > 1 ) { // find all parameters
- QStringList::ConstIterator paramIt = params.begin();
+ TQStringList::ConstIterator paramIt = params.begin();
for ( ++paramIt; paramIt != params.end(); ++paramIt ) {
- QStringList pair = QStringList::split( '=', *paramIt );
+ TQStringList pair = TQStringList::split( '=', *paramIt );
if ( pair.size() == 1 ) {
// correct the fucking 2.1 'standard'
if ( pair[0].lower() == "quoted-printable" ) {
@@ -119,8 +119,8 @@ VCard::List VCardParser::parseVCards( const QString& text )
}
// This is pretty much a faster pair[1].contains( ',' )...
if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format
- const QStringList args = QStringList::split( ',', pair[ 1 ] );
- QStringList::ConstIterator argIt;
+ const TQStringList args = TQStringList::split( ',', pair[ 1 ] );
+ TQStringList::ConstIterator argIt;
for ( argIt = args.begin(); argIt != args.end(); ++argIt )
vCardLine.addParameter( pair[0].lower(), *argIt );
} else
@@ -130,13 +130,13 @@ VCard::List VCardParser::parseVCards( const QString& text )
removeEscapes( value );
- QByteArray output;
+ TQByteArray output;
bool wasBase64Encoded = false;
params = vCardLine.parameterList();
if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data
- QByteArray input;
- input = QCString(value.latin1());
+ TQByteArray input;
+ input = TQCString(value.latin1());
if ( vCardLine.parameter( "encoding" ).lower() == "b" ||
vCardLine.parameter( "encoding" ).lower() == "base64" ) {
KCodecs::base64Decode( input, output );
@@ -148,25 +148,25 @@ VCard::List VCardParser::parseVCards( const QString& text )
value = value.remove( value.length() - 1, 1 ) + (*it);
++it;
}
- input = QCString(value.latin1());
+ input = TQCString(value.latin1());
KCodecs::quotedPrintableDecode( input, output );
}
} else {
- output = QCString(value.latin1());
+ output = TQCString(value.latin1());
}
if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data
- QTextCodec *codec =
- QTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
+ TQTextCodec *codec =
+ TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
if ( codec ) {
vCardLine.setValue( codec->toUnicode( output ) );
} else {
- vCardLine.setValue( QString::fromUtf8( output ) );
+ vCardLine.setValue( TQString::fromUtf8( output ) );
}
} else if ( wasBase64Encoded ) {
vCardLine.setValue( output );
} else { // if charset not given, assume it's in UTF-8 (as used in previous KDE versions)
- vCardLine.setValue( QString::fromUtf8( output ) );
+ vCardLine.setValue( TQString::fromUtf8( output ) );
}
currentVCard.addLine( vCardLine );
@@ -195,17 +195,17 @@ VCard::List VCardParser::parseVCards( const QString& text )
return vCardList;
}
-QString VCardParser::createVCards( const VCard::List& list )
+TQString VCardParser::createVCards( const VCard::List& list )
{
- QString text;
- QString textLine;
- QString encodingType;
- QStringList idents;
- QStringList params;
- QStringList values;
- QStringList::ConstIterator identIt;
- QStringList::Iterator paramIt;
- QStringList::ConstIterator valueIt;
+ TQString text;
+ TQString textLine;
+ TQString encodingType;
+ TQStringList idents;
+ TQStringList params;
+ TQStringList values;
+ TQStringList::ConstIterator identIt;
+ TQStringList::Iterator paramIt;
+ TQStringList::ConstIterator valueIt;
VCardLine::List lines;
VCardLine::List::ConstIterator lineIt;
@@ -227,7 +227,7 @@ QString VCardParser::createVCards( const VCard::List& list )
// iterate over the lines
for ( lineIt = lines.constBegin(); lineIt != lines.constEnd(); ++lineIt ) {
if ( !(*lineIt).value().asString().isEmpty() ) {
- if ((*lineIt).identifier() != QString("URI")) {
+ if ((*lineIt).identifier() != TQString("URI")) {
if ( (*lineIt).hasGroup() )
textLine = (*lineIt).group() + "." + (*lineIt).identifier();
else
@@ -252,7 +252,7 @@ QString VCardParser::createVCards( const VCard::List& list )
}
if ( hasEncoding ) { // have to encode the data
- QByteArray input, output;
+ TQByteArray input, output;
if ( encodingType == "b" ) {
input = (*lineIt).value().toByteArray();
KCodecs::base64Encode( input, output );
@@ -262,11 +262,11 @@ QString VCardParser::createVCards( const VCard::List& list )
KCodecs::quotedPrintableEncode( input, output, false );
}
- QString value( output );
+ TQString value( output );
addEscapes( value );
textLine.append( ":" + value );
} else {
- QString value( (*lineIt).value().asString() );
+ TQString value( (*lineIt).value().asString() );
addEscapes( value );
textLine.append( ":" + value );
}
@@ -280,7 +280,7 @@ QString VCardParser::createVCards( const VCard::List& list )
else {
// URIs can be full of weird symbols, etc. so bypass all checks
textLine = (*lineIt).identifier();
- QString value( (*lineIt).value().asString() );
+ TQString value( (*lineIt).value().asString() );
addEscapes( value );
textLine.append( ":" + value );
text.append( textLine + "\r\n" );
diff --git a/kabc/vcardparser/vcardparser.h b/kabc/vcardparser/vcardparser.h
index 31e13424c..da5fdd46e 100644
--- a/kabc/vcardparser/vcardparser.h
+++ b/kabc/vcardparser/vcardparser.h
@@ -31,8 +31,8 @@ class VCardParser
VCardParser();
~VCardParser();
- static VCard::List parseVCards( const QString& text );
- static QString createVCards( const VCard::List& list );
+ static VCard::List parseVCards( const TQString& text );
+ static TQString createVCards( const VCard::List& list );
private:
class VCardParserPrivate;
diff --git a/kabc/vcardtool.cpp b/kabc/vcardtool.cpp
index 566b5968d..6e8dc9acc 100644
--- a/kabc/vcardtool.cpp
+++ b/kabc/vcardtool.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qbuffer.h>
-#include <qdatastream.h>
-#include <qstring.h>
+#include <tqbuffer.h>
+#include <tqdatastream.h>
+#include <tqstring.h>
#include "agent.h"
#include "key.h"
@@ -32,7 +32,7 @@
using namespace KABC;
-static bool needsEncoding( const QString &value )
+static bool needsEncoding( const TQString &value )
{
uint length = value.length();
for ( uint i = 0; i < length; ++i ) {
@@ -75,7 +75,7 @@ VCardTool::~VCardTool()
}
// TODO: make list a const&
-QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
+TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
{
VCard::List vCardList;
@@ -83,12 +83,12 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
Addressee::List::ConstIterator listEnd( list.constEnd() );
for ( addrIt = list.constBegin(); addrIt != listEnd; ++addrIt ) {
VCard card;
- QStringList::ConstIterator strIt;
+ TQStringList::ConstIterator strIt;
// ADR + LABEL
const Address::List addresses = (*addrIt).addresses();
for ( Address::List::ConstIterator it = addresses.begin(); it != addresses.end(); ++it ) {
- QStringList address;
+ TQStringList address;
bool isEmpty = ( (*it).postOfficeBox().isEmpty() &&
(*it).extended().isEmpty() &&
@@ -119,7 +119,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
}
bool hasLabel = !(*it).label().isEmpty();
- QMap<QString, int>::ConstIterator typeIt;
+ TQMap<TQString, int>::ConstIterator typeIt;
for ( typeIt = mAddressTypeMap.constBegin(); typeIt != mAddressTypeMap.constEnd(); ++typeIt ) {
if ( typeIt.data() & (*it).type() ) {
adrLine.addParameter( "TYPE", typeIt.key() );
@@ -142,8 +142,8 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
// CATEGORIES
if ( version == VCard::v3_0 ) {
- QStringList categories = (*addrIt).categories();
- QStringList::Iterator catIt;
+ TQStringList categories = (*addrIt).categories();
+ TQStringList::Iterator catIt;
for ( catIt = categories.begin(); catIt != categories.end(); ++catIt )
(*catIt).replace( ',', "\\," );
@@ -162,7 +162,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
}
// EMAIL
- const QStringList emails = (*addrIt).emails();
+ const TQStringList emails = (*addrIt).emails();
bool pref = true;
for ( strIt = emails.begin(); strIt != emails.end(); ++strIt ) {
VCardLine line( "EMAIL", *strIt );
@@ -184,7 +184,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
// GEO
Geo geo = (*addrIt).geo();
if ( geo.isValid() ) {
- QString str;
+ TQString str;
str.sprintf( "%.6f;%.6f", geo.latitude(), geo.longitude() );
card.addLine( VCardLine( "GEO", str ) );
}
@@ -207,7 +207,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( mailerLine );
// N
- QStringList name;
+ TQStringList name;
name.append( (*addrIt).familyName().replace( ';', "\\;" ) );
name.append( (*addrIt).givenName().replace( ';', "\\;" ) );
name.append( (*addrIt).additionalName().replace( ';', "\\;" ) );
@@ -242,7 +242,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( noteLine );
// ORG
- QStringList organization;
+ TQStringList organization;
organization.append( ( *addrIt ).organization().replace( ';', "\\;" ) );
if ( !( *addrIt ).department().isEmpty() )
organization.append( ( *addrIt ).department().replace( ';', "\\;" ) );
@@ -284,7 +284,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
for ( phoneIt = phoneNumbers.begin(); phoneIt != phoneNumbers.end(); ++phoneIt ) {
VCardLine line( "TEL", (*phoneIt).number() );
- QMap<QString, int>::ConstIterator typeIt;
+ TQMap<TQString, int>::ConstIterator typeIt;
for ( typeIt = mPhoneTypeMap.constBegin(); typeIt != mPhoneTypeMap.constEnd(); ++typeIt ) {
if ( typeIt.data() & (*phoneIt).type() )
line.addParameter( "TYPE", typeIt.key() );
@@ -304,7 +304,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
// TZ
TimeZone timeZone = (*addrIt).timeZone();
if ( timeZone.isValid() ) {
- QString str;
+ TQString str;
int neg = 1;
if ( timeZone.offset() < 0 )
@@ -333,10 +333,10 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( VCardLine( "VERSION", "3.0" ) );
// X-
- const QStringList customs = (*addrIt).customs();
+ const TQStringList customs = (*addrIt).customs();
for ( strIt = customs.begin(); strIt != customs.end(); ++strIt ) {
- QString identifier = "X-" + (*strIt).left( (*strIt).find( ":" ) );
- QString value = (*strIt).mid( (*strIt).find( ":" ) + 1 );
+ TQString identifier = "X-" + (*strIt).left( (*strIt).find( ":" ) );
+ TQString value = (*strIt).mid( (*strIt).find( ":" ) + 1 );
if ( value.isEmpty() )
continue;
@@ -354,11 +354,11 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
return VCardParser::createVCards( vCardList );
}
-Addressee::List VCardTool::parseVCards( const QString& vcard )
+Addressee::List VCardTool::parseVCards( const TQString& vcard )
{
- static const QChar semicolonSep( ';' );
- static const QChar commaSep( ',' );
- QString identifier;
+ static const TQChar semicolonSep( ';' );
+ static const TQChar commaSep( ',' );
+ TQString identifier;
Addressee::List addrList;
const VCard::List vCardList = VCardParser::parseVCards( vcard );
@@ -368,9 +368,9 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
for ( cardIt = vCardList.begin(); cardIt != listEnd; ++cardIt ) {
Addressee addr;
- const QStringList idents = (*cardIt).identifiers();
- QStringList::ConstIterator identIt;
- QStringList::ConstIterator identEnd( idents.end() );
+ const TQStringList idents = (*cardIt).identifiers();
+ TQStringList::ConstIterator identIt;
+ TQStringList::ConstIterator identEnd( idents.end() );
for ( identIt = idents.begin(); identIt != identEnd; ++identIt ) {
const VCardLine::List lines = (*cardIt).lines( (*identIt) );
VCardLine::List::ConstIterator lineIt;
@@ -381,7 +381,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
// ADR
if ( identifier == "adr" ) {
Address address;
- const QStringList addrParts = splitString( semicolonSep, (*lineIt).value().asString() );
+ const TQStringList addrParts = splitString( semicolonSep, (*lineIt).value().asString() );
if ( addrParts.count() > 0 )
address.setPostOfficeBox( addrParts[ 0 ] );
if ( addrParts.count() > 1 )
@@ -399,8 +399,8 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
int type = 0;
- const QStringList types = (*lineIt).parameters( "type" );
- for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
+ const TQStringList types = (*lineIt).parameters( "type" );
+ for ( TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
type += mAddressTypeMap[ (*it).lower() ];
address.setType( type );
@@ -417,7 +417,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
// CATEGORIES
else if ( identifier == "categories" ) {
- const QStringList categories = splitString( commaSep, (*lineIt).value().asString() );
+ const TQStringList categories = splitString( commaSep, (*lineIt).value().asString() );
addr.setCategories( categories );
}
@@ -427,7 +427,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
// EMAIL
else if ( identifier == "email" ) {
- const QStringList types = (*lineIt).parameters( "type" );
+ const TQStringList types = (*lineIt).parameters( "type" );
addr.insertEmail( (*lineIt).value().asString(), types.findIndex( "PREF" ) != -1 );
}
@@ -439,7 +439,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
else if ( identifier == "geo" ) {
Geo geo;
- const QStringList geoParts = QStringList::split( ';', (*lineIt).value().asString(), true );
+ const TQStringList geoParts = TQStringList::split( ';', (*lineIt).value().asString(), true );
geo.setLatitude( geoParts[ 0 ].toFloat() );
geo.setLongitude( geoParts[ 1 ].toFloat() );
@@ -454,8 +454,8 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
else if ( identifier == "label" ) {
int type = 0;
- const QStringList types = (*lineIt).parameters( "type" );
- for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
+ const TQStringList types = (*lineIt).parameters( "type" );
+ for ( TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
type += mAddressTypeMap[ (*it).lower() ];
bool available = false;
@@ -487,7 +487,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
// N
else if ( identifier == "n" ) {
- const QStringList nameParts = splitString( semicolonSep, (*lineIt).value().asString() );
+ const TQStringList nameParts = splitString( semicolonSep, (*lineIt).value().asString() );
if ( nameParts.count() > 0 )
addr.setFamilyName( nameParts[ 0 ] );
if ( nameParts.count() > 1 )
@@ -514,7 +514,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
// ORGANIZATION
else if ( identifier == "org" ) {
- const QStringList orgParts = splitString( semicolonSep, (*lineIt).value().asString() );
+ const TQStringList orgParts = splitString( semicolonSep, (*lineIt).value().asString() );
if ( orgParts.count() > 0 )
addr.setOrganization( orgParts[ 0 ] );
if ( orgParts.count() > 1 )
@@ -552,8 +552,8 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
int type = 0;
- const QStringList types = (*lineIt).parameters( "type" );
- for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
+ const TQStringList types = (*lineIt).parameters( "type" );
+ for ( TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
type += mPhoneTypeMap[(*it).upper()];
phone.setType( type );
@@ -568,7 +568,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
// TZ
else if ( identifier == "tz" ) {
TimeZone tz;
- const QString date = (*lineIt).value().asString();
+ const TQString date = (*lineIt).value().asString();
int hours = date.mid( 1, 2).toInt();
int minutes = date.mid( 4, 2 ).toInt();
@@ -593,7 +593,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
// X-
else if ( identifier.startsWith( "x-" ) ) {
- const QString key = (*lineIt).identifier().mid( 2 );
+ const TQString key = (*lineIt).identifier().mid( 2 );
int dash = key.find( "-" );
addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).value().asString() );
}
@@ -606,39 +606,39 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
return addrList;
}
-QDateTime VCardTool::parseDateTime( const QString &str )
+TQDateTime VCardTool::parseDateTime( const TQString &str )
{
- QDateTime dateTime;
+ TQDateTime dateTime;
if ( str.find( '-' ) == -1 ) { // is base format (yyyymmdd)
- dateTime.setDate( QDate( str.left( 4 ).toInt(), str.mid( 4, 2 ).toInt(),
+ dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 4, 2 ).toInt(),
str.mid( 6, 2 ).toInt() ) );
if ( str.find( 'T' ) ) // has time information yyyymmddThh:mm:ss
- dateTime.setTime( QTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
+ dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
str.mid( 17, 2 ).toInt() ) );
} else { // is extended format yyyy-mm-dd
- dateTime.setDate( QDate( str.left( 4 ).toInt(), str.mid( 5, 2 ).toInt(),
+ dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 5, 2 ).toInt(),
str.mid( 8, 2 ).toInt() ) );
if ( str.find( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss
- dateTime.setTime( QTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
+ dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
str.mid( 17, 2 ).toInt() ) );
}
return dateTime;
}
-QString VCardTool::createDateTime( const QDateTime &dateTime )
+TQString VCardTool::createDateTime( const TQDateTime &dateTime )
{
- QString str;
+ TQString str;
if ( dateTime.date().isValid() ) {
str.sprintf( "%4d-%02d-%02d", dateTime.date().year(), dateTime.date().month(),
dateTime.date().day() );
if ( dateTime.time().isValid() ) {
- QString tmp;
+ TQString tmp;
tmp.sprintf( "T%02d:%02d:%02dZ", dateTime.time().hour(), dateTime.time().minute(),
dateTime.time().second() );
str += tmp;
@@ -652,9 +652,9 @@ Picture VCardTool::parsePicture( const VCardLine &line )
{
Picture pic;
- const QStringList params = line.parameterList();
+ const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 ) {
- QImage img;
+ TQImage img;
img.loadFromData( line.value().asByteArray() );
pic.setData( img );
} else if ( params.findIndex( "value" ) != -1 ) {
@@ -668,17 +668,17 @@ Picture VCardTool::parsePicture( const VCardLine &line )
return pic;
}
-VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pic )
+VCardLine VCardTool::createPicture( const TQString &identifier, const Picture &pic )
{
VCardLine line( identifier );
if ( pic.isIntern() ) {
if ( !pic.data().isNull() ) {
- QByteArray input;
- QBuffer buffer( input );
+ TQByteArray input;
+ TQBuffer buffer( input );
buffer.open( IO_WriteOnly );
- QImageIO iio( &buffer, "JPEG" );
+ TQImageIO iio( &buffer, "JPEG" );
iio.setImage( pic.data() );
iio.setQuality( 100 );
iio.write();
@@ -699,7 +699,7 @@ Sound VCardTool::parseSound( const VCardLine &line )
{
Sound snd;
- const QStringList params = line.parameterList();
+ const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 )
snd.setData( line.value().asByteArray() );
else if ( params.findIndex( "value" ) != -1 ) {
@@ -737,7 +737,7 @@ Key VCardTool::parseKey( const VCardLine &line )
{
Key key;
- const QStringList params = line.parameterList();
+ const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 )
key.setBinaryData( line.value().asByteArray() );
else
@@ -813,12 +813,12 @@ Agent VCardTool::parseAgent( const VCardLine &line )
{
Agent agent;
- const QStringList params = line.parameterList();
+ const TQStringList params = line.parameterList();
if ( params.findIndex( "value" ) != -1 ) {
if ( line.parameter( "value" ).lower() == "uri" )
agent.setUrl( line.value().asString() );
} else {
- QString str = line.value().asString();
+ TQString str = line.value().asString();
str.replace( "\\n", "\r\n" );
str.replace( "\\N", "\r\n" );
str.replace( "\\;", ";" );
@@ -845,7 +845,7 @@ VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent )
Addressee::List list;
list.append( *agent.addressee() );
- QString str = createVCards( list, version );
+ TQString str = createVCards( list, version );
str.replace( "\r\n", "\\n" );
str.replace( ";", "\\;" );
str.replace( ":", "\\:" );
@@ -860,10 +860,10 @@ VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent )
return line;
}
-QStringList VCardTool::splitString( const QChar &sep, const QString &str )
+TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str )
{
- QStringList list;
- QString value( str );
+ TQStringList list;
+ TQString value( str );
int start = 0;
int pos = value.find( sep, start );
@@ -873,7 +873,7 @@ QStringList VCardTool::splitString( const QChar &sep, const QString &str )
if ( pos > start && pos <= (int)value.length() )
list << value.mid( start, pos - start );
else
- list << QString::null;
+ list << TQString::null;
start = pos + 1;
pos = value.find( sep, start );
@@ -890,7 +890,7 @@ QStringList VCardTool::splitString( const QChar &sep, const QString &str )
if ( value.mid( start, l - start + 1 ).length() > 0 )
list << value.mid( start, l - start + 1 );
else
- list << QString::null;
+ list << TQString::null;
return list;
}
diff --git a/kabc/vcardtool.h b/kabc/vcardtool.h
index 2c78e8442..d59006341 100644
--- a/kabc/vcardtool.h
+++ b/kabc/vcardtool.h
@@ -44,25 +44,25 @@ class KABC_EXPORT VCardTool
Creates a string that contains the addressees from the list in
the vCard format.
*/
- QString createVCards( Addressee::List list, VCard::Version version = VCard::v3_0 );
+ TQString createVCards( Addressee::List list, VCard::Version version = VCard::v3_0 );
/**
Parses the string and returns a list of addressee objects.
*/
- Addressee::List parseVCards( const QString& vcard );
+ Addressee::List parseVCards( const TQString& vcard );
private:
/**
Split a string and replaces escaped separators on the fly with
unescaped ones.
*/
- QStringList splitString( const QChar &sep, const QString &value );
+ TQStringList splitString( const TQChar &sep, const TQString &value );
- QDateTime parseDateTime( const QString &str );
- QString createDateTime( const QDateTime &dateTime );
+ TQDateTime parseDateTime( const TQString &str );
+ TQString createDateTime( const TQDateTime &dateTime );
Picture parsePicture( const VCardLine &line );
- VCardLine createPicture( const QString &identifier, const Picture &pic );
+ VCardLine createPicture( const TQString &identifier, const Picture &pic );
Sound parseSound( const VCardLine &line );
VCardLine createSound( const Sound &snd );
@@ -76,8 +76,8 @@ class KABC_EXPORT VCardTool
Agent parseAgent( const VCardLine &line );
VCardLine createAgent( VCard::Version version, const Agent &agent );
- QMap<QString, int> mAddressTypeMap;
- QMap<QString, int> mPhoneTypeMap;
+ TQMap<TQString, int> mAddressTypeMap;
+ TQMap<TQString, int> mPhoneTypeMap;
class VCardToolPrivate;
VCardToolPrivate *d;