Changed some strings. Removed some kdebug

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
@@ -251,7 +251,7 @@ 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
@@ -194,7 +194,7 @@ void ResourceFile::doClose()
 
 bool ResourceFile::load()
 {
-  kdDebug(5700) << "ResourceFile::load(): '" << mFileName << "'" << endl;
+  
 
   QFile file( mFileName );
   if ( !file.open( IO_ReadOnly ) ) {
@@ -210,7 +210,7 @@ bool ResourceFile::load()
 bool ResourceFile::save( Ticket *ticket )
 {
 //    qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
-  kdDebug(5700) << "ResourceFile::save()" << endl;
+  
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
@@ -257,7 +257,7 @@ bool ResourceFile::save( Ticket *ticket )
 
 bool ResourceFile::lock( const QString &fileName )
 {
-  kdDebug(5700) << "ResourceFile::lock()" << endl;
+  
 
   QString fn = fileName;
 
@@ -268,7 +268,7 @@ bool ResourceFile::lock( const QString &fileName )
   KURL url(fn);  
   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
@@ -152,7 +152,7 @@ void StdAddressBook::init( bool )
       addResource( res );
     }
     else
-      kdDebug(5700) << "No resource available!!!" << endl;
+        qDebug(" No resource available!!!");
   }
 
   setStandardResource( res );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3ae23e8..a0fec91 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -131,7 +131,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   mIsPart = !parent->inherits( "KAddressBookMain" );
 
   mAddressBook = KABC::StdAddressBook::self();
-  KABC::StdAddressBook::setAutomaticSave( true );
+  KABC::StdAddressBook::setAutomaticSave( false );
 
 #ifndef KAB_EMBEDDED
   mAddressBook->setErrorHandler( new KABC::GUIErrorHandler );
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
@@ -40,7 +40,7 @@ static KStaticDeleter< QDict<Factory> > staticDeleter;
 
 Factory *Factory::self( const QString& resourceFamily )
 {
-  kdDebug(5650) << "Factory::self()" << endl;
+  
 
   Factory *factory = 0;
   if ( !mSelves )
@@ -79,19 +79,19 @@ Factory::Factory( const QString& resourceFamily ) :
   PluginInfo* info = new PluginInfo;
   info->library = "microkabc_file";
   info->nameLabel = i18n( "file" );
-  info->descriptionLabel = i18n( "No description available." );
+  info->descriptionLabel = i18n( "Choose one file" );
   mTypeMap.insert( "file", info );
 
   info = new PluginInfo;
   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 );
   
   info = new PluginInfo;
   info->library = "microkabc_ldap";
   info->nameLabel = i18n( "ldap" );
-  info->descriptionLabel = i18n( "No description available." );
+  info->descriptionLabel = i18n( "No description available" );
   mTypeMap.insert( "ldap", info );
 
   //US add opie plugin only, if the library exists
@@ -200,7 +200,7 @@ 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 ) )
     return 0;
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
@@ -75,7 +75,7 @@ Resource::~Resource()
 
 void Resource::writeConfig( KConfig* config )
 {
-  kdDebug(5650) << "Resource::writeConfig()" << endl;
+ 
 
   config->writeEntry( "ResourceType", d->mType );
   config->writeEntry( "ResourceName", d->mName );
@@ -174,6 +174,7 @@ bool Resource::isActive() const
 
 void Resource::dump() const
 {
+    qDebug("Resource::dump() ");
   kdDebug(5650) << "Resource:" << endl;
   kdDebug(5650) << "  Name: " << d->mName << endl;
   kdDebug(5650) << "  Identifier: " << d->mIdentifier << endl;