summaryrefslogtreecommitdiffstats
path: root/kabc
diff options
context:
space:
mode:
Diffstat (limited to 'kabc')
-rw-r--r--kabc/address.cpp12
-rw-r--r--kabc/addressbook.cpp2
-rw-r--r--kabc/addresseedialog.cpp2
-rw-r--r--kabc/addresslineedit.cpp18
-rw-r--r--kabc/field.h4
-rw-r--r--kabc/formatfactory.cpp2
-rw-r--r--kabc/kab2kabc.cpp4
-rw-r--r--kabc/lock.cpp2
-rw-r--r--kabc/plugins/ldapkio/resourceldapkio.cpp2
-rw-r--r--kabc/plugins/ldapkio/resourceldapkioplugin.cpp2
-rw-r--r--kabc/scripts/field.src.cpp4
11 files changed, 27 insertions, 27 deletions
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 9ecf8eb2d..2fce393e0 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -338,7 +338,7 @@ TQString Address::formattedAddress( const TQString &realName,
ciso = countryToISO( country() );
} else {
// fall back to our own country
- ciso = KGlobal::locale()->country();
+ ciso = TDEGlobal::locale()->country();
}
KSimpleConfig entry( locate( "locale",
TQString( "l10n/" ) + ciso + TQString( "/entry.desktop" ) ) );
@@ -369,7 +369,7 @@ TQString Address::formattedAddress( const TQString &realName,
// the rules of our own system country )
if ( !country().isEmpty() ) {
KSimpleConfig entry( locate( "locale", TQString( "l10n/" )
- + KGlobal::locale()->country() + TQString( "/entry.desktop" ) ) );
+ + TDEGlobal::locale()->country() + TQString( "/entry.desktop" ) ) );
entry.setGroup( "KCM Locale" );
TQString cpos = entry.readEntry( "AddressCountryPosition" );
if ( "BELOW" == cpos || cpos.isEmpty() ) {
@@ -520,7 +520,7 @@ TQString Address::countryToISO( const TQString &cname )
if ( it != mISOMap->end() )
return it.data();
- TQString mapfile = KGlobal::dirs()->findResource( "data",
+ TQString mapfile = TDEGlobal::dirs()->findResource( "data",
TQString::fromLatin1( "kabc/countrytransl.map" ) );
TQFile file( mapfile );
@@ -540,8 +540,8 @@ TQString Address::countryToISO( const TQString &cname )
}
// fall back to system country
- mISOMap->insert( cname, KGlobal::locale()->country() );
- return KGlobal::locale()->country();
+ mISOMap->insert( cname, TDEGlobal::locale()->country() );
+ return TDEGlobal::locale()->country();
}
TQString Address::ISOtoCountry( const TQString &ISOname )
@@ -550,7 +550,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
if ( ISOname.simplifyWhiteSpace().isEmpty() )
return TQString::null;
- TQString mapfile = KGlobal::dirs()->findResource( "data",
+ TQString mapfile = TDEGlobal::dirs()->findResource( "data",
TQString::fromLatin1( "kabc/countrytransl.map" ) );
TQFile file( mapfile );
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index bf6d0d17a..45d4f10e3 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -673,7 +673,7 @@ bool AddressBook::addCustomField( const TQString &label, int category,
d->mAllFields = Field::allFields();
}
- TQString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
+ TQString a = app.isNull() ? TDEGlobal::instance()->instanceName() : app;
TQString k = key.isNull() ? label : key;
Field *field = Field::createCustomField( label, category, k, a );
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index ec8e7be05..623d26cf3 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -78,7 +78,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
TQT_SLOT( updateEdit( TQListViewItem * ) ) );
mAddresseeEdit = new KLineEdit( topWidget );
- mAddresseeEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
+ mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ),
TQT_SLOT( selectItem( const TQString & ) ) );
mAddresseeEdit->setFocus();
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index fe9d1f602..6f056a404 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -326,16 +326,16 @@ void AddressLineEdit::doCompletion(bool ctrlT)
return;
}
- KGlobalSettings::Completion mode = completionMode();
+ TDEGlobalSettings::Completion mode = completionMode();
switch ( mode )
{
- case KGlobalSettings::CompletionPopupAuto:
+ case TDEGlobalSettings::CompletionPopupAuto:
{
if (s.isEmpty())
break;
}
- case KGlobalSettings::CompletionPopup:
+ case TDEGlobalSettings::CompletionPopup:
{
m_previousAddresses = prevAddr;
TQStringList items = s_completion->allMatches( s );
@@ -368,7 +368,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
// completion (suggestion) since it does not know how to deal
// with providing proper completions for different items on the
// same line, e.g. comma-separated list of email addresses.
- bool autoSuggest = (mode != KGlobalSettings::CompletionPopupAuto);
+ bool autoSuggest = (mode != TDEGlobalSettings::CompletionPopupAuto);
setCompletedItems( items, autoSuggest );
if (!autoSuggest)
@@ -385,7 +385,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
break;
}
- case KGlobalSettings::CompletionShell:
+ case TDEGlobalSettings::CompletionShell:
{
TQString match = s_completion->makeCompletion( s );
if ( !match.isNull() && match != s )
@@ -396,8 +396,8 @@ void AddressLineEdit::doCompletion(bool ctrlT)
break;
}
- case KGlobalSettings::CompletionMan: // Short-Auto in fact
- case KGlobalSettings::CompletionAuto:
+ case TDEGlobalSettings::CompletionMan: // Short-Auto in fact
+ case TDEGlobalSettings::CompletionAuto:
{
if (!s.isEmpty())
{
@@ -410,7 +410,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
break;
}
}
- case KGlobalSettings::CompletionNone:
+ case TDEGlobalSettings::CompletionNone:
default: // fall through
break;
}
@@ -496,7 +496,7 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs )
if( hasFocus() || completionBox()->hasFocus())
{
- if( completionMode() != KGlobalSettings::CompletionNone )
+ if( completionMode() != TDEGlobalSettings::CompletionNone )
{
doCompletion( false );
}
diff --git a/kabc/field.h b/kabc/field.h
index f1de43717..7a622b90f 100644
--- a/kabc/field.h
+++ b/kabc/field.h
@@ -138,7 +138,7 @@ public:
const Field::List &fields );
/**
* This is the same as above, with the difference, that
- * the list is stored in KGlobal::config() in group "KABCFields".
+ * the list is stored in TDEGlobal::config() in group "KABCFields".
*/
static void saveFields( const TQString &identifier,
const Field::List &fields );
@@ -153,7 +153,7 @@ public:
/**
* This is the same as above, with the difference, that
- * the list is loaded from KGlobal::config() from group "KABCFields".
+ * the list is loaded from TDEGlobal::config() from group "KABCFields".
*/
static Field::List restoreFields( const TQString &identifier );
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp
index 8af9e1701..17e7b0f33 100644
--- a/kabc/formatfactory.cpp
+++ b/kabc/formatfactory.cpp
@@ -56,7 +56,7 @@ FormatFactory::FormatFactory()
info->descriptionLabel = i18n( "vCard Format" );
mFormatList.insert( "vcard", info );
- const TQStringList list = KGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
+ const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
{
KSimpleConfig config( *it, true );
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index c23426260..2447229da 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -251,7 +251,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
} else if ( fieldName == "ROLE" ) {
a.setRole( fieldValue );
} else if ( fieldName == "BDAY" ) {
- a.setBirthday( KGlobal::locale()->readDate( fieldValue ) );
+ a.setBirthday( TDEGlobal::locale()->readDate( fieldValue ) );
} else if ( fieldName == "WEBPAGE" ) {
a.setUrl( KURL( fieldValue ) );
} else if ( fieldName == "N" ) {
@@ -280,7 +280,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
void importKab( KABC::AddressBook *ab, bool override, bool quiet )
{
- TQString fileName = KGlobal::dirs()->saveLocation( "data", "kab/" );
+ TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" );
fileName += "addressbook.kab";
if ( !TQFile::exists( fileName ) ) {
if ( !quiet ) {
diff --git a/kabc/lock.cpp b/kabc/lock.cpp
index b5e0ea5a6..42c8c8580 100644
--- a/kabc/lock.cpp
+++ b/kabc/lock.cpp
@@ -68,7 +68,7 @@ bool Lock::writeLockFile( const TQString &filename )
TQFile file( filename );
if ( !file.open( IO_WriteOnly ) ) return false;
TQTextStream t( &file );
- t << ::getpid() << endl << TQString( KGlobal::instance()->instanceName() );
+ t << ::getpid() << endl << TQString( TDEGlobal::instance()->instanceName() );
return true;
}
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp
index f4b4f83b8..e8da1b6aa 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkio.cpp
@@ -110,7 +110,7 @@ ResourceLDAPKIO::ResourceLDAPKIO( const KConfig *config )
d->mCachePolicy = Cache_No;
d->mAutoCache = true;
}
- d->mCacheDst = KGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" +
+ d->mCacheDst = TDEGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" +
type() + "_" + identifier();
init();
}
diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
index 98b21061e..975837bf8 100644
--- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
@@ -30,7 +30,7 @@ extern "C"
{
KDE_EXPORT void *init_kabc_ldapkio()
{
- KGlobal::locale()->insertCatalogue("kabc_ldapkio");
+ TDEGlobal::locale()->insertCatalogue("kabc_ldapkio");
return new KRES::PluginFactory<ResourceLDAPKIO, ResourceLDAPKIOConfig>();
}
}
diff --git a/kabc/scripts/field.src.cpp b/kabc/scripts/field.src.cpp
index 5291303f5..b0704e393 100644
--- a/kabc/scripts/field.src.cpp
+++ b/kabc/scripts/field.src.cpp
@@ -428,7 +428,7 @@ void Field::deleteFields()
void Field::saveFields( const TQString &identifier,
const Field::List &fields )
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
KConfigGroupSaver( cfg, "KABCFields" );
saveFields( cfg, identifier, fields );
@@ -458,7 +458,7 @@ void Field::saveFields( KConfig *cfg, const TQString &identifier,
Field::List Field::restoreFields( const TQString &identifier )
{
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
KConfigGroupSaver( cfg, "KABCFields" );
return restoreFields( cfg, identifier );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-29 23:03:42 +0000