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 ssh://github.com/fluxer/kdelibs into devinfo

Browse source
This commit is contained in:
Ivailo Monev 2021-09-06 18:01:23 +03:00
commit 741bed5a68
10 changed files with 56 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kdecore/config/kconfig.cpp
View file

@ -50,8 +50,6 @@
#include <QtCore/QSet> #include <QtCore/QSet>
#include <QtCore/QStack> #include <QtCore/QStack>
bool KConfigPrivate::mappingsRegistered=false;
KConfigPrivate::KConfigPrivate(const KComponentData &componentData_, KConfig::OpenFlags flags, KConfigPrivate::KConfigPrivate(const KComponentData &componentData_, KConfig::OpenFlags flags,
const char* resource) const char* resource)
: openFlags(flags), resourceType(resource), mBackend(0), : openFlags(flags), resourceType(resource), mBackend(0),

2
kdecore/config/kconfig_p.h
View file

@ -84,8 +84,6 @@ private:
bool bSuppressGlobal:1; bool bSuppressGlobal:1;
QString sGlobalFileName; QString sGlobalFileName;
static bool mappingsRegistered;
KEntryMap entryMap; KEntryMap entryMap;
QString backendType; QString backendType;

13
kdecore/services/ktraderparse.cpp
View file

@ -45,15 +45,24 @@ struct ParsingData
using namespace KTraderParse; using namespace KTraderParse;
thread_local ParsingData* s_parsingData = 0; thread_local ParsingData* s_parsingData = nullptr;
static int KTraderParseDeinit() {
delete s_parsingData;
return 0;
}
Q_DESTRUCTOR_FUNCTION(KTraderParseDeinit);
ParseTreeBase::Ptr KTraderParse::parseConstraints( const QString& _constr ) ParseTreeBase::Ptr KTraderParse::parseConstraints( const QString& _constr )
{ {
if (s_parsingData) {
s_parsingData->ptr.clear();
delete s_parsingData;
}
s_parsingData = new ParsingData(); s_parsingData = new ParsingData();
s_parsingData->buffer = _constr.toUtf8(); s_parsingData->buffer = _constr.toUtf8();
KTraderParse_mainParse(s_parsingData->buffer.constData()); KTraderParse_mainParse(s_parsingData->buffer.constData());
ParseTreeBase::Ptr ret = s_parsingData->ptr; ParseTreeBase::Ptr ret = s_parsingData->ptr;
s_parsingData = 0;
return ret; return ret;
} }

1
kdecore/tests/kfiltertest.cpp
View file

@ -385,6 +385,7 @@ void KFilterTest::test_pushData() // ### UNFINISHED
QCOMPARE(inBuffer.data().size(), compressed.size()); QCOMPARE(inBuffer.data().size(), compressed.size());
read += flt->readAll(); read += flt->readAll();
qDebug() << QString::fromLatin1(read); qDebug() << QString::fromLatin1(read);
delete flt;
// ### indeed, doesn't work currently. So we use HTTPFilter instead, for now. // ### indeed, doesn't work currently. So we use HTTPFilter instead, for now.
} }

1
kdecore/tests/klocaletest.cpp
View file

@ -1051,6 +1051,7 @@ void KLocaleTest::testDayPeriods()
QCOMPARE( locale.d->dayPeriodForTime( QTime( 1, 0, 0 ) ).periodName( KLocale::ShortName ), QString( "T1" ) ); QCOMPARE( locale.d->dayPeriodForTime( QTime( 1, 0, 0 ) ).periodName( KLocale::ShortName ), QString( "T1" ) );
QCOMPARE( locale.d->dayPeriodForTime( QTime( 11, 0, 0 ) ).periodName( KLocale::ShortName ), QString( "T2" ) ); QCOMPARE( locale.d->dayPeriodForTime( QTime( 11, 0, 0 ) ).periodName( KLocale::ShortName ), QString( "T2" ) );
QCOMPARE( locale.d->dayPeriodForTime( QTime( 21, 0, 0 ) ).periodName( KLocale::ShortName ), QString( "T3" ) ); QCOMPARE( locale.d->dayPeriodForTime( QTime( 21, 0, 0 ) ).periodName( KLocale::ShortName ), QString( "T3" ) );
delete testConfig;
} }
void KLocaleTest::testCalendarSystemType() void KLocaleTest::testCalendarSystemType()

18
kdecore/tests/klockfiletest.cpp
View file

@ -70,6 +70,13 @@ Test_KLockFile::initTestCase()
lockFile = new KLockFile(QLatin1String(lockName)); lockFile = new KLockFile(QLatin1String(lockName));
} }
void
Test_KLockFile::cleanupTestCase()
{
delete lockFile;
lockFile = nullptr;
}
static KLockFile::LockResult testLockFromProcess(const QString& lockName) static KLockFile::LockResult testLockFromProcess(const QString& lockName)
{ {
const int ret = QProcess::execute(KDEBINDIR "/kdecore-klockfile_testlock", QStringList() << lockName); const int ret = QProcess::execute(KDEBINDIR "/kdecore-klockfile_testlock", QStringList() << lockName);
@ -136,14 +143,15 @@ Test_KLockFile::testStaleNoBlockFlag()
stream.flush(); stream.flush();
f.close(); f.close();
lockFile = new KLockFile(QLatin1String(lockName)); KLockFile* lockFile2 = new KLockFile(QLatin1String(lockName));
QVERIFY(!lockFile->isLocked()); QVERIFY(!lockFile2->isLocked());
QCOMPARE(lockFile->lock(KLockFile::NoBlockFlag), KLockFile::LockStale); QCOMPARE(lockFile2->lock(KLockFile::NoBlockFlag), KLockFile::LockStale);
QByteArray expectedMsg = QByteArray("WARNING: deleting stale lockfile ") + lockName; QByteArray expectedMsg = QByteArray("WARNING: deleting stale lockfile ") + lockName;
QTest::ignoreMessage(QtWarningMsg, expectedMsg); QTest::ignoreMessage(QtWarningMsg, expectedMsg);
QCOMPARE(lockFile->lock(KLockFile::NoBlockFlag|KLockFile::ForceFlag), KLockFile::LockOK); QCOMPARE(lockFile2->lock(KLockFile::NoBlockFlag|KLockFile::ForceFlag), KLockFile::LockOK);
QVERIFY(lockFile->isLocked()); QVERIFY(lockFile2->isLocked());
delete lockFile2;
} }

15
kdecore/tests/klockfiletest.h
View file

@ -24,15 +24,16 @@
class Test_KLockFile : public QObject class Test_KLockFile : public QObject
{ {
Q_OBJECT Q_OBJECT
KLockFile *lockFile; KLockFile *lockFile;
private Q_SLOTS: private Q_SLOTS:
void initTestCase(); void initTestCase();
void testLock(); void cleanupTestCase();
void testStale(); void testLock();
void testUnlock(); void testStale();
void testStaleNoBlockFlag(); void testUnlock();
void testStaleNoBlockFlag();
}; };
#endif #endif

2
kdecore/tests/kurlmimetest.cpp
View file

@ -134,5 +134,5 @@ void KUrlMimeTest::testMostLocalUrlList()
QCOMPARE(qurls.count(), localUrls.count()); QCOMPARE(qurls.count(), localUrls.count());
for (int i = 0; i < qurls.count(); ++i ) for (int i = 0; i < qurls.count(); ++i )
QCOMPARE(qurls[i], static_cast<QUrl>(localUrls[i])); QCOMPARE(qurls[i], static_cast<QUrl>(localUrls[i]));
delete mimeData;
} }

2
kutils/kexiv2/kexiv2.cpp
View file

@ -55,7 +55,7 @@ static int KExiv2Init()
} }
Q_CONSTRUCTOR_FUNCTION(KExiv2Init); Q_CONSTRUCTOR_FUNCTION(KExiv2Init);
int KExiv2Deinit() static int KExiv2Deinit()
{ {
Exiv2::XmpParser::terminate(); Exiv2::XmpParser::terminate();
return 0; return 0;

40
plasma/tests/storagetest.cpp
View file

@ -41,11 +41,11 @@ void StorageTest::store()
StorageJob *storageJob = qobject_cast<StorageJob *>(job); StorageJob *storageJob = qobject_cast<StorageJob *>(job);
QVERIFY(storageJob); QVERIFY(storageJob);
if (storageJob) { storageJob->setAutoDelete(false);
storageJob->setData(m_data); storageJob->setData(m_data);
QVERIFY(storageJob->exec()); QVERIFY(storageJob->exec());
QVERIFY(storageJob->result().toBool()); QVERIFY(storageJob->result().toBool());
} storageJob->deleteLater();
} }
void StorageTest::retrieve() void StorageTest::retrieve()
@ -57,11 +57,11 @@ void StorageTest::retrieve()
StorageJob *storageJob = qobject_cast<StorageJob *>(job); StorageJob *storageJob = qobject_cast<StorageJob *>(job);
QVERIFY(storageJob); QVERIFY(storageJob);
if (storageJob) { storageJob->setAutoDelete(false);
QVERIFY(storageJob->exec()); QVERIFY(storageJob->exec());
QVERIFY(storageJob->result().type() != QVariant::Bool); QVERIFY(storageJob->result().type() != QVariant::Bool);
QCOMPARE(storageJob->data(), m_data); QCOMPARE(storageJob->data(), m_data);
} storageJob->deleteLater();
} }
void StorageTest::deleteEntry() void StorageTest::deleteEntry()
@ -73,11 +73,11 @@ void StorageTest::deleteEntry()
StorageJob *storageJob = qobject_cast<StorageJob *>(job); StorageJob *storageJob = qobject_cast<StorageJob *>(job);
QVERIFY(storageJob); QVERIFY(storageJob);
if (storageJob) { storageJob->setAutoDelete(false);
storageJob->setData(m_data); storageJob->setData(m_data);
QVERIFY(storageJob->exec()); QVERIFY(storageJob->exec());
QVERIFY(storageJob->result().toBool()); QVERIFY(storageJob->result().toBool());
} storageJob->deleteLater();
op = storage.operationDescription("retrieve"); op = storage.operationDescription("retrieve");
op.writeEntry("group", "Test"); op.writeEntry("group", "Test");
@ -85,11 +85,11 @@ void StorageTest::deleteEntry()
storageJob = qobject_cast<StorageJob *>(job); storageJob = qobject_cast<StorageJob *>(job);
QVERIFY(storageJob); QVERIFY(storageJob);
if (storageJob) { storageJob->setAutoDelete(false);
QVERIFY(storageJob->exec()); QVERIFY(storageJob->exec());
QVERIFY(storageJob->result().type() != QVariant::Bool); QVERIFY(storageJob->result().type() != QVariant::Bool);
QVERIFY(storageJob->data().isEmpty()); QVERIFY(storageJob->data().isEmpty());
} storageJob->deleteLater();
} }
QTEST_KDEMAIN(StorageTest, NoGUI) QTEST_KDEMAIN(StorageTest, NoGUI)