From kde-commits Thu Apr 09 21:20:52 2009 From: Jaroslaw Staniek Date: Thu, 09 Apr 2009 21:20:52 +0000 To: kde-commits Subject: koffice/kexi/core (silent) Message-Id: <1239312052.314750.10390.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=123931206207622 SVN commit 951680 by staniek: SVN_SILENT cleanup for kDebugs M +3 -3 KexiView.cpp M +4 -4 kexiblobbuffer.cpp M +5 -8 kexidataiteminterface.cpp M +4 -4 kexidragobjects.cpp M +3 -3 kexiinternalpart.cpp M +2 -2 kexipartmanager.cpp M +3 -3 kexiproject.cpp M +4 -5 kexitemplateloader.cpp --- trunk/koffice/kexi/core/KexiView.cpp #951679:951680 @@ -429,9 +429,9 @@ // //hp==true if currently focused widget is a child of this table view // const bool hp = Kexi::hasParent( static_cast(o), focusWidget()); kDebug() << "this=[" << o->metaObject()->className() - << " " << objectName() << "] o=[" << o->metaObject()->className() << " " << o->objectName() - << "] focusWidget=[" << (qApp->focusWidget() ? qApp->focusWidget()->metaObject()->className() : QString()) << " " - << (qApp->focusWidget() ? qApp->focusWidget()->objectName() : QString()) << "] ev.type=" << e->type(); + << objectName() << "] o=[" << o->metaObject()->className() << o->objectName() + << "] focusWidget=[" << (qApp->focusWidget() ? qApp->focusWidget()->metaObject()->className() : QString()) + << (qApp->focusWidget() ? qApp->focusWidget()->objectName() : QString()) << "] ev.type=" << e->type(); if (KexiUtils::hasParent(this, o)) { if (e->type() == QEvent::FocusOut && qApp->focusWidget() && !KexiUtils::hasParent(this, qApp->focusWidget())) { --- trunk/koffice/kexi/core/kexiblobbuffer.cpp #951679:951680 @@ -103,8 +103,7 @@ if (!m_item) return; if (m_item->stored) { - kWarning() << "KexiBLOBBuffer::Handle::setStoredWidthID(): object for id=" << id - << " is aleady stored"; + kWarning() << "object for id=" << id << " is aleady stored"; return; } @@ -307,8 +306,9 @@ recordData); if (res != true || recordData.size() < 4) { //! @todo err msg - kWarning() << "KexiBLOBBuffer::objectForId(" << id << "," << stored - << "): res!=true || recordData.size()<4; res==" << res.toString() << " recordData.size()==" << recordData.size(); + kWarning() << "id=" << id << "stored=" << stored + << ": res!=true || recordData.size()<4; res==" << res.toString() + << "recordData.size()==" << recordData.size(); return KexiBLOBBuffer::Handle(); } --- trunk/koffice/kexi/core/kexidataiteminterface.cpp #951679:951680 @@ -51,10 +51,10 @@ m_disable_signalValueChanged = true; //to prevent emmiting valueChanged() //needed? clear(); if (dynamic_cast(this)) { - kDebug() << "KexiDataItemInterface::setValue(): " << - dynamic_cast(this)->metaObject()->className() << " " - << dynamic_cast(this)->objectName() - << " value=" << value << " add=" << add; + kDebug() << + dynamic_cast(this)->metaObject()->className() + << dynamic_cast(this)->objectName() + << "value=" << value << "add=" << add; } m_origValue = value; setValueInternal(add, removeOld); @@ -84,10 +84,7 @@ bool KexiDataItemInterface::valueChanged() { -// bool ok; -// kDebug() << m_origValue.toString() << " ? " << value(ok).toString(); -// return (m_origValue != value(ok)) && ok; - kDebug() << "KexiDataItemInterface::valueChanged(): " << m_origValue.toString() << " ? " << value().toString(); + kDebug() << m_origValue.toString() << " ? " << value().toString(); return m_origValue != value(); } --- trunk/koffice/kexi/core/kexidragobjects.cpp #951679:951680 @@ -54,7 +54,7 @@ if (fields.count() == 1) field = fields.first(); else - kDebug() << "KexiFieldDrag::KexiFieldDrag(): fields list is empty!"; + kDebug() << "fields list is empty!"; stream1 << sourceMimeType << sourceName << field; } setEncodedData(data); @@ -89,7 +89,7 @@ stream1 >> sourceMimeType; stream1 >> sourceName; stream1 >> field; -// kDebug() << "KexiFieldDrag::decode() decoded: " << sourceMimeType<<"/"<> sourceMimeType; stream1 >> sourceName; stream1 >> fields; -// kDebug() << "KexiFieldDrag::decode() decoded: " << sourceMimeType<<"/"<> sourceMimeType; stream1 >> sourceName; -// kDebug() << "KexiDataProviderDrag::decode() decoded: " << sourceMimeType <<"/"<findOrCreateKexiWindow(objName ? objName : partName); @@ -145,7 +145,7 @@ { KexiInternalPart *part = internalPartManager.findPart(msgHdr, partName); if (!part) { - kDebug() << "KexiInternalPart::createDialogInstance() !part"; + kWarning() << "!part"; return 0; //fatal! } QWidget *w; @@ -171,7 +171,7 @@ { KexiInternalPart *part = internalPartManager.findPart(0, partName); if (!part) { - kDebug() << "KexiInternalPart::createWindowInstance() !part"; + kWarning() << "!part"; return 0; //fatal! } return part->executeCommand(commandName, args); --- trunk/koffice/kexi/core/kexipartmanager.cpp #951679:951680 @@ -63,7 +63,7 @@ m_parts.clear(); if (!KServiceType::serviceType("Kexi/Handler")) { - kWarning() << "KexiPart::Manager::lookup(): No 'Kexi/Handler' service type installed! Aborting."; + kWarning() << "No 'Kexi/Handler' service type installed! Aborting."; setError(i18n("No \"%1\" service type installed. Check your Kexi installation. Aborting.", QString("Kexi/Handler"))); return false; @@ -139,7 +139,7 @@ int error = 0; p = KService::createInstance(i->ptr(), this, QStringList(), &error); if (!p) { - kDebug() << "Manager::part(): failed :( (ERROR #" << error << ")"; + kDebug() << "failed :( (ERROR #" << error << ")"; kDebug() << " " << KLibLoader::self()->lastErrorMessage(); i->setBroken(true, i18n("Error while loading plugin \"%1\"", i->objectName())); setError(i->errorMessage()); --- trunk/koffice/kexi/core/kexiproject.cpp #951679:951680 @@ -140,9 +140,9 @@ if (d->data->connectionData() == d->connection->data()) d->connection = conn; else - kWarning() << "KexiProject::KexiProject(): passed connection's data (" - << conn->data()->serverInfoString() << ") is not compatible with project's conn. data (" - << d->data->connectionData()->serverInfoString() << ")"; + kWarning() << "passed connection's data (" + << conn->data()->serverInfoString() << ") is not compatible with project's conn. data (" + << d->data->connectionData()->serverInfoString() << ")"; } KexiProject::~KexiProject() --- trunk/koffice/kexi/core/kexitemplateloader.cpp #951679:951680 @@ -62,7 +62,7 @@ if (!dir.exists()) continue; if (!dir.isReadable()) { - kWarning() << "KexiTemplateLoader::loadListInfo() \"" << dir.absolutePath() << "\" not readable!"; + kWarning() << "\"" << dir.absolutePath() << "\" not readable!"; continue; } const QStringList templateDirs(dir.entryList(QDir::Dirs, QDir::Name)); @@ -88,8 +88,7 @@ { QDir dir(directory); if (!dir.isReadable()) { - kWarning() << "KexiTemplateLoader::loadInfo() \"" - << directory << "\" not readable!"; + kWarning() << "\"" << directory << "\" not readable!"; return KexiTemplateInfo(); } if (!QFileInfo(directory + "/info.txt").isReadable()) @@ -100,7 +99,7 @@ KexiTemplateInfo info; info.name = cg.readEntry("Name"); if (info.name.isEmpty()) { - kWarning() << "KexiTemplateLoader::loadInfo() \"" << (directory + "/info.txt") << "\" contains no \"name\" field"; + kWarning() << "\"" << (directory + "/info.txt") << "\" contains no \"name\" field"; return KexiTemplateInfo(); } QStringList templateFileNameFilters; @@ -108,7 +107,7 @@ const QStringList templateFiles( dir.entryList(templateFileNameFilters, QDir::Files | QDir::Readable, QDir::Name)); if (templateFiles.isEmpty()) { - kWarning() << "KexiTemplateLoader::loadInfo() no readable .kexi template file found in \"" << directory << "\""; + kWarning() << "no readable .kexi template file found in \"" << directory << "\""; return KexiTemplateInfo(); } info.filename = directory + "/" + templateFiles.first();