Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-12-21 15:52:53 +00:00
parent 6ebc1cc143
commit 8006199dbe
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
kdecore/io/kdebug.cpp
View file

@ -28,10 +28,6 @@
#endif
#include "kdebug.h"
#include <QThreadStorage>
#include <unistd.h>
#include <stdio.h>
#ifdef NDEBUG
#undef kDebug
@ -40,28 +36,24 @@
#include <config.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_TIME_H
#include <time.h>
#endif
#include "kglobal.h"
#include "kstandarddirs.h"
#include "kdatetime.h"
#include "kcmdlineargs.h"
#include <kmessage.h>
#include <klocale.h>
#include <kconfiggroup.h>
#include <kurl.h>
#include <kconfig.h>
#include "kcomponentdata.h"
#include <QtCore/QFile>
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QChar>
#include <QtCore/QCoreApplication>
#include <QtCore/QThreadStorage>
#include <QtCore/QMutex>
#include <stdlib.h> // abort
#include <unistd.h> // getpid
@ -70,8 +62,14 @@
#include <syslog.h>
#include <errno.h>
#include <string.h>
#include <kconfig.h>
#include "kcomponentdata.h"
#include <stdio.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_TIME_H
#include <time.h>
#endif
#ifdef Q_OS_SOLARIS
// For the purposes of KDebug Solaris has a GNU-libc-compatible
@ -90,8 +88,6 @@
#endif
#endif
#include <QMutex>
class KNoDebugStream: public QIODevice
{
@ -151,7 +147,7 @@ public:
{
if (len) {
// Since we are in kdecore here, we cannot use KMsgBox
QString msg = QString::fromLatin1(data, len);
const QString msg = QString::fromLatin1(data, len);
KMessage::message(KMessage::Information, msg, m_caption);
}
return len;
@ -167,7 +163,7 @@ class KLineEndStrippingDebugStream: public KNoDebugStream
public:
qint64 writeData(const char *data, qint64 len)
{
QByteArray buf = QByteArray::fromRawData(data, len);
const QByteArray buf = QByteArray::fromRawData(data, len);
qt_message_output(QtDebugMsg, buf.trimmed().constData());
return len;
}