summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/addressbook.cpp2
-rw-r--r--kabc/plugins/file/resourcefile.cpp8
-rw-r--r--kabc/stdaddressbook.cpp2
-rw-r--r--kaddressbook/kabcore.cpp2
-rw-r--r--microkde/kresources/factory.cpp10
-rw-r--r--microkde/kresources/resource.cpp3
6 files changed, 14 insertions, 13 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 97bd3ef..0838157 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -252,5 +252,5 @@ AddressBook::~AddressBook()
bool AddressBook::load()
{
- kdDebug(5700) << "AddressBook::load()" << endl;
+
clear();
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 80af841..3920f69 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -195,5 +195,5 @@ void ResourceFile::doClose()
bool ResourceFile::load()
{
- kdDebug(5700) << "ResourceFile::load(): '" << mFileName << "'" << endl;
+
QFile file( mFileName );
@@ -211,5 +211,5 @@ bool ResourceFile::save( Ticket *ticket )
{
// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
- kdDebug(5700) << "ResourceFile::save()" << endl;
+
// create backup file
@@ -258,5 +258,5 @@ bool ResourceFile::save( Ticket *ticket )
bool ResourceFile::lock( const QString &fileName )
{
- kdDebug(5700) << "ResourceFile::lock()" << endl;
+
QString fn = fileName;
@@ -269,5 +269,5 @@ bool ResourceFile::lock( const QString &fileName )
QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
- kdDebug(5700) << "-- lock name: " << lockName << endl;
+
if (QFile::exists( lockName )) return false;
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 075f12f..1e00cc6 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -153,5 +153,5 @@ void StdAddressBook::init( bool )
}
else
- kdDebug(5700) << "No resource available!!!" << endl;
+ qDebug(" No resource available!!!");
}
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3ae23e8..a0fec91 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -132,5 +132,5 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
mAddressBook = KABC::StdAddressBook::self();
- KABC::StdAddressBook::setAutomaticSave( true );
+ KABC::StdAddressBook::setAutomaticSave( false );
#ifndef KAB_EMBEDDED
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 56b0ef3..827ec38 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -41,5 +41,5 @@ static KStaticDeleter< QDict<Factory> > staticDeleter;
Factory *Factory::self( const QString& resourceFamily )
{
- kdDebug(5650) << "Factory::self()" << endl;
+
Factory *factory = 0;
@@ -80,5 +80,5 @@ Factory::Factory( const QString& resourceFamily ) :
info->library = "microkabc_file";
info->nameLabel = i18n( "file" );
- info->descriptionLabel = i18n( "No description available." );
+ info->descriptionLabel = i18n( "Choose one file" );
mTypeMap.insert( "file", info );
@@ -86,5 +86,5 @@ Factory::Factory( const QString& resourceFamily ) :
info->library = "microkabc_dir";
info->nameLabel = i18n( "dir" );
- info->descriptionLabel = i18n( "No description available." );
+ info->descriptionLabel = i18n( "Choose a directory with may files" );
mTypeMap.insert( "dir", info );
@@ -92,5 +92,5 @@ Factory::Factory( const QString& resourceFamily ) :
info->library = "microkabc_ldap";
info->nameLabel = i18n( "ldap" );
- info->descriptionLabel = i18n( "No description available." );
+ info->descriptionLabel = i18n( "No description available" );
mTypeMap.insert( "ldap", info );
@@ -201,5 +201,5 @@ QString Factory::typeDescription( const QString &type ) const
Resource *Factory::resource( const QString& type, const KConfig *config )
{
- kdDebug() << "Factory::resource( " << type << ", config)" << endl;
+
if ( type.isEmpty() || !mTypeMap.contains( type ) )
diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
index 169eaa4..7827a67 100644
--- a/microkde/kresources/resource.cpp
+++ b/microkde/kresources/resource.cpp
@@ -76,5 +76,5 @@ Resource::~Resource()
void Resource::writeConfig( KConfig* config )
{
- kdDebug(5650) << "Resource::writeConfig()" << endl;
+
config->writeEntry( "ResourceType", d->mType );
@@ -175,4 +175,5 @@ bool Resource::isActive() const
void Resource::dump() const
{
+ qDebug("Resource::dump() ");
kdDebug(5650) << "Resource:" << endl;
kdDebug(5650) << " Name: " << d->mName << endl;