generic: prepare for Katie changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-13 00:40:18 +02:00
parent a5ad00dcf8
commit 9b41127ecb
46 changed files with 108 additions and 117 deletions

View file

@ -24,6 +24,7 @@
#define KCONFIGDATA_H
#include <QtCore/qdebug.h>
#include <QtCore/qmap.h>
/**
* map/dict/list config node entry.

View file

@ -657,7 +657,7 @@ inline Class::Enum readEntry(const KConfigGroup& group, const char* key, const C
const QMetaObject* M_obj = &Class::staticMetaObject; \
const int M_index = M_obj->indexOfEnumerator(#Enum); \
if (M_index == -1) { \
kFatal() << KCONFIGGROUP_ENUMERATOR_ERROR(#Enum) << endl; \
kFatal() << KCONFIGGROUP_ENUMERATOR_ERROR(#Enum); \
} \
const QMetaEnum M_enum = M_obj->enumerator(M_index); \
const QByteArray M_data = group.readEntry(key, QByteArray(M_enum.valueToKey(def))); \
@ -668,7 +668,7 @@ inline void writeEntry(KConfigGroup& group, const char* key, const Class::Enum&
const QMetaObject* M_obj = &Class::staticMetaObject; \
const int M_index = M_obj->indexOfEnumerator(#Enum); \
if (M_index == -1) { \
kFatal() << KCONFIGGROUP_ENUMERATOR_ERROR(#Enum) << endl; \
kFatal() << KCONFIGGROUP_ENUMERATOR_ERROR(#Enum); \
} \
const QMetaEnum M_enum = M_obj->enumerator(M_index); \
group.writeEntry(key, QByteArray(M_enum.valueToKey(value)), flags); \
@ -684,7 +684,7 @@ inline Class::Flags readEntry(const KConfigGroup& group, const char* key, const
const QMetaObject* M_obj = &Class::staticMetaObject; \
const int M_index = M_obj->indexOfEnumerator(#Flags); \
if (M_index == -1) { \
kFatal() << KCONFIGGROUP_ENUMERATOR_ERROR(#Flags) << endl; \
kFatal() << KCONFIGGROUP_ENUMERATOR_ERROR(#Flags); \
} \
const QMetaEnum M_enum = M_obj->enumerator(M_index); \
const QByteArray M_data = group.readEntry(key, QByteArray(M_enum.valueToKeys(def))); \
@ -695,7 +695,7 @@ inline void writeEntry(KConfigGroup& group, const char* key, const Class::Flags&
const QMetaObject* M_obj = &Class::staticMetaObject; \
const int M_index = M_obj->indexOfEnumerator(#Flags); \
if (M_index == -1) { \
kFatal() << KCONFIGGROUP_ENUMERATOR_ERROR(#Flags) << endl; \
kFatal() << KCONFIGGROUP_ENUMERATOR_ERROR(#Flags); \
} \
const QMetaEnum M_enum = M_obj->enumerator(M_index); \
group.writeEntry(key, QByteArray(M_enum.valueToKeys(value)), flags); \

View file

@ -134,7 +134,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString& path)
return true;
}
kWarning() << "Access to '" << path << "' denied, not owned by root, executable flag not set." << endl;
kWarning() << "Access to '" << path << "' denied, not owned by root, executable flag not set.";
return false;
}

View file

@ -632,7 +632,7 @@ QDateTime KDateTimePrivate::toUtc(const KTimeZone &local) const
loc = KSystemTimeZones::local();
if (specZone == loc)
{
// kDebug() << "toUtc(): cached -> " << utc() << endl,
// kDebug() << "toUtc(): cached -> " << utc();
#ifdef ENABLE_TESTING
++KDateTime_utcCacheHit;
#endif
@ -641,7 +641,7 @@ QDateTime KDateTimePrivate::toUtc(const KTimeZone &local) const
}
else
{
// kDebug() << "toUtc(): cached -> " << utc() << endl,
// kDebug() << "toUtc(): cached -> " << utc();
#ifdef ENABLE_TESTING
++KDateTime_utcCacheHit;
#endif
@ -660,7 +660,7 @@ QDateTime KDateTimePrivate::toUtc(const KTimeZone &local) const
break;
QDateTime dt = QDateTime(mDt.date(), mDt.time(), Qt::UTC).addSecs(-specUtcOffset);
setUtc(dt);
// kDebug() << "toUtc(): calculated -> " << dt << endl,
// kDebug() << "toUtc(): calculated -> " << dt;
return dt;
}
case KDateTime::ClockTime:
@ -672,14 +672,14 @@ QDateTime KDateTimePrivate::toUtc(const KTimeZone &local) const
const_cast<KDateTimePrivate*>(this)->specZone = loc;
QDateTime dt(specZone.toUtc(mDt));
setUtc(dt);
// kDebug() << "toUtc(): calculated -> " << dt << endl,
// kDebug() << "toUtc(): calculated -> " << dt;
return dt;
}
case KDateTime::TimeZone:
if (!mDt.isValid())
break;
timeZoneOffset(); // calculate offset and cache UTC value
// kDebug() << "toUtc(): calculated -> " << utc() << endl,
// kDebug() << "toUtc(): calculated -> " << utc();
return utc();
default:
break;

View file

@ -1076,7 +1076,7 @@ KTimeZoneData *KTimeZoneSource::parse(const KTimeZone &zone) const
QFile f(path);
if (!f.open(QIODevice::ReadOnly))
{
kError() << "Cannot open " << f.fileName() << endl;
kError() << "Cannot open " << f.fileName();
return 0;
}
QDataStream str(&f);
@ -1086,7 +1086,7 @@ KTimeZoneData *KTimeZoneSource::parse(const KTimeZone &zone) const
str >> T_ >> Z_ >> i_ >> f_;
if (T_ != 'T' || Z_ != 'Z' || i_ != 'i' || f_ != 'f')
{
kError() << "Not a TZFILE: " << f.fileName() << endl;
kError() << "Not a TZFILE: " << f.fileName();
return 0;
}
// Discard 16 bytes reserved for future use
@ -1109,7 +1109,7 @@ KTimeZoneData *KTimeZoneSource::parse(const KTimeZone &zone) const
>> nLocalTimeTypes
>> abbrCharCount;
// kDebug() << "header: " << nIsUtc << ", " << nIsStandard << ", " << nLeapSecondAdjusts << ", " <<
// nTransitionTimes << ", " << nLocalTimeTypes << ", " << abbrCharCount << endl;
// nTransitionTimes << ", " << nLocalTimeTypes << ", " << abbrCharCount;
// Read the transition times, at which the rules for computing local time change
struct TransitionTime
@ -1159,7 +1159,7 @@ KTimeZoneData *KTimeZoneSource::parse(const KTimeZone &zone) const
// Make sure we don't fall foul of maliciously coded time zone abbreviations.
if (abbrCharCount > 64)
{
kError() << "excessive length for timezone abbreviations: " << abbrCharCount << endl;
kError() << "excessive length for timezone abbreviations: " << abbrCharCount;
delete data;
delete[] transitionTimes;
delete[] localTimeTypes;
@ -1171,7 +1171,7 @@ KTimeZoneData *KTimeZoneSource::parse(const KTimeZone &zone) const
if (abbrs[abbrCharCount - 1] != 0)
{
// These abbreviations are corrupt!
kError() << "timezone abbreviations not null terminated: " << abbrs[abbrCharCount - 1] << endl;
kError() << "timezone abbreviations not null terminated: " << abbrs[abbrCharCount - 1];
delete data;
delete[] transitionTimes;
delete[] localTimeTypes;
@ -1252,7 +1252,7 @@ KTimeZoneData *KTimeZoneSource::parse(const KTimeZone &zone) const
{
if (ltt->abbrIndex >= abbreviations.count())
{
kError() << "KTimeZoneSource::parse(): abbreviation index out of range" << endl;
kError() << "KTimeZoneSource::parse(): abbreviation index out of range";
abbrev = "???";
}
else
@ -1285,7 +1285,7 @@ KTimeZoneData *KTimeZoneSource::parse(const KTimeZone &zone) const
{
if (tt->localTimeIndex >= nLocalTimeTypes)
{
kError() << "KTimeZoneSource::parse(): transition ignored: local time type out of range: " <<(int)tt->localTimeIndex<<" > "<<nLocalTimeTypes << endl;
kError() << "KTimeZoneSource::parse(): transition ignored: local time type out of range: " << (int)tt->localTimeIndex << " > " << nLocalTimeTypes;
continue;
}
@ -1714,7 +1714,7 @@ void KTimeZoneData::setLeapSecondChanges(const QList<KTimeZone::LeapSeconds> &ad
KTimeZone::LeapSeconds KTimeZoneData::leapSecondChange(const QDateTime &utc) const
{
if (utc.timeSpec() != Qt::UTC)
kError() << "KTimeZoneData::leapSecondChange(): non-UTC time specified" << endl;
kError() << "KTimeZoneData::leapSecondChange(): non-UTC time specified";
else
{
for (int i = d->leapChanges.count(); --i >= 0; )

View file

@ -125,7 +125,7 @@ KTempDir::KTempDir(const QString &_directoryPrefix, int mode)
// Recreate it for the warning, mkdtemps emptied it
nme = QFile::encodeName(directoryPrefix) + "XXXXXX";
kWarning(180) << "KTempDir: Error trying to create " << nme.data()
<< ": " << ::strerror(errno) << endl;
<< ": " << ::strerror(errno);
d->error = errno;
d->tmpName.clear();
return;
@ -133,7 +133,7 @@ KTempDir::KTempDir(const QString &_directoryPrefix, int mode)
QByteArray realNameStr(realName);
d->tmpName = QFile::decodeName(realNameStr)+QLatin1Char('/');
kDebug(180) << "KTempDir: Temporary directory created :" << d->tmpName << endl;
kDebug(180) << "KTempDir: Temporary directory created :" << d->tmpName;
mode_t umsk = KGlobal::umask();
if (::chmod(nme, mode & (~umsk)) < 0) {

View file

@ -56,13 +56,13 @@ public:
inline void ref()
{
refCount.ref();
//qDebug() << refCount - 1 << "->" << refCount << kBacktrace() << endl;
//qDebug() << refCount - 1 << "->" << refCount << kBacktrace();
}
inline void deref()
{
const int refc = refCount.fetchAndAddOrdered(-1) - 1;
//qDebug() << refCount + 1 << "->" << refCount << kBacktrace() << endl;
//qDebug() << refCount + 1 << "->" << refCount << kBacktrace();
if (refc == 0) {
delete this;
} else if (refc == 1 && sharedConfig && sharedConfig->componentData().d == this) { //sharedConfig has a reference to us

View file

@ -80,7 +80,7 @@ static void printError(const QString& text, QString* error)
if (error)
*error = text;
else
kError() << text << endl;
kError() << text;
}
int KToolInvocation::startServiceInternal(const char *_function,

View file

@ -78,8 +78,7 @@ static QStringList splitEmailAddressList( const QString & aStr )
if (commentlevel > 0)
commentlevel--;
else {
//kDebug() << "Error in address splitting: Unmatched ')'"
// << endl;
// kDebug() << "Error in address splitting: Unmatched ')'";
return list;
}
}
@ -105,8 +104,7 @@ static QStringList splitEmailAddressList( const QString & aStr )
}
//else
// kDebug() << "Error in address splitting: "
// << "Unexpected end of address list"
// << endl;
// << "Unexpected end of address list";
return list;
}

View file

@ -283,7 +283,7 @@ void KLocalePrivate::initMainCatalogs()
if (m_catalogName.isEmpty()) {
kDebug(173) << "KLocale instance created called without valid "
<< "catalog! Give an argument or call setMainCatalog "
<< "before init" << endl;
<< "before init";
} else {
// do not use insertCatalog here, that would already trigger updateCatalogs
m_catalogNames.append(KCatalogName(m_catalogName)); // application catalog
@ -795,18 +795,18 @@ void KLocalePrivate::translateRaw(const char *msgctxt, const char *msgid, const
{
if (!msgid || !msgid[0]) {
kDebug(173) << "KLocale: trying to look up \"\" in catalog. "
<< "Fix the program" << endl;
<< "Fix the program";
language->clear();
translation->clear();
return;
}
if (msgctxt && !msgctxt[0]) {
kDebug(173) << "KLocale: trying to use \"\" as context to message. "
<< "Fix the program" << endl;
<< "Fix the program";
}
if (msgid_plural && !msgid_plural[0]) {
kDebug(173) << "KLocale: trying to use \"\" as plural message. "
<< "Fix the program" << endl;
<< "Fix the program";
}
std::lock_guard<std::recursive_mutex> lock(kLocaleMutex());
@ -875,7 +875,7 @@ QString KLocalePrivate::translateQt(const char *context, const char *sourceText)
if (!sourceText || !sourceText[0]) {
kDebug(173) << "KLocale: trying to look up \"\" in catalog. "
<< "Fix the program" << endl;
<< "Fix the program";
return QString();
}

View file

@ -74,7 +74,7 @@ bool KMimeMagicMatch::match(QIODevice* device, qint64 deviceSize, QByteArray& av
/*kDebug() << "need " << dataNeeded << " bytes of data starting at " << m_rangeStart
<< " - availableData has " << availableData.size() << " bytes,"
<< " device has " << deviceSize << " bytes." << endl;*/
<< " device has " << deviceSize << " bytes.";*/
if (m_rangeStart + dataNeeded > availableData.size() && availableData.size() < deviceSize) {
// Need to read from device

View file

@ -424,14 +424,14 @@ QList<KMimeMagicRule> KMimeTypeRepository::parseMagicFile(QIODevice* file, const
const int pos = line.indexOf(QLatin1Char(':'));
if (pos == -1) { // syntax error
kWarning(servicesDebugArea()) << "Syntax error in " << mimeTypeName
<< " ':' not present in section name" << endl;
<< " ':' not present in section name";
break;
}
priority = line.left(pos).toInt();
mimeTypeName = line.mid(pos+1);
mimeTypeName = mimeTypeName.left(mimeTypeName.length()-2); // remove ']\n'
//kDebug(servicesDebugArea()) << "New rule for " << mimeTypeName
// << " with priority " << priority << endl;
// << " with priority " << priority;
} else {
// Parse line in the section
// [ indent ] ">" start-offset "=" value
@ -459,7 +459,7 @@ QList<KMimeMagicRule> KMimeTypeRepository::parseMagicFile(QIODevice* file, const
break;
const qint16 valueLength = qFromBigEndian(lengthBuffer);
//kDebug() << "indent=" << indent << " rangeStart=" << match.m_rangeStart
// << " valueLength=" << valueLength << endl;
// << " valueLength=" << valueLength;
match.m_data.resize(valueLength);
if (file->read(match.m_data.data(), valueLength) != valueLength)

View file

@ -149,7 +149,7 @@ KService::List KMimeTypeTrader::query( const QString& mimeType,
KServiceTypeTrader::applyConstraints(lst, constraint);
kDebug(7014) << "query for mimeType " << mimeType << ", " << genericServiceType
<< " : returning " << lst.count() << " offers" << endl;
<< " : returning " << lst.count() << " offers";
return lst;
}

View file

@ -97,7 +97,7 @@ void KServicePrivate::init( const KDesktopFile *config, KService* q )
{
/*kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath
<< " has no Type=... entry."
<< " It should be \"Application\", \"Service\"" or \"FSDevice\" << endl;
<< " It should be \"Application\", \"Service\"" or \"FSDevice\";
m_bValid = false;
return;*/
m_strType = QString::fromLatin1("Application");
@ -105,7 +105,7 @@ void KServicePrivate::init( const KDesktopFile *config, KService* q )
&& m_strType != QLatin1String("FSDevice")) {
kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath
<< " has Type=" << m_strType
<< " instead of \"Application\", \"Service\" or \"FSDevice\"" << endl;
<< " instead of \"Application\", \"Service\" or \"FSDevice\"";
m_bValid = false;
return;
}
@ -120,7 +120,7 @@ void KServicePrivate::init( const KDesktopFile *config, KService* q )
if (m_strExec.isEmpty()) {
kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath
<< " has Type=" << m_strType
<< " but no Exec line" << endl;
<< " but no Exec line";
m_bValid = false;
return;
}
@ -142,7 +142,7 @@ void KServicePrivate::init( const KDesktopFile *config, KService* q )
{
kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath
<< " has Type=" << m_strType << " but is located under \"" << resource
<< "\" instead of \"apps\"" << endl;
<< "\" instead of \"apps\"";
m_bValid = false;
return;
}
@ -799,7 +799,7 @@ QString KService::exec() const
if (d->m_strType == QLatin1String("Application") && d->m_strExec.isEmpty())
{
kWarning(servicesDebugArea()) << "The desktop entry file " << entryPath()
<< " has Type=" << d->m_strType << " but has no Exec field." << endl;
<< " has Type=" << d->m_strType << " but has no Exec field.";
}
return d->m_strExec;
}

View file

@ -122,7 +122,7 @@ KService::List KServiceTypeTrader::query( const QString& serviceType,
applyConstraints( lst, constraint );
//kDebug(7014) << "query for serviceType " << serviceType << constraint
// << " : returning " << lst.count() << " offers" << endl;
// << " : returning " << lst.count() << " offers";
return lst;
}

View file

@ -94,8 +94,7 @@ QSpellEnchantDict *Loader::createSpeller(const QString& language,
const QList<QSpellEnchantClient*> lClients = d->languageClients[plang];
if (lClients.isEmpty()) {
kError()<<"No language dictionaries for the language : "
<< plang <<endl;
kError() << "No language dictionaries for the language : " << plang;
return 0;
}

View file

@ -541,7 +541,7 @@ qint32 KSycocaDict::Private::offsetForKey(const QString& key) const
{
if ( !stream || !offset )
{
kError() << "No ksycoca4 database available!" << endl;
kError() << "No ksycoca4 database available!";
return 0;
}

View file

@ -826,7 +826,7 @@ VFolderMenu::loadMenu(const QString &fileName)
if (m_doc.isNull())
{
if (m_docInfo.path.isEmpty())
kError(7021) << fileName << " not found in " << m_allDirectories << endl;
kError(7021) << fileName << " not found in " << m_allDirectories;
else
kWarning(7021) << "Load error (" << m_docInfo.path << ")";
return;

View file

@ -315,7 +315,7 @@ void KSelectAction::actionTriggered(QAction* action)
const QString text = ::DropAmpersands(action->text());
const int index = selectableActionGroup()->actions().indexOf(action);
//kDebug (129) << "KSelectAction::actionTriggered(" << action << ") text=" << text
// << " index=" << index << " emitting triggered()" << endl;
// << " index=" << index << " emitting triggered()";
if (isCheckable()) // if this is subsidiary of other KSelectAction-derived class
trigger(); // then imitate usual QAction behaviour so that other submenus (and their items) become unchecked
@ -658,8 +658,7 @@ bool KSelectAction::eventFilter (QObject *watched, QEvent *event)
QFocusEvent * const e = static_cast <QFocusEvent *> (event);
//kDebug (129) << "KSelectAction::eventFilter(FocusOut)"
// << " comboBox: ptr=" << comboBox
// << " reason=" << e->reason ()
// << endl;
// << " reason=" << e->reason();
if (e->reason () != Qt::ActiveWindowFocusReason/*switch window*/ &&
e->reason () != Qt::PopupFocusReason/*menu*/ &&
@ -690,8 +689,7 @@ bool KSelectAction::eventFilter (QObject *watched, QEvent *event)
// << " ptr=" << e->action ()
// << " icon=" << e->action ()->icon ()
// << " text=" << e->action ()->text ()
// << " currentItem=" << newItem
// << endl;
// << " currentItem=" << newItem;
comboBox->insertItem (index,
e->action()->icon(),
::DropAmpersands (e->action()->text()),
@ -718,8 +716,7 @@ bool KSelectAction::eventFilter (QObject *watched, QEvent *event)
// << " action new: ptr=" << e->action ()
// << " icon=" << e->action ()->icon ()
// << " text=" << e->action ()->text ()
// << " currentItem=" << newItem
// << endl;
// << " currentItem=" << newItem;
comboBox->setItemIcon (index, e->action ()->icon ());
comboBox->setItemText (index, ::DropAmpersands (e->action ()->text ()));
if (QStandardItemModel *model = qobject_cast<QStandardItemModel *>(comboBox->model())) {
@ -741,8 +738,7 @@ bool KSelectAction::eventFilter (QObject *watched, QEvent *event)
// << " comboBox: ptr=" << comboBox
// << " currentItem=" << comboBox->currentIndex ()
// << " delete action index=" << index
// << " new: currentItem=" << newItem
// << endl;
// << " new: currentItem=" << newItem;
comboBox->removeItem (index);
// Removing an item from a combobox can change the current item so

View file

@ -398,8 +398,7 @@ void KColorCells::dragEnterEvent(QDragEnterEvent *event)
{
kDebug() << "KColorCells::dragEnterEvent() acceptDrags="
<< this->dragEnabled()
<< " canDecode=" << KColorMimeData::canDecode(event->mimeData())
<< endl;
<< " canDecode=" << KColorMimeData::canDecode(event->mimeData());
event->setAccepted(this->dragEnabled() && KColorMimeData::canDecode(event->mimeData()));
}
@ -408,8 +407,7 @@ void KColorCells::dragMoveEvent(QDragMoveEvent *event)
{
kDebug() << "KColorCells::dragMoveEvent() acceptDrags="
<< this->dragEnabled()
<< " canDecode=" << KColorMimeData::canDecode(event->mimeData())
<< endl;
<< " canDecode=" << KColorMimeData::canDecode(event->mimeData());
event->setAccepted(this->dragEnabled() && KColorMimeData::canDecode(event->mimeData()));
}

View file

@ -412,7 +412,7 @@ QByteArray KConfigDialogManager::getUserProperty(const QWidget *widget) const
if ( user.isValid() ) {
s_propertyMap->insert( widget->metaObject()->className(), user.name() );
//kDebug(d->debugArea()) << "class name: '" << widget->metaObject()->className()
//<< " 's USER property: " << metaProperty.name() << endl;
//<< " 's USER property: " << metaProperty.name();
}
else {
return QByteArray(); //no USER property

View file

@ -1539,7 +1539,7 @@ void KEditToolBarWidgetPrivate::slotChangeIcon()
m_kdialogProcess->setReadChannel(QProcess::StandardOutput);
m_kdialogProcess->start(kdialogExe, kdialogArgs, QIODevice::ReadOnly | QIODevice::Text);
if ( !m_kdialogProcess->waitForStarted() ) {
kError(240) << "Can't run " << kdialogExe << endl;
kError(240) << "Can't run " << kdialogExe;
delete m_kdialogProcess;
m_kdialogProcess = 0;
return;
@ -1605,7 +1605,7 @@ void KEditToolBarWidgetPrivate::slotProcessExited()
QString icon;
if (!m_kdialogProcess) {
kError(240) << "Something is wrong here! m_kdialogProcess is zero!" << endl;
kError(240) << "Something is wrong here! m_kdialogProcess is zero!";
return;
}

View file

@ -158,21 +158,21 @@ void KSwitchLanguageDialog::removeButtonClicked()
QObject const *signalSender = sender();
if (!signalSender)
{
kError() << "KSwitchLanguageDialog::removeButtonClicked() called directly, not using signal" << endl;
kError() << "KSwitchLanguageDialog::removeButtonClicked() called directly, not using signal";
return;
}
KPushButton *removeButton = const_cast<KPushButton*>(::qobject_cast<const KPushButton*>(signalSender));
if (!removeButton)
{
kError() << "KSwitchLanguageDialog::removeButtonClicked() called from something else than KPushButton" << endl;
kError() << "KSwitchLanguageDialog::removeButtonClicked() called from something else than KPushButton";
return;
}
QMap<KPushButton *, LanguageRowData>::iterator it = d->languageRows.find(removeButton);
if (it == d->languageRows.end())
{
kError() << "KSwitchLanguageDialog::removeButtonClicked called from unknown KPushButton" << endl;
kError() << "KSwitchLanguageDialog::removeButtonClicked called from unknown KPushButton";
return;
}

View file

@ -500,7 +500,7 @@ bool KIconLoaderPrivate::initIconThemes()
def = new KIconTheme(KIconTheme::defaultThemeName(), appname);
if (!def->isValid())
{
kError(264) << "Error: standard icon theme" << KIconTheme::defaultThemeName() << "not found!" << endl;
kError(264) << "Error: standard icon theme" << KIconTheme::defaultThemeName() << "not found!";
delete def;
return false;
}
@ -912,7 +912,7 @@ inline QString KIconLoaderPrivate::unknownIconPath( int size ) const
if (!icon.isValid())
{
kDebug(264) << "Warning: could not find \"Unknown\" icon for size = "
<< size << endl;
<< size;
return QString();
}
return icon.path;

View file

@ -385,9 +385,8 @@ void KApplicationPrivate::init()
// sanity checking, to make sure we've connected
QDBusConnectionInterface *bus = 0;
if (!QDBusConnection::sessionBus().isConnected() || !(bus = QDBusConnection::sessionBus().interface())) {
kFatal(240) << "Session bus not found" << endl <<
"To circumvent this problem try the following command (with Linux and bash)" << endl <<
"export $(dbus-launch)";
kFatal(240) << "Session bus not found, to circumvent this problem try the following command (with Linux and bash)\n"
<< "export $(dbus-launch)";
::exit(125);
}
@ -407,7 +406,7 @@ void KApplicationPrivate::init()
const QString pidSuffix = QString::number( getpid() ).prepend( QLatin1String("-") );
const QString serviceName = reversedDomain + q->applicationName() + pidSuffix;
if ( bus->registerService(serviceName) == QDBusConnectionInterface::ServiceNotRegistered ) {
kError(240) << "Couldn't register name '" << serviceName << "' with DBUS - another process owns it already!" << endl;
kError(240) << "Couldn't register name '" << serviceName << "' with DBUS - another process owns it already!";
::exit(126);
}
}

View file

@ -84,7 +84,7 @@ static QDBusConnectionInterface *tryToInitDBusConnection()
QDBusConnection sessionBus = QDBusConnection::sessionBus();
if (!sessionBus.isConnected() || !(dbusService = sessionBus.interface()))
{
kError() << "KUniqueApplication: Cannot find the D-Bus session server: " << sessionBus.lastError().message() << endl;
kError() << "KUniqueApplication: Cannot find the D-Bus session server: " << sessionBus.lastError().message();
::exit(255);
}
return dbusService;
@ -129,8 +129,7 @@ KUniqueApplication::start(StartFlags flags)
bool registered = dbusService->registerService(appName) == QDBusConnectionInterface::ServiceRegistered;
if (!registered)
{
kError() << "KUniqueApplication: Can't setup D-Bus service. Probably already running."
<< endl;
kError() << "KUniqueApplication: Can't setup D-Bus service. Probably already running.";
::exit(255);
}
@ -144,13 +143,13 @@ KUniqueApplication::start(StartFlags flags)
signed char result;
if (0 > pipe(fd))
{
kError() << "KUniqueApplication: pipe() failed!" << endl;
kError() << "KUniqueApplication: pipe() failed!";
::exit(255);
}
int fork_result = fork();
switch(fork_result) {
case -1:
kError() << "KUniqueApplication: fork() failed!" << endl;
kError() << "KUniqueApplication: fork() failed!";
::exit(255);
break;
case 0:
@ -166,7 +165,7 @@ KUniqueApplication::start(StartFlags flags)
dbusService->registerService(appName);
if (!reply.isValid())
{
kError() << "KUniqueApplication: Can't setup D-Bus service." << endl;
kError() << "KUniqueApplication: Can't setup D-Bus service.";
result = -1;
::write(fd[1], &result, 1);
::exit(255);
@ -217,12 +216,12 @@ KUniqueApplication::start(StartFlags flags)
if (n == 1) break;
if (n == 0)
{
kError() << "KUniqueApplication: Pipe closed unexpectedly." << endl;
kError() << "KUniqueApplication: Pipe closed unexpectedly.";
::exit(255);
}
if (errno != EINTR)
{
kError() << "KUniqueApplication: Error reading from pipe." << endl;
kError() << "KUniqueApplication: Error reading from pipe.";
::exit(255);
}
}
@ -234,7 +233,7 @@ KUniqueApplication::start(StartFlags flags)
QDBusConnectionInterface* dbusService = tryToInitDBusConnection();
if (!dbusService->isServiceRegistered(appName))
{
kError() << "KUniqueApplication: Registering failed!" << endl;
kError() << "KUniqueApplication: Registering failed!";
}
QByteArray saved_args;
@ -260,8 +259,8 @@ KUniqueApplication::start(StartFlags flags)
if (!reply.isValid())
{
QDBusError err = reply.error();
kError() << "Communication problem with " << KCmdLineArgs::aboutData()->appName() << ", it probably crashed." << endl
<< "Error message was: " << err.name() << ": \"" << err.message() << "\"" << endl;
kError() << "Communication problem with " << KCmdLineArgs::aboutData()->appName() << ", it probably crashed.\n"
<< "Error message was: " << err.name() << ": \"" << err.message() << "\"";
::exit(255);
}
::exit(reply);

View file

@ -287,8 +287,7 @@ void Highlighter::setCurrentLanguage(const QString &lang)
d->spellCheckerFound = false;
kDebug()<<"No dictionary for \""
<<lang
<<"\" staying with the current language."
<<endl;
<<"\" staying with the current language.";
return;
}
}

View file

@ -188,9 +188,9 @@ inline void checkDisplay()
{
// Some non-GUI apps might try to use us.
if ( !QX11Info::display() ) {
kError() << "QX11Info::display() returns 0. I'm probably going to crash now." << endl;
kError() << "QX11Info::display() returns 0. I'm probably going to crash now.";
kError() << "If this is a KApplication initialized without GUI stuff, change it to be "
"initialized with GUI stuff." << endl;
"initialized with GUI stuff.";
}
}
#else // NDEBUG

View file

@ -216,7 +216,7 @@ QValidator::State KDoubleValidator::validate( QString & input, int & p ) const {
( !d.isEmpty() && d.indexOf('-') != -1 ) ) {
// make sure we don't replace something twice:
kWarning() << "KDoubleValidator: decimal symbol contains '-' or "
"negative sign contains '.' -> improve algorithm" << endl;
"negative sign contains '.' -> improve algorithm";
return Invalid;
}

View file

@ -808,7 +808,7 @@ QSize KDateTable::sizeHint() const
return QSize( qRound( d->m_maxCell.width() * d->m_numDayColumns ),
( qRound( d->m_maxCell.height() + 2 ) * d->m_numWeekRows ) );
} else {
kDebug() << "KDateTable::sizeHint: obscure failure - " << endl;
kDebug() << "KDateTable::sizeHint: obscure failure - ";
return QSize( -1, -1 );
}
}

View file

@ -702,12 +702,12 @@ void BuildHelper::processMergeElement( const QString &tag, const QString &name,
{
if ( tag == tagDefineGroup )
{
kError(240) << "cannot define group without name!" << endl;
kError(240) << "cannot define group without name!";
return;
}
if ( tag == tagActionList )
{
kError(240) << "cannot define actionlist without name!" << endl;
kError(240) << "cannot define actionlist without name!";
return;
}
mergingName = defaultMergingName;

View file

@ -1960,7 +1960,7 @@ KFileWidget::OperationMode KFileWidget::operationMode() const
void KFileWidgetPrivate::_k_slotAutoSelectExtClicked()
{
// kDebug (kfile_area) << "slotAutoSelectExtClicked(): "
// << autoSelectExtCheckBox->isChecked() << endl;
// << autoSelectExtCheckBox->isChecked();
// whether the _user_ wants it on/off
autoSelectExtChecked = autoSelectExtCheckBox->isChecked();

View file

@ -19,6 +19,7 @@
#include "jpg.h"
#include <QImage>
#include <QVariant>
#include <kdebug.h>
#include <turbojpeg.h>

View file

@ -88,7 +88,7 @@ IdleSlave::gotInput()
if (mConn.read( &cmd, data) == -1)
{
// Communication problem with slave.
// kError(7016) << "No communication with slave." << endl;
// kError(7016) << "No communication with slave.";
deleteLater();
}
else if (cmd == MSG_SLAVE_ACK)
@ -97,7 +97,7 @@ IdleSlave::gotInput()
}
else if (cmd != MSG_SLAVE_STATUS)
{
kError(7016) << "Unexpected data from slave." << endl;
kError(7016) << "Unexpected data from slave.";
deleteLater();
}
else
@ -369,7 +369,7 @@ void KLauncher::processRequestReturn(int status, const QByteArray &requestData)
if (lastRequest && (status == LAUNCHER_ERROR))
{
lastRequest->status = KLaunchRequest::Error;
kDebug(7016) << lastRequest->name << " failed." << endl;
kDebug(7016) << lastRequest->name << " failed.";
if (!requestData.isEmpty())
lastRequest->errorMsg = QString::fromUtf8((char *) requestData.data());
lastRequest = 0;
@ -1070,7 +1070,7 @@ KLauncher::requestSlave(const QString &protocol,
arg_list.append(app_socket);
kDebug(7016) << "KLauncher: launching new slave " << name << " with protocol=" << protocol
<< " args=" << arg_list << endl;
<< " args=" << arg_list;
#ifdef Q_OS_UNIX
if (mSlaveDebug == protocol)

View file

@ -26,6 +26,7 @@
#include "kfiledialog.h"
#include <QtCore/QTextStream>
#include <QtGui/QCheckBox>
#include <QtGui/qevent.h>
#include <QtGui/QFileDialog>

View file

@ -344,7 +344,7 @@ void SlaveBase::connectSlave(const QString &address)
if (!d->appConnection.inited())
{
kDebug(7019) << "failed to connect to" << address << endl
kDebug(7019) << "failed to connect to" << address << '\n'
<< "Reason:" << d->appConnection.errorString();
exit();
return;

View file

@ -669,9 +669,9 @@ public:
* if ( openPasswordDialog( authInfo ) )
* {
* kDebug() << QLatin1String("User: ")
* << authInfo.username << endl;
* << authInfo.username;
* kDebug() << QLatin1String("Password: ")
* << QLatin1String("Not displayed here!") << endl;
* << QLatin1String("Not displayed here!");
* }
* \endcode
*
@ -686,9 +686,9 @@ public:
* if ( openPasswordDialog( authInfo, errorMsg ) )
* {
* kDebug() << QLatin1String("User: ")
* << authInfo.username << endl;
* << authInfo.username;
* kDebug() << QLatin1String("Password: ")
* << QLatin1String("Not displayed here!") << endl;
* << QLatin1String("Not displayed here!");
* }
* \endcode
*

View file

@ -63,7 +63,7 @@ int main(int argc, char **argv)
else if ( url.protocol() == "rlogin" )
cmd << "rlogin";
else {
kError() << "Invalid protocol " << url.protocol() << endl;
kError() << "Invalid protocol " << url.protocol();
return 2;
}
@ -81,7 +81,7 @@ int main(int argc, char **argv)
if (host.isEmpty() || host.startsWith('-'))
{
kError() << "Invalid hostname " << host << endl;
kError() << "Invalid hostname " << host;
return 2;
}

View file

@ -703,7 +703,7 @@ void ReadWritePart::setModified( bool modified )
kDebug(1000) << "setModified(" << (modified ? "true" : "false") << ")";
if ( !d->m_bReadWrite && modified )
{
kError(1000) << "Can't set a read-only document to 'modified' !" << endl;
kError(1000) << "Can't set a read-only document to 'modified' !";
return;
}
d->m_bModified = modified;
@ -798,7 +798,7 @@ bool ReadWritePart::saveAs( const KUrl & kurl )
if (!kurl.isValid())
{
kError(1000) << "saveAs: Malformed URL " << kurl.url() << endl;
kError(1000) << "saveAs: Malformed URL " << kurl.url();
return false;
}
d->m_duringSaveAs = true;

View file

@ -361,12 +361,12 @@ void PartManager::addPart( Part *part, bool setActive )
if ( w->focusPolicy() == Qt::NoFocus ) {
kWarning(1000) << "Part '" << part->objectName() << "' has a widget "
<< w->objectName() << " with a focus policy of NoFocus. It should have at least a"
<< "ClickFocus policy, for part activation to work well." << endl;
<< "ClickFocus policy, for part activation to work well.";
}
if ( part->widget() && part->widget()->focusPolicy() == Qt::TabFocus ) {
kWarning(1000) << "Part '" << part->objectName() << "' has a widget "
<< w->objectName() << " with a focus policy of TabFocus. It should have at least a"
<< "ClickFocus policy, for part activation to work well." << endl;
<< "ClickFocus policy, for part activation to work well.";
}
w->setFocus();
w->show();
@ -435,7 +435,7 @@ void PartManager::setActivePart( Part *part, QWidget *widget )
#ifdef DEBUG_PARTMANAGER
kDebug(1000) << "PartManager::setActivePart d->m_activePart=" << d->m_activePart << "<->part=" << part
<< " d->m_activeWidget=" << d->m_activeWidget << "<->widget=" << widget << endl;
<< " d->m_activeWidget=" << d->m_activeWidget << "<->widget=" << widget;
#endif
// don't activate twice

View file

@ -106,7 +106,7 @@ void KCModuleContainer::addModule( const QString& module )
if ( !service )
{
kDebug(713) << "KCModuleContainer: module '" <<
module << "' was not found and thus not loaded" << endl;
module << "' was not found and thus not loaded";
return;
}

View file

@ -22,6 +22,7 @@
#include "khttp_export.h"
#include <QObject>
#include <QMap>
#include <QHostAddress>
typedef QMap<QByteArray,QByteArray> KHTTPHeaders;

View file

@ -139,7 +139,7 @@ void ComponentsDialog::executed( QTreeWidgetItem * item, int )
bool checked = ( item->checkState(0) == Qt::Checked );
kDebug( 704 ) << "it's a " << ( checked ? "checked" : "unchecked" )
<< " QCheckListItem" << endl;
<< " QCheckListItem";
KPluginInfo * info = d->plugininfomap[ item ];
info->setPluginEnabled( checked );

View file

@ -161,7 +161,7 @@ QSet<KCModuleInfo> DialogPrivate::instanceServices()
}
else
kWarning( 700 ) << "KServiceGroup::childGroup returned"
" something else than a KService" << endl;
" something else than a KService";
}
}
@ -370,8 +370,7 @@ void DialogPrivate::createDialogFromServices()
if (plugin != pinfo) {
kError(700) << "A group contains more than one plugin: '"
<< plugin.pluginName() << "' and '" << pinfo.pluginName()
<< "'. Now it won't be possible to enable/disable the plugin."
<< endl;
<< "'. Now it won't be possible to enable/disable the plugin.";
parent->setCheckable(false);
q->disconnect(parent, SIGNAL(toggled(bool)), q, SLOT(_k_updateEnabledState(bool)));
}

View file

@ -61,7 +61,7 @@ KSharedConfig::Ptr configForComponentName(const QString &componentName)
}
}
kError(701) << "configForComponentName('" << componentName.constData()
<< "') could not find the KComponentData object" << endl;
<< "') could not find the KComponentData object";
Q_ASSERT(!d->m_componentInfo.isEmpty());
return d->m_componentInfo.constBegin()->componentData.config();
}

View file

@ -212,20 +212,20 @@ void FakeManager::parseMachineFile()
QFile machineFile(d->xmlFile);
if (!machineFile.open(QIODevice::ReadOnly))
{
qWarning() << Q_FUNC_INFO << "Error while opening " << d->xmlFile << endl;
qWarning() << Q_FUNC_INFO << "Error while opening " << d->xmlFile;
return;
}
QDomDocument fakeDocument;
if (!fakeDocument.setContent(&machineFile))
{
qWarning() << Q_FUNC_INFO << "Error while creating the QDomDocument." << endl;
qWarning() << Q_FUNC_INFO << "Error while creating the QDomDocument.";
machineFile.close();
return;
}
machineFile.close();
qDebug() << Q_FUNC_INFO << "Parsing fake computer XML: " << d->xmlFile << endl;
qDebug() << Q_FUNC_INFO << "Parsing fake computer XML: " << d->xmlFile;
QDomElement mainElement = fakeDocument.documentElement();
QDomNode node = mainElement.firstChild();
while (!node.isNull())