-rw-r--r-- | kabc/addressbook.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 8 | ||||
-rw-r--r-- | kabc/stdaddressbook.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 2 | ||||
-rw-r--r-- | microkde/kresources/factory.cpp | 10 | ||||
-rw-r--r-- | microkde/kresources/resource.cpp | 3 |
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() | |||
252 | bool AddressBook::load() | 252 | bool AddressBook::load() |
253 | { | 253 | { |
254 | kdDebug(5700) << "AddressBook::load()" << endl; | 254 | |
255 | 255 | ||
256 | clear(); | 256 | 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() | |||
195 | bool ResourceFile::load() | 195 | bool ResourceFile::load() |
196 | { | 196 | { |
197 | kdDebug(5700) << "ResourceFile::load(): '" << mFileName << "'" << endl; | 197 | |
198 | 198 | ||
199 | QFile file( mFileName ); | 199 | QFile file( mFileName ); |
@@ -211,5 +211,5 @@ bool ResourceFile::save( Ticket *ticket ) | |||
211 | { | 211 | { |
212 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 212 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
213 | kdDebug(5700) << "ResourceFile::save()" << endl; | 213 | |
214 | 214 | ||
215 | // create backup file | 215 | // create backup file |
@@ -258,5 +258,5 @@ bool ResourceFile::save( Ticket *ticket ) | |||
258 | bool ResourceFile::lock( const QString &fileName ) | 258 | bool ResourceFile::lock( const QString &fileName ) |
259 | { | 259 | { |
260 | kdDebug(5700) << "ResourceFile::lock()" << endl; | 260 | |
261 | 261 | ||
262 | QString fn = fileName; | 262 | QString fn = fileName; |
@@ -269,5 +269,5 @@ bool ResourceFile::lock( const QString &fileName ) | |||
269 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 269 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
270 | 270 | ||
271 | kdDebug(5700) << "-- lock name: " << lockName << endl; | 271 | |
272 | 272 | ||
273 | if (QFile::exists( lockName )) return false; | 273 | 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 ) | |||
153 | } | 153 | } |
154 | else | 154 | else |
155 | kdDebug(5700) << "No resource available!!!" << endl; | 155 | qDebug(" No resource available!!!"); |
156 | } | 156 | } |
157 | 157 | ||
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 | |||
132 | 132 | ||
133 | mAddressBook = KABC::StdAddressBook::self(); | 133 | mAddressBook = KABC::StdAddressBook::self(); |
134 | KABC::StdAddressBook::setAutomaticSave( true ); | 134 | KABC::StdAddressBook::setAutomaticSave( false ); |
135 | 135 | ||
136 | #ifndef KAB_EMBEDDED | 136 | #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; | |||
41 | Factory *Factory::self( const QString& resourceFamily ) | 41 | Factory *Factory::self( const QString& resourceFamily ) |
42 | { | 42 | { |
43 | kdDebug(5650) << "Factory::self()" << endl; | 43 | |
44 | 44 | ||
45 | Factory *factory = 0; | 45 | Factory *factory = 0; |
@@ -80,5 +80,5 @@ Factory::Factory( const QString& resourceFamily ) : | |||
80 | info->library = "microkabc_file"; | 80 | info->library = "microkabc_file"; |
81 | info->nameLabel = i18n( "file" ); | 81 | info->nameLabel = i18n( "file" ); |
82 | info->descriptionLabel = i18n( "No description available." ); | 82 | info->descriptionLabel = i18n( "Choose one file" ); |
83 | mTypeMap.insert( "file", info ); | 83 | mTypeMap.insert( "file", info ); |
84 | 84 | ||
@@ -86,5 +86,5 @@ Factory::Factory( const QString& resourceFamily ) : | |||
86 | info->library = "microkabc_dir"; | 86 | info->library = "microkabc_dir"; |
87 | info->nameLabel = i18n( "dir" ); | 87 | info->nameLabel = i18n( "dir" ); |
88 | info->descriptionLabel = i18n( "No description available." ); | 88 | info->descriptionLabel = i18n( "Choose a directory with may files" ); |
89 | mTypeMap.insert( "dir", info ); | 89 | mTypeMap.insert( "dir", info ); |
90 | 90 | ||
@@ -92,5 +92,5 @@ Factory::Factory( const QString& resourceFamily ) : | |||
92 | info->library = "microkabc_ldap"; | 92 | info->library = "microkabc_ldap"; |
93 | info->nameLabel = i18n( "ldap" ); | 93 | info->nameLabel = i18n( "ldap" ); |
94 | info->descriptionLabel = i18n( "No description available." ); | 94 | info->descriptionLabel = i18n( "No description available" ); |
95 | mTypeMap.insert( "ldap", info ); | 95 | mTypeMap.insert( "ldap", info ); |
96 | 96 | ||
@@ -201,5 +201,5 @@ QString Factory::typeDescription( const QString &type ) const | |||
201 | Resource *Factory::resource( const QString& type, const KConfig *config ) | 201 | Resource *Factory::resource( const QString& type, const KConfig *config ) |
202 | { | 202 | { |
203 | kdDebug() << "Factory::resource( " << type << ", config)" << endl; | 203 | |
204 | 204 | ||
205 | if ( type.isEmpty() || !mTypeMap.contains( type ) ) | 205 | 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() | |||
76 | void Resource::writeConfig( KConfig* config ) | 76 | void Resource::writeConfig( KConfig* config ) |
77 | { | 77 | { |
78 | kdDebug(5650) << "Resource::writeConfig()" << endl; | 78 | |
79 | 79 | ||
80 | config->writeEntry( "ResourceType", d->mType ); | 80 | config->writeEntry( "ResourceType", d->mType ); |
@@ -175,4 +175,5 @@ bool Resource::isActive() const | |||
175 | void Resource::dump() const | 175 | void Resource::dump() const |
176 | { | 176 | { |
177 | qDebug("Resource::dump() "); | ||
177 | kdDebug(5650) << "Resource:" << endl; | 178 | kdDebug(5650) << "Resource:" << endl; |
178 | kdDebug(5650) << " Name: " << d->mName << endl; | 179 | kdDebug(5650) << " Name: " << d->mName << endl; |