Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-25 03:12:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/fluxer/kdelibs into devinfo

Browse source
This commit is contained in:
Ivailo Monev 2021-08-08 22:36:24 +03:00
commit c5c09f07de
6 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kdecore/io/kdebug.cpp
View file

@ -702,11 +702,6 @@ QDebug kDebugStream(QtMsgType level, int area, const char *file, int line, const
return kDebug_data->stream(level, area, file, line, funcinfo);
}
QDebug perror(QDebug s, KDebugTag)
{
return s << QString::fromLocal8Bit(strerror(errno));
}
QDebug operator<<(QDebug s, const KDateTime &time)
{
if ( time.isDateOnly() )

14
kdecore/io/kdebug.h
View file

@ -174,20 +174,6 @@ static inline QDebug kFatal(int area = KDE_DEFAULT_DEBUG_AREA)
static inline QDebug kFatal(bool cond, int area = KDE_DEFAULT_DEBUG_AREA)
{ return cond ? kFatal(area) : kDebugDevNull(); }
struct KDebugTag { }; ///! @internal just a tag class
typedef QDebug (*KDebugStreamFunction)(QDebug, KDebugTag); ///< @internal
inline QDebug operator<<(QDebug s, KDebugStreamFunction f)
{ return (*f)(s, KDebugTag()); }
/**
* \relates KGlobal
* Print a message describing the last system error.
* @param s the debug stream to write to
* @return the debug stream (@p s)
* @see perror(3)
*/
KDECORE_EXPORT QDebug perror(QDebug, KDebugTag);
// operators for KDE types
class KUrl;
class KDateTime;

5
kdecore/kernel/kstandarddirs.cpp
View file

@ -40,6 +40,7 @@
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include <errno.h>
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@ -595,7 +596,7 @@ static void lookupDirectory(const QString& path, const QString &relPart,
{
KDE_struct_stat buff;
if ( KDE::stat( pathfn, &buff ) != 0 ) {
kDebug(180) << "Error stat'ing " << pathfn << " : " << perror;
kDebug(180) << "Error stat'ing " << pathfn << " : " << ::strerror(errno);
continue; // Couldn't stat (e.g. no read permissions)
}
isReg = S_ISREG (buff.st_mode);
@ -701,7 +702,7 @@ static void lookupPrefix(const QString& prefix, const QString& relpath,
QString pathfn = path + fn;
KDE_struct_stat buff;
if ( KDE::stat( fn, &buff ) != 0 ) {
kDebug(180) << "Error stat'ing " << fn << " : " << perror;
kDebug(180) << "Error stat'ing " << fn << " : " << ::strerror(errno);
continue; // Couldn't stat (e.g. no read permissions)
}
isDir = S_ISDIR (buff.st_mode);

2
kdecore/tests/kdebugtest.cpp
View file

@ -217,7 +217,7 @@ void testKDebug()
ch = '\r';
kDebug() << "QChar \\r: " << ch;
kDebug() << "error on this line";
kDebug(2 == 2) << "this is right " << perror;
kDebug(2 == 2) << "this is right";
kDebug() << "Before instance creation";
kDebug(1202) << "Before instance creation";
KComponentData i("kdebugtest");

8
kimgio/webp.cpp
View file

@ -160,7 +160,13 @@ QVariant WebPHandler::option(ImageOption option) const
void WebPHandler::setOption(ImageOption option, const QVariant &value)
{
if (option == Quality) {
quality = qBound(0, value.toInt(), 100);
const int newquality = value.toInt();
// -1 means default
if (newquality == -1) {
quality = 75;
} else {
quality = qBound(0, newquality, 100);
}
}
}

3
kioslave/file/file_unix.cpp
View file

@ -39,6 +39,7 @@
#include <kmountpoint.h>
#include <dirent.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <grp.h>
@ -547,7 +548,7 @@ void FileProtocol::del(const KUrl& url, bool isfile)
if ((errno == EACCES) || (errno == EPERM)) {
error(KIO::ERR_ACCESS_DENIED, path);
} else {
kDebug( 7101 ) << "could not rmdir " << perror;
kDebug( 7101 ) << "could not rmdir " << ::strerror(errno);
error(KIO::ERR_COULD_NOT_RMDIR, path);
return;
}