diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
| commit | 64df902cf71a8ee258fb85f6be26248f399aa01f (patch) | |
| tree | dba58f705042c22cea26b678d5b0e4e9a34bf202 /libkpimidentities/identitymanager.cpp | |
| parent | de53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff) | |
| download | tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libkpimidentities/identitymanager.cpp')
| -rw-r--r-- | libkpimidentities/identitymanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index f6bc5def..d9d62615 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -45,7 +45,7 @@ static const char configKeyDefaultIdentity[] = "Default Identity"; #include <kapplication.h> #include <klocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kuser.h> #include <dcopclient.h> @@ -74,7 +74,7 @@ IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char * readConfig(mConfig); if ( mIdentities.isEmpty() ) { kdDebug(5006) << "emailidentities is empty -> convert from kmailrc" << endl; - // No emailidentities file, or an empty one due to broken conversion (kconf_update bug in tdelibs <= 3.2.2) + // No emailidentities file, or an empty one due to broken conversion (tdeconf_update bug in tdelibs <= 3.2.2) // => convert it, i.e. read settings from kmailrc TDEConfig kmailConf( "kmailrc", true ); readConfig( &kmailConf ); |