aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2018-08-01 23:01:54 +0300
committerJarkko Koivikko <jarkko.koivikko@code-q.fi>2018-08-06 08:20:52 +0000
commite7e8267fd52f1c04fd6342307cb944bb92006542 (patch)
tree6a1cf312f87f099ab2cea195830c61546cde01eb
parentdadbe3cd2eccbd15ee9d611c9cd8a132227c39a1 (diff)
Fix zero as null pointer constant
Change-Id: If41bd31f1fcec5647197ca6834909f4011fe87fa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/plugins/hangul/hangulinputmethod_p.h2
-rw-r--r--src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h2
-rw-r--r--src/plugins/hunspell/hunspellinputmethod/hunspellworker.cpp16
-rw-r--r--src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h6
-rw-r--r--src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h2
-rw-r--r--src/plugins/lipi-toolkit/plugin/lipisharedrecognizer.cpp28
-rw-r--r--src/plugins/lipi-toolkit/plugin/lipiworker_p.h6
-rw-r--r--src/plugins/openwnn/plugin/openwnninputmethod.cpp20
-rw-r--r--src/plugins/openwnn/plugin/openwnninputmethod_p.h2
-rw-r--r--src/plugins/pinyin/plugin/pinyindecoderservice.cpp6
-rw-r--r--src/plugins/pinyin/plugin/pinyindecoderservice_p.h2
-rw-r--r--src/plugins/pinyin/plugin/pinyininputmethod_p.h2
-rw-r--r--src/plugins/t9write/plugin/t9writedictionary.cpp12
-rw-r--r--src/plugins/t9write/plugin/t9writeinputmethod.cpp22
-rw-r--r--src/plugins/t9write/plugin/t9writeinputmethod_p.h2
-rw-r--r--src/plugins/t9write/plugin/t9writeworker.cpp6
-rw-r--r--src/plugins/t9write/plugin/t9writeworker_p.h4
-rw-r--r--src/plugins/tcime/plugin/tcinputmethod.cpp4
-rw-r--r--src/plugins/tcime/plugin/tcinputmethod_p.h2
-rw-r--r--src/styles/styles_plugin.h2
-rw-r--r--src/virtualkeyboard/abstractinputmethod.cpp6
-rw-r--r--src/virtualkeyboard/abstractinputmethod.h2
-rw-r--r--src/virtualkeyboard/abstractinputpanel_p.h4
-rw-r--r--src/virtualkeyboard/appinputpanel_p.h4
-rw-r--r--src/virtualkeyboard/desktopinputpanel_p.h2
-rw-r--r--src/virtualkeyboard/fallbackinputmethod_p.h2
-rw-r--r--src/virtualkeyboard/gesturerecognizer_p.h2
-rw-r--r--src/virtualkeyboard/handwritinggesturerecognizer_p.h2
-rw-r--r--src/virtualkeyboard/inputcontext.cpp10
-rw-r--r--src/virtualkeyboard/inputcontext.h2
-rw-r--r--src/virtualkeyboard/inputengine.cpp16
-rw-r--r--src/virtualkeyboard/inputengine.h2
-rw-r--r--src/virtualkeyboard/inputmethod_p.h2
-rw-r--r--src/virtualkeyboard/inputview_p.h2
-rw-r--r--src/virtualkeyboard/plaininputmethod_p.h2
-rw-r--r--src/virtualkeyboard/platforminputcontext.cpp20
-rw-r--r--src/virtualkeyboard/selectionlistmodel.cpp4
-rw-r--r--src/virtualkeyboard/selectionlistmodel.h2
-rw-r--r--src/virtualkeyboard/settings_p.h2
-rw-r--r--src/virtualkeyboard/shadowinputcontext.cpp2
-rw-r--r--src/virtualkeyboard/shadowinputcontext_p.h2
-rw-r--r--src/virtualkeyboard/shifthandler.cpp2
-rw-r--r--src/virtualkeyboard/shifthandler_p.h2
-rw-r--r--src/virtualkeyboard/trace.h2
-rw-r--r--src/virtualkeyboard/unipentrace_p.h2
-rw-r--r--src/virtualkeyboard/virtualkeyboardsettings_p.h2
46 files changed, 125 insertions, 125 deletions
diff --git a/src/plugins/hangul/hangulinputmethod_p.h b/src/plugins/hangul/hangulinputmethod_p.h
index ba0458eb..cdbd0841 100644
--- a/src/plugins/hangul/hangulinputmethod_p.h
+++ b/src/plugins/hangul/hangulinputmethod_p.h
@@ -53,7 +53,7 @@ class HangulInputMethod : public AbstractInputMethod
Q_OBJECT
Q_DECLARE_PRIVATE(HangulInputMethod)
public:
- explicit HangulInputMethod(QObject *parent = 0);
+ explicit HangulInputMethod(QObject *parent = nullptr);
~HangulInputMethod();
QList<InputEngine::InputMode> inputModes(const QString &locale);
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
index 26cf8452..68a4e702 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h
@@ -55,7 +55,7 @@ class HunspellInputMethod : public AbstractInputMethod
protected:
HunspellInputMethod(HunspellInputMethodPrivate *d_ptr, QObject *parent);
public:
- explicit HunspellInputMethod(QObject *parent = 0);
+ explicit HunspellInputMethod(QObject *parent = nullptr);
~HunspellInputMethod();
QList<InputEngine::InputMode> inputModes(const QString &locale);
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellworker.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellworker.cpp
index 292d3ae1..46cbf49c 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellworker.cpp
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellworker.cpp
@@ -57,7 +57,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcHunspell)
HunspellLoadDictionaryTask::HunspellLoadDictionaryTask(const QString &locale, const QStringList &searchPaths) :
HunspellTask(),
- hunspellPtr(0),
+ hunspellPtr(nullptr),
locale(locale),
searchPaths(searchPaths)
{
@@ -65,7 +65,7 @@ HunspellLoadDictionaryTask::HunspellLoadDictionaryTask(const QString &locale, co
void HunspellLoadDictionaryTask::run()
{
- Q_ASSERT(hunspellPtr != 0);
+ Q_ASSERT(hunspellPtr != nullptr);
qCDebug(lcHunspell) << "HunspellLoadDictionaryTask::run(): locale:" << locale;
@@ -74,7 +74,7 @@ void HunspellLoadDictionaryTask::run()
if (*hunspellPtr) {
Hunspell_destroy(*hunspellPtr);
- *hunspellPtr = 0;
+ *hunspellPtr = nullptr;
}
QString affPath;
@@ -99,7 +99,7 @@ void HunspellLoadDictionaryTask::run()
if (!QTextCodec::codecForName(Hunspell_get_dic_encoding(*hunspellPtr))) {
qCWarning(lcHunspell) << "The Hunspell dictionary" << dicPath << "cannot be used because it uses an unknown text codec" << QString(Hunspell_get_dic_encoding(*hunspellPtr));
Hunspell_destroy(*hunspellPtr);
- *hunspellPtr = 0;
+ *hunspellPtr = nullptr;
}
}
@@ -108,7 +108,7 @@ void HunspellLoadDictionaryTask::run()
qCWarning(lcHunspell) << "Hunspell dictionary is missing for" << locale << ". Search paths" << searchPaths;
}
- emit completed(*hunspellPtr != 0);
+ emit completed(*hunspellPtr != nullptr);
}
/*!
@@ -132,7 +132,7 @@ void HunspellBuildSuggestionsTask::run()
if (!textCodec)
return;
- char **slst = 0;
+ char **slst = nullptr;
int n = Hunspell_suggest(hunspell, &slst, textCodec->fromUnicode(word).constData());
if (n > 0) {
/* Collect word candidates from the Hunspell suggestions.
@@ -255,7 +255,7 @@ HunspellWorker::HunspellWorker(QObject *parent) :
QThread(parent),
taskSema(),
taskLock(),
- hunspell(0)
+ hunspell(nullptr)
{
abort = false;
}
@@ -309,7 +309,7 @@ void HunspellWorker::run()
}
if (hunspell) {
Hunspell_destroy(hunspell);
- hunspell = 0;
+ hunspell = nullptr;
}
}
diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h
index 7c3be1f6..1fe61bba 100644
--- a/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h
+++ b/src/plugins/hunspell/hunspellinputmethod/hunspellworker_p.h
@@ -57,9 +57,9 @@ class HunspellTask : public QObject
{
Q_OBJECT
public:
- explicit HunspellTask(QObject *parent = 0) :
+ explicit HunspellTask(QObject *parent = nullptr) :
QObject(parent),
- hunspell(0)
+ hunspell(nullptr)
{}
virtual void run() = 0;
@@ -127,7 +127,7 @@ class HunspellWorker : public QThread
{
Q_OBJECT
public:
- explicit HunspellWorker(QObject *parent = 0);
+ explicit HunspellWorker(QObject *parent = nullptr);
~HunspellWorker();
void addTask(QSharedPointer<HunspellTask> task);
diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h b/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
index 060b0f3d..177ff8ab 100644
--- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
+++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
@@ -59,7 +59,7 @@ class LipiInputMethod : public LipiInputMethodBase
Q_OBJECT
Q_DECLARE_PRIVATE(LipiInputMethod)
public:
- explicit LipiInputMethod(QObject *parent = 0);
+ explicit LipiInputMethod(QObject *parent = nullptr);
~LipiInputMethod();
QList<InputEngine::InputMode> inputModes(const QString &locale);
diff --git a/src/plugins/lipi-toolkit/plugin/lipisharedrecognizer.cpp b/src/plugins/lipi-toolkit/plugin/lipisharedrecognizer.cpp
index a204e051..8a45dcb6 100644
--- a/src/plugins/lipi-toolkit/plugin/lipisharedrecognizer.cpp
+++ b/src/plugins/lipi-toolkit/plugin/lipisharedrecognizer.cpp
@@ -54,12 +54,12 @@ Q_DECLARE_LOGGING_CATEGORY(lcLipi)
int LipiSharedRecognizer::s_lipiEngineRefCount = 0;
QString LipiSharedRecognizer::s_lipiRoot;
QString LipiSharedRecognizer::s_lipiLib;
-void *LipiSharedRecognizer::s_lipiEngineHandle = 0;
-LipiSharedRecognizer::FN_PTR_CREATELTKLIPIENGINE LipiSharedRecognizer::s_createLTKLipiEngine = 0;
-LipiSharedRecognizer::FN_PTR_DELETELTKLIPIENGINE LipiSharedRecognizer::s_deleteLTKLipiEngine = 0;
-LTKLipiEngineInterface *LipiSharedRecognizer::s_lipiEngine = 0;
-LTKShapeRecognizer *LipiSharedRecognizer::s_shapeRecognizer = 0;
-LipiWorker *LipiSharedRecognizer::s_lipiWorker = 0;
+void *LipiSharedRecognizer::s_lipiEngineHandle = nullptr;
+LipiSharedRecognizer::FN_PTR_CREATELTKLIPIENGINE LipiSharedRecognizer::s_createLTKLipiEngine = nullptr;
+LipiSharedRecognizer::FN_PTR_DELETELTKLIPIENGINE LipiSharedRecognizer::s_deleteLTKLipiEngine = nullptr;
+LTKLipiEngineInterface *LipiSharedRecognizer::s_lipiEngine = nullptr;
+LTKShapeRecognizer *LipiSharedRecognizer::s_shapeRecognizer = nullptr;
+LipiWorker *LipiSharedRecognizer::s_lipiWorker = nullptr;
QMap<int, QChar> LipiSharedRecognizer::s_unicodeMap;
QString LipiSharedRecognizer::s_activeModel;
stringStringMap LipiSharedRecognizer::s_lipiEngineConfigEntries;
@@ -252,13 +252,13 @@ void LipiSharedRecognizer::unloadLipiInterface()
unloadModelData();
if (s_lipiEngine) {
s_deleteLTKLipiEngine();
- s_lipiEngine = 0;
+ s_lipiEngine = nullptr;
}
- s_createLTKLipiEngine = 0;
- s_deleteLTKLipiEngine = 0;
+ s_createLTKLipiEngine = nullptr;
+ s_deleteLTKLipiEngine = nullptr;
QScopedPointer<LTKOSUtil> osUtil(LTKOSUtilFactory::getInstance());
osUtil->unloadSharedLib(s_lipiEngineHandle);
- s_lipiEngineHandle = 0;
+ s_lipiEngineHandle = nullptr;
}
}
@@ -307,8 +307,8 @@ int LipiSharedRecognizer::loadModelData(const QString &logicalName)
{
qCDebug(lcLipi) << "LipiSharedRecognizer::loadModelData():" << logicalName;
- Q_ASSERT(s_shapeRecognizer == 0);
- Q_ASSERT(s_lipiWorker == 0);
+ Q_ASSERT(s_shapeRecognizer == nullptr);
+ Q_ASSERT(s_lipiWorker == nullptr);
QTime perf;
perf.start();
@@ -356,11 +356,11 @@ void LipiSharedRecognizer::unloadModelData()
if (s_lipiWorker) {
delete s_lipiWorker;
- s_lipiWorker = 0;
+ s_lipiWorker = nullptr;
}
s_lipiEngine->deleteShapeRecognizer(s_shapeRecognizer);
- s_shapeRecognizer = 0;
+ s_shapeRecognizer = nullptr;
s_unicodeMap.clear();
s_activeModel.clear();
diff --git a/src/plugins/lipi-toolkit/plugin/lipiworker_p.h b/src/plugins/lipi-toolkit/plugin/lipiworker_p.h
index e3073313..098e198b 100644
--- a/src/plugins/lipi-toolkit/plugin/lipiworker_p.h
+++ b/src/plugins/lipi-toolkit/plugin/lipiworker_p.h
@@ -65,9 +65,9 @@ class LipiTask : public QObject
{
Q_OBJECT
public:
- explicit LipiTask(QObject *parent = 0) :
+ explicit LipiTask(QObject *parent = nullptr) :
QObject(parent),
- shapeRecognizer(0)
+ shapeRecognizer(nullptr)
{}
virtual void run() = 0;
@@ -137,7 +137,7 @@ class LipiWorker : public QThread
{
Q_OBJECT
public:
- explicit LipiWorker(LTKShapeRecognizer *shapeRecognizer, QObject *parent = 0);
+ explicit LipiWorker(LTKShapeRecognizer *shapeRecognizer, QObject *parent = nullptr);
~LipiWorker();
void addTask(QSharedPointer<LipiTask> task);
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod.cpp b/src/plugins/openwnn/plugin/openwnninputmethod.cpp
index a038fa34..ce7496a7 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod.cpp
+++ b/src/plugins/openwnn/plugin/openwnninputmethod.cpp
@@ -67,10 +67,10 @@ public:
q_ptr(q_ptr),
inputMode(InputEngine::Latin),
exactMatchMode(false),
- converter(0),
+ converter(nullptr),
converterJAJP(),
activeConvertType(CONVERT_TYPE_NONE),
- preConverter(0),
+ preConverter(nullptr),
enableLearning(true),
enablePrediction(true),
enableConverter(true),
@@ -86,22 +86,22 @@ public:
switch (mode) {
case ENGINE_MODE_DIRECT:
/* Full/Half-width number or Full-width alphabet */
- converter = NULL;
+ converter = nullptr;
preConverter.reset();
break;
case ENGINE_MODE_NO_LV2_CONV:
- converter = NULL;
+ converter = nullptr;
preConverter.reset(new Romkan());
break;
case ENGINE_MODE_FULL_KATAKANA:
- converter = NULL;
+ converter = nullptr;
preConverter.reset(new RomkanFullKatakana());
break;
case ENGINE_MODE_HALF_KATAKANA:
- converter = NULL;
+ converter = nullptr;
preConverter.reset(new RomkanHalfKatakana());
break;
@@ -126,7 +126,7 @@ public:
bool isEnableL2Converter()
{
- return converter != NULL && enableConverter;
+ return converter != nullptr && enableConverter;
}
void startConvert(ConvertType convertType)
@@ -447,7 +447,7 @@ public:
}
QString tmp = composingText.toString(layer, 0, cursor - 1);
- if (converter != NULL) {
+ if (converter != nullptr) {
if (learn) {
if (activeConvertType == CONVERT_TYPE_RENBUN) {
learnWord(0); /* select the top of the clauses */
@@ -665,7 +665,7 @@ bool OpenWnnInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard
Q_UNUSED(modifiers)
Q_D(OpenWnnInputMethod);
- if (d->preConverter == NULL && !d->isEnableL2Converter())
+ if (d->preConverter == nullptr && !d->isEnableL2Converter())
return false;
switch (key) {
@@ -738,7 +738,7 @@ bool OpenWnnInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard
if (d->isEnableL2Converter()) {
d->commitConvertingText();
d->composingText.insertStrSegment(ComposingText::LAYER0, ComposingText::LAYER1, text.mid(i, 1));
- if (d->preConverter != NULL)
+ if (d->preConverter != nullptr)
d->preConverter->convert(d->composingText);
if (i == last)
d->updateViewStatusForPrediction(true, true);
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod_p.h b/src/plugins/openwnn/plugin/openwnninputmethod_p.h
index 1ecdf8fc..dd439c13 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod_p.h
+++ b/src/plugins/openwnn/plugin/openwnninputmethod_p.h
@@ -54,7 +54,7 @@ class OpenWnnInputMethod : public AbstractInputMethod
Q_DECLARE_PRIVATE(OpenWnnInputMethod)
public:
- explicit OpenWnnInputMethod(QObject *parent = 0);
+ explicit OpenWnnInputMethod(QObject *parent = nullptr);
~OpenWnnInputMethod();
QList<InputEngine::InputMode> inputModes(const QString &locale);
diff --git a/src/plugins/pinyin/plugin/pinyindecoderservice.cpp b/src/plugins/pinyin/plugin/pinyindecoderservice.cpp
index ef836dcb..e01f7e63 100644
--- a/src/plugins/pinyin/plugin/pinyindecoderservice.cpp
+++ b/src/plugins/pinyin/plugin/pinyindecoderservice.cpp
@@ -69,7 +69,7 @@ PinyinDecoderService *PinyinDecoderService::getInstance()
if (!_instance)
_instance.reset(new PinyinDecoderService());
if (!_instance->init())
- return 0;
+ return nullptr;
return _instance.data();
}
@@ -108,7 +108,7 @@ void PinyinDecoderService::setUserDictionary(bool enabled)
QFileInfo usrDictInfo(usrDictPath + "/qtvirtualkeyboard/pinyin/usr_dict.dat");
im_init_user_dictionary(usrDictInfo.absoluteFilePath().toUtf8().constData());
} else {
- im_init_user_dictionary(NULL);
+ im_init_user_dictionary(nullptr);
}
}
@@ -224,7 +224,7 @@ void PinyinDecoderService::flushCache()
QList<QString> PinyinDecoderService::predictionList(const QString &history)
{
QList<QString> predictList;
- char16 (*predictItems)[kMaxPredictSize + 1] = 0;
+ char16 (*predictItems)[kMaxPredictSize + 1] = nullptr;
int predictNum = int(im_get_predicts(history.utf16(), predictItems));
predictList.reserve(predictNum);
for (int i = 0; i < predictNum; i++)
diff --git a/src/plugins/pinyin/plugin/pinyindecoderservice_p.h b/src/plugins/pinyin/plugin/pinyindecoderservice_p.h
index 5034c4c6..24e08721 100644
--- a/src/plugins/pinyin/plugin/pinyindecoderservice_p.h
+++ b/src/plugins/pinyin/plugin/pinyindecoderservice_p.h
@@ -50,7 +50,7 @@ class PinyinDecoderService : public QObject
{
Q_OBJECT
Q_DISABLE_COPY(PinyinDecoderService)
- explicit PinyinDecoderService(QObject *parent = 0);
+ explicit PinyinDecoderService(QObject *parent = nullptr);
public:
~PinyinDecoderService();
diff --git a/src/plugins/pinyin/plugin/pinyininputmethod_p.h b/src/plugins/pinyin/plugin/pinyininputmethod_p.h
index f766c68e..668eac3b 100644
--- a/src/plugins/pinyin/plugin/pinyininputmethod_p.h
+++ b/src/plugins/pinyin/plugin/pinyininputmethod_p.h
@@ -54,7 +54,7 @@ class PinyinInputMethod : public AbstractInputMethod
Q_DECLARE_PRIVATE(PinyinInputMethod)
public:
- explicit PinyinInputMethod(QObject *parent = 0);
+ explicit PinyinInputMethod(QObject *parent = nullptr);
~PinyinInputMethod();
QList<InputEngine::InputMode> inputModes(const QString &locale);
diff --git a/src/plugins/t9write/plugin/t9writedictionary.cpp b/src/plugins/t9write/plugin/t9writedictionary.cpp
index 4d3f3419..5a17ae6d 100644
--- a/src/plugins/t9write/plugin/t9writedictionary.cpp
+++ b/src/plugins/t9write/plugin/t9writedictionary.cpp
@@ -41,9 +41,9 @@ T9WriteDictionary::T9WriteDictionary(DECUMA_SESSION *decumaSession,
decumaSession(decumaSession),
memFuncs(memFuncs),
cjk(cjk),
- sourceData(0),
+ sourceData(nullptr),
sourceSize(0),
- convertedData(0),
+ convertedData(nullptr),
convertedSize(0)
{
}
@@ -53,7 +53,7 @@ T9WriteDictionary::~T9WriteDictionary()
if (convertedData) {
DECUMA_STATUS status = DECUMA_API(DestroyConvertedDictionary)(&convertedData, &memFuncs);
Q_ASSERT(status == decumaNoError);
- Q_ASSERT(convertedData == 0);
+ Q_ASSERT(convertedData == nullptr);
}
}
@@ -75,7 +75,7 @@ bool T9WriteDictionary::load(const QString &fileName)
qCWarning(lcT9Write) << "Could not open dictionary file" << fileName;
}
- return sourceData != 0;
+ return sourceData != nullptr;
}
bool T9WriteDictionary::convert(const DECUMA_SRC_DICTIONARY_INFO &dictionaryInfo)
@@ -91,7 +91,7 @@ bool T9WriteDictionary::convert(const DECUMA_SRC_DICTIONARY_INFO &dictionaryInfo
qCWarning(lcT9Write) << "Could not convert dictionary" << file.fileName();
file.unmap((uchar *)sourceData);
sourceSize = 0;
- sourceData = 0;
+ sourceData = nullptr;
}
return status == decumaNoError;
@@ -114,7 +114,7 @@ qint64 T9WriteDictionary::size() const
bool T9WriteDictionary::isConverted() const
{
- return convertedData != 0;
+ return convertedData != nullptr;
}
} // namespace QtVirtualKeyboard
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
index 6bafca55..7c8927fc 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp
+++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp
@@ -126,13 +126,13 @@ public:
engineMode(EngineUninitialized),
defaultHwrDbPath(QLatin1String(":/QtQuick/VirtualKeyboard/T9Write/data/")),
defaultDictionaryDbPath(defaultHwrDbPath),
- dictionaryLock(QMutex::Recursive),
- attachedDictionary(0),
traceListHardLimit(32),
+ dictionaryLock(QMutex::Recursive),
+ attachedDictionary(nullptr),
resultId(0),
lastResultId(0),
resultTimer(0),
- decumaSession(0),
+ decumaSession(nullptr),
activeWordIndex(-1),
arcAdditionStarted(false),
ignoreUpdate(false),
@@ -239,7 +239,7 @@ public:
sessionSettings.charSet.nLanguages = languageCategories.size();
session = QByteArray(DECUMA_API(GetSessionSize)(), 0);
- decumaSession = (DECUMA_SESSION *)(!session.isEmpty() ? session.data() : 0);
+ decumaSession = (DECUMA_SESSION *)(!session.isEmpty() ? session.data() : nullptr);
DECUMA_STATUS status = DECUMA_API(BeginSession)(decumaSession, &sessionSettings, &memFuncs);
Q_ASSERT(status == decumaNoError);
@@ -287,7 +287,7 @@ public:
DECUMA_API(StopLogging)(decumaSession);
#endif
DECUMA_API(EndSession)(decumaSession);
- decumaSession = 0;
+ decumaSession = nullptr;
session.clear();
}
@@ -391,8 +391,8 @@ public:
bool attachDictionary(const QSharedPointer<T9WriteDictionary> &dictionary)
{
QMutexLocker dictionaryGuard(&dictionaryLock);
- Q_ASSERT(decumaSession != 0);
- Q_ASSERT(dictionary != 0);
+ Q_ASSERT(decumaSession != nullptr);
+ Q_ASSERT(dictionary != nullptr);
qCDebug(lcT9Write) << "T9WriteInputMethodPrivate::attachDictionary():" << dictionary->fileName();
#if T9WRITEAPIMAJORVERNUM >= 20
DECUMA_STATUS status = DECUMA_API(AttachDictionary)(decumaSession, dictionary->data(), dictionary->size());
@@ -410,7 +410,7 @@ public:
qCDebug(lcT9Write) << "T9WriteInputMethodPrivate::detachDictionary():" << dictionary->fileName();
- Q_ASSERT(decumaSession != 0);
+ Q_ASSERT(decumaSession != nullptr);
DECUMA_STATUS status = DECUMA_API(DetachDictionary)(decumaSession, dictionary->data());
Q_UNUSED(status)
Q_ASSERT(status == decumaNoError);
@@ -1059,7 +1059,7 @@ public:
const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo)
{
if (!worker)
- return 0;
+ return nullptr;
// The result id follows the trace id so that the (previous)
// results completed during the handwriting can be rejected.
@@ -1212,7 +1212,7 @@ public:
bool result = !traceList.isEmpty();
- Q_ASSERT(decumaSession != 0);
+ Q_ASSERT(decumaSession != nullptr);
stopResultTimer();
@@ -1666,7 +1666,7 @@ const DECUMA_MEM_FUNCTIONS T9WriteInputMethodPrivate::memFuncs = {
T9WriteInputMethodPrivate::decumaMalloc,
T9WriteInputMethodPrivate::decumaCalloc,
T9WriteInputMethodPrivate::decumaFree,
- NULL
+ nullptr
};
/*!
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod_p.h b/src/plugins/t9write/plugin/t9writeinputmethod_p.h
index 45e62c47..c129aa2e 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod_p.h
+++ b/src/plugins/t9write/plugin/t9writeinputmethod_p.h
@@ -56,7 +56,7 @@ class T9WriteInputMethod : public AbstractInputMethod
Q_DECLARE_PRIVATE(T9WriteInputMethod)
public:
- explicit T9WriteInputMethod(QObject *parent = 0);
+ explicit T9WriteInputMethod(QObject *parent = nullptr);
~T9WriteInputMethod();
QList<InputEngine::InputMode> inputModes(const QString &locale);
diff --git a/src/plugins/t9write/plugin/t9writeworker.cpp b/src/plugins/t9write/plugin/t9writeworker.cpp
index 08719496..30cedc01 100644
--- a/src/plugins/t9write/plugin/t9writeworker.cpp
+++ b/src/plugins/t9write/plugin/t9writeworker.cpp
@@ -45,7 +45,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcT9Write)
T9WriteTask::T9WriteTask(QObject *parent) :
QObject(parent),
- decumaSession(0),
+ decumaSession(nullptr),
runSema()
{
}
@@ -205,7 +205,7 @@ void T9WriteRecognitionTask::run()
interruptFunctions.pUserData = (void *)this;
DECUMA_INTERRUPT_FUNCTIONS *pInterruptFunctions = &interruptFunctions;
#else
- DECUMA_INTERRUPT_FUNCTIONS *pInterruptFunctions = NULL;
+ DECUMA_INTERRUPT_FUNCTIONS *pInterruptFunctions = nullptr;
#endif
result->status = DECUMA_API(Recognize)(decumaSession, result->results.data(), result->results.size(), &result->numResults, result->maxCharsPerWord, &recSettings, pInterruptFunctions);
if (result->status != decumaNoError)
@@ -240,7 +240,7 @@ bool T9WriteRecognitionTask::cancelRecognition()
int T9WriteRecognitionTask::resultId() const
{
- return result != 0 ? result->id : -1;
+ return result != nullptr ? result->id : -1;
}
/*!
diff --git a/src/plugins/t9write/plugin/t9writeworker_p.h b/src/plugins/t9write/plugin/t9writeworker_p.h
index 76807764..f49e7519 100644
--- a/src/plugins/t9write/plugin/t9writeworker_p.h
+++ b/src/plugins/t9write/plugin/t9writeworker_p.h
@@ -62,7 +62,7 @@ class T9WriteTask : public QObject
{
Q_OBJECT
public:
- explicit T9WriteTask(QObject *parent = 0);
+ explicit T9WriteTask(QObject *parent = nullptr);
virtual void run() = 0;
@@ -177,7 +177,7 @@ class T9WriteWorker : public QThread
{
Q_OBJECT
public:
- explicit T9WriteWorker(DECUMA_SESSION *decumaSession, const bool cjk, QObject *parent = 0);
+ explicit T9WriteWorker(DECUMA_SESSION *decumaSession, const bool cjk, QObject *parent = nullptr);
~T9WriteWorker();
void addTask(QSharedPointer<T9WriteTask> task);
diff --git a/src/plugins/tcime/plugin/tcinputmethod.cpp b/src/plugins/tcime/plugin/tcinputmethod.cpp
index 10c89228..e6acb859 100644
--- a/src/plugins/tcime/plugin/tcinputmethod.cpp
+++ b/src/plugins/tcime/plugin/tcinputmethod.cpp
@@ -59,7 +59,7 @@ public:
TCInputMethodPrivate(TCInputMethod *q_ptr) :
q_ptr(q_ptr),
inputMode(InputEngine::Latin),
- wordDictionary(0),
+ wordDictionary(nullptr),
highlightIndex(-1)
{}
@@ -370,7 +370,7 @@ bool TCInputMethod::setInputMode(const QString &locale, InputEngine::InputMode i
update();
bool result = false;
d->inputMode = inputMode;
- d->wordDictionary = 0;
+ d->wordDictionary = nullptr;
#if defined(HAVE_TCIME_CANGJIE)
if (inputMode == InputEngine::Cangjie) {
if (d->cangjieDictionary.isEmpty()) {
diff --git a/src/plugins/tcime/plugin/tcinputmethod_p.h b/src/plugins/tcime/plugin/tcinputmethod_p.h
index 887bc4e0..4c29d5d3 100644
--- a/src/plugins/tcime/plugin/tcinputmethod_p.h
+++ b/src/plugins/tcime/plugin/tcinputmethod_p.h
@@ -55,7 +55,7 @@ class TCInputMethod : public AbstractInputMethod
Q_PROPERTY(bool simplified READ simplified WRITE setSimplified NOTIFY simplifiedChanged)
public:
- explicit TCInputMethod(QObject *parent = 0);
+ explicit TCInputMethod(QObject *parent = nullptr);
~TCInputMethod();
bool simplified() const;
diff --git a/src/styles/styles_plugin.h b/src/styles/styles_plugin.h
index 0eca2e9b..c9147c59 100644
--- a/src/styles/styles_plugin.h
+++ b/src/styles/styles_plugin.h
@@ -38,7 +38,7 @@ class QtVirtualKeyboardStylesPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public:
- QtVirtualKeyboardStylesPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
+ QtVirtualKeyboardStylesPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
void registerTypes(const char *uri);
void initializeEngine(QQmlEngine *engine, const char *uri);
};
diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp
index eaf04d67..fc18936d 100644
--- a/src/virtualkeyboard/abstractinputmethod.cpp
+++ b/src/virtualkeyboard/abstractinputmethod.cpp
@@ -47,7 +47,7 @@ public:
*/
AbstractInputMethodPrivate::AbstractInputMethodPrivate() :
- inputEngine(0)
+ inputEngine(nullptr)
{
}
@@ -84,7 +84,7 @@ AbstractInputMethod::~AbstractInputMethod()
InputContext *AbstractInputMethod::inputContext() const
{
Q_D(const AbstractInputMethod);
- return d->inputEngine ? d->inputEngine->inputContext() : 0;
+ return d->inputEngine ? d->inputEngine->inputContext() : nullptr;
}
/*!
@@ -197,7 +197,7 @@ Trace *AbstractInputMethod::traceBegin(int traceId, InputEngine::PatternRecognit
Q_UNUSED(patternRecognitionMode)
Q_UNUSED(traceCaptureDeviceInfo)
Q_UNUSED(traceScreenInfo)
- return 0;
+ return nullptr;
}
/*!
diff --git a/src/virtualkeyboard/abstractinputmethod.h b/src/virtualkeyboard/abstractinputmethod.h
index bcac3251..d211e13b 100644
--- a/src/virtualkeyboard/abstractinputmethod.h
+++ b/src/virtualkeyboard/abstractinputmethod.h
@@ -44,7 +44,7 @@ class QVIRTUALKEYBOARD_EXPORT AbstractInputMethod : public QObject
Q_DECLARE_PRIVATE(AbstractInputMethod)
public:
- explicit AbstractInputMethod(QObject *parent = 0);
+ explicit AbstractInputMethod(QObject *parent = nullptr);
~AbstractInputMethod();
InputContext *inputContext() const;
diff --git a/src/virtualkeyboard/abstractinputpanel_p.h b/src/virtualkeyboard/abstractinputpanel_p.h
index 46bb1738..08a19fc6 100644
--- a/src/virtualkeyboard/abstractinputpanel_p.h
+++ b/src/virtualkeyboard/abstractinputpanel_p.h
@@ -51,9 +51,9 @@ class QVIRTUALKEYBOARD_EXPORT AbstractInputPanel : public QObject
{
Q_OBJECT
protected:
- AbstractInputPanel(QObjectPrivate &dd, QObject *parent = 0);
+ AbstractInputPanel(QObjectPrivate &dd, QObject *parent = nullptr);
public:
- explicit AbstractInputPanel(QObject *parent = 0);
+ explicit AbstractInputPanel(QObject *parent = nullptr);
~AbstractInputPanel();
virtual void show() = 0;
diff --git a/src/virtualkeyboard/appinputpanel_p.h b/src/virtualkeyboard/appinputpanel_p.h
index 8363e80a..d1db9dad 100644
--- a/src/virtualkeyboard/appinputpanel_p.h
+++ b/src/virtualkeyboard/appinputpanel_p.h
@@ -59,10 +59,10 @@ class QVIRTUALKEYBOARD_EXPORT AppInputPanel : public AbstractInputPanel
Q_DECLARE_PRIVATE(AppInputPanel)
protected:
- AppInputPanel(AppInputPanelPrivate &dd, QObject *parent = 0);
+ AppInputPanel(AppInputPanelPrivate &dd, QObject *parent = nullptr);
public:
- explicit AppInputPanel(QObject *parent = 0);
+ explicit AppInputPanel(QObject *parent = nullptr);
~AppInputPanel();
void show();
diff --git a/src/virtualkeyboard/desktopinputpanel_p.h b/src/virtualkeyboard/desktopinputpanel_p.h
index eea026ce..688a155e 100644
--- a/src/virtualkeyboard/desktopinputpanel_p.h
+++ b/src/virtualkeyboard/desktopinputpanel_p.h
@@ -56,7 +56,7 @@ class QVIRTUALKEYBOARD_EXPORT DesktopInputPanel : public AppInputPanel
Q_OBJECT
Q_DECLARE_PRIVATE(DesktopInputPanel)
public:
- explicit DesktopInputPanel(QObject *parent = 0);
+ explicit DesktopInputPanel(QObject *parent = nullptr);
~DesktopInputPanel();
void show();
diff --git a/src/virtualkeyboard/fallbackinputmethod_p.h b/src/virtualkeyboard/fallbackinputmethod_p.h
index d8da7d80..d4f40e89 100644
--- a/src/virtualkeyboard/fallbackinputmethod_p.h
+++ b/src/virtualkeyboard/fallbackinputmethod_p.h
@@ -51,7 +51,7 @@ class QVIRTUALKEYBOARD_EXPORT FallbackInputMethod : public AbstractInputMethod
Q_OBJECT
public:
- explicit FallbackInputMethod(QObject *parent = 0);
+ explicit FallbackInputMethod(QObject *parent = nullptr);
QList<InputEngine::InputMode> inputModes(const QString &locale);
bool setInputMode(const QString &locale, InputEngine::InputMode inputMode);
diff --git a/src/virtualkeyboard/gesturerecognizer_p.h b/src/virtualkeyboard/gesturerecognizer_p.h
index a4b95827..431656eb 100644
--- a/src/virtualkeyboard/gesturerecognizer_p.h
+++ b/src/virtualkeyboard/gesturerecognizer_p.h
@@ -53,7 +53,7 @@ class QVIRTUALKEYBOARD_EXPORT GestureRecognizer : public QObject
{
Q_OBJECT
public:
- explicit GestureRecognizer(QObject *parent = 0);
+ explicit GestureRecognizer(QObject *parent = nullptr);
virtual QVariantMap recognize(const QList<Trace *> traceList) = 0;
};
diff --git a/src/virtualkeyboard/handwritinggesturerecognizer_p.h b/src/virtualkeyboard/handwritinggesturerecognizer_p.h
index c1393803..21991cef 100644
--- a/src/virtualkeyboard/handwritinggesturerecognizer_p.h
+++ b/src/virtualkeyboard/handwritinggesturerecognizer_p.h
@@ -50,7 +50,7 @@ class QVIRTUALKEYBOARD_EXPORT HandwritingGestureRecognizer : public GestureRecog
{
Q_OBJECT
public:
- explicit HandwritingGestureRecognizer(QObject *parent = 0);
+ explicit HandwritingGestureRecognizer(QObject *parent = nullptr);
void setDpi(int dpi);
int dpi() const;
diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index 33724104..bc4dc7d7 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -73,9 +73,9 @@ public:
InputContextPrivate() :
QObjectPrivate(),
- inputContext(0),
- inputEngine(0),
- shiftHandler(0),
+ inputContext(nullptr),
+ inputEngine(nullptr),
+ shiftHandler(nullptr),
keyboardRect(),
previewRect(),
previewVisible(false),
@@ -391,7 +391,7 @@ void InputContext::updateAvailableLocales(const QStringList &availableLocales)
QObject *InputContext::inputItem() const
{
Q_D(const InputContext);
- return d->inputContext ? d->inputContext->focusObject() : 0;
+ return d->inputContext ? d->inputContext->focusObject() : nullptr;
}
ShiftHandler *InputContext::shiftHandler() const
@@ -558,7 +558,7 @@ bool InputContext::fileExists(const QUrl &fileUrl)
*/
bool InputContext::hasEnterKeyAction(QObject *item) const
{
- return item != 0 && qmlAttachedPropertiesObject<EnterKeyAction>(item, false);
+ return item != nullptr && qmlAttachedPropertiesObject<EnterKeyAction>(item, false);
}
/*!
diff --git a/src/virtualkeyboard/inputcontext.h b/src/virtualkeyboard/inputcontext.h
index bfb349c6..839c8f10 100644
--- a/src/virtualkeyboard/inputcontext.h
+++ b/src/virtualkeyboard/inputcontext.h
@@ -77,7 +77,7 @@ class QVIRTUALKEYBOARD_EXPORT InputContext : public QObject
Q_PROPERTY(ShadowInputContext *shadow READ shadow CONSTANT)
public:
- explicit InputContext(PlatformInputContext *parent = 0);
+ explicit InputContext(PlatformInputContext *parent = nullptr);
~InputContext();
bool focus() const;
diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp
index 429ca92a..7763fc9b 100644
--- a/src/virtualkeyboard/inputengine.cpp
+++ b/src/virtualkeyboard/inputengine.cpp
@@ -47,8 +47,8 @@ public:
InputEnginePrivate(InputEngine *q_ptr) :
QObjectPrivate(),
q_ptr(q_ptr),
- inputContext(0),
- fallbackInputMethod(0),
+ inputContext(nullptr),
+ fallbackInputMethod(nullptr),
textCase(InputEngine::Lower),
inputMode(InputEngine::Latin),
activeKey(Qt::Key_unknown),
@@ -368,7 +368,7 @@ void InputEngine::setInputMethod(AbstractInputMethod *inputMethod)
update();
if (d->inputMethod) {
QObject::disconnect(d->inputMethod.data(), &AbstractInputMethod::selectionListsChanged, this, &InputEngine::updateSelectionListModels);
- d->inputMethod->setInputEngine(0);
+ d->inputMethod->setInputEngine(nullptr);
}
d->inputMethod = inputMethod;
if (d->inputMethod) {
@@ -436,7 +436,7 @@ bool InputEngine::wordCandidateListVisibleHint() const
const auto it = d->selectionListModels.constFind(SelectionListModel::WordCandidateList);
if (it == d->selectionListModels.cend())
return false;
- return it.value()->dataSource() != 0;
+ return it.value()->dataSource() != nullptr;
}
/*!
@@ -509,11 +509,11 @@ Trace *InputEngine::traceBegin(
<< "traceCaptureDeviceInfo:" << traceCaptureDeviceInfo
<< "traceScreenInfo:" << traceScreenInfo;
if (!d->inputMethod)
- return 0;
+ return nullptr;
if (patternRecognitionMode == PatternRecognitionDisabled)
- return 0;
+ return nullptr;
if (!d->inputMethod->patternRecognitionModes().contains(patternRecognitionMode))
- return 0;
+ return nullptr;
Trace *trace = d->inputMethod->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo);
if (trace)
trace->setTraceId(traceId);
@@ -644,7 +644,7 @@ void InputEngine::updateSelectionListModels()
for (const SelectionListModel::Type &selectionListType : qAsConst(inactiveSelectionLists)) {
const auto it = d->selectionListModels.constFind(selectionListType);
if (it != d->selectionListModels.cend()) {
- it.value()->setDataSource(0, selectionListType);
+ it.value()->setDataSource(nullptr, selectionListType);
if (selectionListType == SelectionListModel::WordCandidateList)
emit wordCandidateListVisibleHintChanged();
}
diff --git a/src/virtualkeyboard/inputengine.h b/src/virtualkeyboard/inputengine.h
index aa968252..5880e844 100644
--- a/src/virtualkeyboard/inputengine.h
+++ b/src/virtualkeyboard/inputengine.h
@@ -58,7 +58,7 @@ class QVIRTUALKEYBOARD_EXPORT InputEngine : public QObject
Q_PROPERTY(SelectionListModel *wordCandidateListModel READ wordCandidateListModel NOTIFY wordCandidateListModelChanged)
Q_PROPERTY(bool wordCandidateListVisibleHint READ wordCandidateListVisibleHint NOTIFY wordCandidateListVisibleHintChanged)
- explicit InputEngine(InputContext *parent = 0);
+ explicit InputEngine(InputContext *parent = nullptr);
public:
enum TextCase {
diff --git a/src/virtualkeyboard/inputmethod_p.h b/src/virtualkeyboard/inputmethod_p.h
index 0e84221c..09591d62 100644
--- a/src/virtualkeyboard/inputmethod_p.h
+++ b/src/virtualkeyboard/inputmethod_p.h
@@ -53,7 +53,7 @@ class QVIRTUALKEYBOARD_EXPORT InputMethod : public AbstractInputMethod
Q_PROPERTY(InputEngine *inputEngine READ inputEngine CONSTANT)
public:
- explicit InputMethod(QObject *parent = 0);
+ explicit InputMethod(QObject *parent = nullptr);
~InputMethod();
QList<InputEngine::InputMode> inputModes(const QString &locale);
diff --git a/src/virtualkeyboard/inputview_p.h b/src/virtualkeyboard/inputview_p.h
index 256d0ae6..cdbd6a2f 100644
--- a/src/virtualkeyboard/inputview_p.h
+++ b/src/virtualkeyboard/inputview_p.h
@@ -51,7 +51,7 @@ class QVIRTUALKEYBOARD_EXPORT InputView : public QQuickView
{
Q_OBJECT
public:
- explicit InputView(QWindow *parent = 0);
+ explicit InputView(QWindow *parent = nullptr);
signals:
void sizeChanged();
diff --git a/src/virtualkeyboard/plaininputmethod_p.h b/src/virtualkeyboard/plaininputmethod_p.h
index d1f7e01c..44f97a6a 100644
--- a/src/virtualkeyboard/plaininputmethod_p.h
+++ b/src/virtualkeyboard/plaininputmethod_p.h
@@ -51,7 +51,7 @@ class QVIRTUALKEYBOARD_EXPORT PlainInputMethod : public AbstractInputMethod
Q_OBJECT
public:
- explicit PlainInputMethod(QObject *parent = 0);
+ explicit PlainInputMethod(QObject *parent = nullptr);
~PlainInputMethod();
QList<InputEngine::InputMode> inputModes(const QString &locale);
diff --git a/src/virtualkeyboard/platforminputcontext.cpp b/src/virtualkeyboard/platforminputcontext.cpp
index 030381c2..c7a8fc82 100644
--- a/src/virtualkeyboard/platforminputcontext.cpp
+++ b/src/virtualkeyboard/platforminputcontext.cpp
@@ -51,12 +51,12 @@ Q_LOGGING_CATEGORY(qlcVirtualKeyboard, "qt.virtualkeyboard")
*/
PlatformInputContext::PlatformInputContext() :
- m_inputContext(0),
- m_inputPanel(0),
- m_focusObject(0),
+ m_inputContext(nullptr),
+ m_inputPanel(nullptr),
+ m_focusObject(nullptr),
m_locale(),
m_inputDirection(m_locale.textDirection()),
- m_filterEvent(0),
+ m_filterEvent(nullptr),
m_visible(false)
{
}
@@ -185,8 +185,8 @@ QObject *PlatformInputContext::focusObject()
void PlatformInputContext::setFocusObject(QObject *object)
{
VIRTUALKEYBOARD_DEBUG() << "PlatformInputContext::setFocusObject():" << object;
- Q_ASSERT(m_inputContext == 0 ||
- m_inputContext->shadow()->inputItem() == 0 ||
+ Q_ASSERT(m_inputContext == nullptr ||
+ m_inputContext->shadow()->inputItem() == nullptr ||
m_inputContext->shadow()->inputItem() != object);
if (m_focusObject != object) {
if (m_focusObject)
@@ -216,18 +216,18 @@ void PlatformInputContext::sendEvent(QEvent *event)
if (m_focusObject) {
m_filterEvent = event;
QGuiApplication::sendEvent(m_focusObject, event);
- m_filterEvent = 0;
+ m_filterEvent = nullptr;
}
}
void PlatformInputContext::sendKeyEvent(QKeyEvent *event)
{
const QGuiApplication *app = qApp;
- QWindow *focusWindow = app ? app->focusWindow() : 0;
+ QWindow *focusWindow = app ? app->focusWindow() : nullptr;
if (focusWindow) {
m_filterEvent = event;
QGuiApplication::sendEvent(focusWindow, event);
- m_filterEvent = 0;
+ m_filterEvent = nullptr;
}
}
@@ -249,7 +249,7 @@ void PlatformInputContext::setInputContext(InputContext *context)
m_inputPanel = new AppInputPanel(this);
connect(m_inputContext, SIGNAL(keyboardRectangleChanged()), SLOT(keyboardRectangleChanged()));
} else if (m_inputPanel) {
- m_inputPanel = 0;
+ m_inputPanel = nullptr;
}
}
diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp
index 30b288a2..4718669f 100644
--- a/src/virtualkeyboard/selectionlistmodel.cpp
+++ b/src/virtualkeyboard/selectionlistmodel.cpp
@@ -41,7 +41,7 @@ class SelectionListModelPrivate : public QAbstractItemModelPrivate
public:
SelectionListModelPrivate() :
QAbstractItemModelPrivate(),
- dataSource(0),
+ dataSource(nullptr),
type(SelectionListModel::WordCandidateList),
rowCount(0),
wclAutoCommitWord(false)
@@ -147,7 +147,7 @@ void SelectionListModel::setDataSource(AbstractInputMethod *dataSource, Type typ
}
d->type = type;
if (d->dataSource) {
- d->dataSource = 0;
+ d->dataSource = nullptr;
selectionListChanged(type);
selectionListActiveItemChanged(type, -1);
}
diff --git a/src/virtualkeyboard/selectionlistmodel.h b/src/virtualkeyboard/selectionlistmodel.h
index 274e3e67..ec9b84e3 100644
--- a/src/virtualkeyboard/selectionlistmodel.h
+++ b/src/virtualkeyboard/selectionlistmodel.h
@@ -46,7 +46,7 @@ class QVIRTUALKEYBOARD_EXPORT SelectionListModel : public QAbstractListModel
Q_DECLARE_PRIVATE(SelectionListModel)
Q_PROPERTY(int count READ count NOTIFY countChanged)
- explicit SelectionListModel(QObject *parent = 0);
+ explicit SelectionListModel(QObject *parent = nullptr);
public:
enum Type
diff --git a/src/virtualkeyboard/settings_p.h b/src/virtualkeyboard/settings_p.h
index d3e48b98..843592fe 100644
--- a/src/virtualkeyboard/settings_p.h
+++ b/src/virtualkeyboard/settings_p.h
@@ -56,7 +56,7 @@ class QVIRTUALKEYBOARD_EXPORT Settings : public QObject
Q_DISABLE_COPY(Settings)
Q_DECLARE_PRIVATE(Settings)
- Settings(QObject *parent = 0);
+ Settings(QObject *parent = nullptr);
public:
static Settings *instance();
diff --git a/src/virtualkeyboard/shadowinputcontext.cpp b/src/virtualkeyboard/shadowinputcontext.cpp
index eea08f89..e3cff2d7 100644
--- a/src/virtualkeyboard/shadowinputcontext.cpp
+++ b/src/virtualkeyboard/shadowinputcontext.cpp
@@ -45,7 +45,7 @@ class ShadowInputContextPrivate : public QObjectPrivate
public:
ShadowInputContextPrivate() :
QObjectPrivate(),
- inputContext(0),
+ inputContext(nullptr),
anchorRectIntersectsClipRect(false),
cursorRectIntersectsClipRect(false),
selectionControlVisible(false)
diff --git a/src/virtualkeyboard/shadowinputcontext_p.h b/src/virtualkeyboard/shadowinputcontext_p.h
index 17de9dc0..3f9effa1 100644
--- a/src/virtualkeyboard/shadowinputcontext_p.h
+++ b/src/virtualkeyboard/shadowinputcontext_p.h
@@ -65,7 +65,7 @@ class QVIRTUALKEYBOARD_EXPORT ShadowInputContext : public QObject
Q_PROPERTY(bool cursorRectIntersectsClipRect READ cursorRectIntersectsClipRect NOTIFY cursorRectIntersectsClipRectChanged)
Q_PROPERTY(bool selectionControlVisible READ selectionControlVisible NOTIFY selectionControlVisibleChanged)
- explicit ShadowInputContext(QObject *parent = 0);
+ explicit ShadowInputContext(QObject *parent = nullptr);
void setInputContext(InputContext *inputContext);
diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index 510dc3ae..f27a9727 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -44,7 +44,7 @@ class ShiftHandlerPrivate : public QObjectPrivate
public:
ShiftHandlerPrivate() :
QObjectPrivate(),
- inputContext(0),
+ inputContext(nullptr),
sentenceEndingCharacters(QString(".!?") + QChar(Qt::Key_exclamdown) + QChar(Qt::Key_questiondown)),
autoCapitalizationEnabled(false),
toggleShiftEnabled(false),
diff --git a/src/virtualkeyboard/shifthandler_p.h b/src/virtualkeyboard/shifthandler_p.h
index 8c08f363..d7a31d14 100644
--- a/src/virtualkeyboard/shifthandler_p.h
+++ b/src/virtualkeyboard/shifthandler_p.h
@@ -59,7 +59,7 @@ class QVIRTUALKEYBOARD_EXPORT ShiftHandler : public QObject
Q_PROPERTY(bool autoCapitalizationEnabled READ autoCapitalizationEnabled NOTIFY autoCapitalizationEnabledChanged)
Q_PROPERTY(bool toggleShiftEnabled READ toggleShiftEnabled NOTIFY toggleShiftEnabledChanged)
- explicit ShiftHandler(InputContext *parent = 0);
+ explicit ShiftHandler(InputContext *parent = nullptr);
public:
~ShiftHandler();
diff --git a/src/virtualkeyboard/trace.h b/src/virtualkeyboard/trace.h
index 53709ef4..585cc073 100644
--- a/src/virtualkeyboard/trace.h
+++ b/src/virtualkeyboard/trace.h
@@ -50,7 +50,7 @@ class QVIRTUALKEYBOARD_EXPORT Trace : public QObject
Q_PROPERTY(bool isFinal READ isFinal WRITE setFinal NOTIFY finalChanged)
Q_PROPERTY(bool isCanceled READ isCanceled WRITE setCanceled NOTIFY canceledChanged)
public:
- explicit Trace(QObject *parent = 0);
+ explicit Trace(QObject *parent = nullptr);
~Trace();
int traceId() const;
diff --git a/src/virtualkeyboard/unipentrace_p.h b/src/virtualkeyboard/unipentrace_p.h
index f61ff50b..10c6786b 100644
--- a/src/virtualkeyboard/unipentrace_p.h
+++ b/src/virtualkeyboard/unipentrace_p.h
@@ -51,7 +51,7 @@ class UnipenTrace : public QObject
{
Q_OBJECT
public:
- explicit UnipenTrace(const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo, QObject *parent = 0);
+ explicit UnipenTrace(const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo, QObject *parent = nullptr);
void record(const QList<Trace *> &traceList);
void save(uint unicode, uint confidence);
diff --git a/src/virtualkeyboard/virtualkeyboardsettings_p.h b/src/virtualkeyboard/virtualkeyboardsettings_p.h
index adcfd7a6..7acb8268 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings_p.h
+++ b/src/virtualkeyboard/virtualkeyboardsettings_p.h
@@ -110,7 +110,7 @@ class QVIRTUALKEYBOARD_EXPORT WordCandidateListSettings : public QObject
Q_PROPERTY(bool alwaysVisible READ alwaysVisible WRITE setAlwaysVisible NOTIFY alwaysVisibleChanged)
Q_PROPERTY(bool autoCommitWord READ autoCommitWord WRITE setAutoCommitWord NOTIFY autoCommitWordChanged)
- explicit WordCandidateListSettings(QObject *parent = 0);
+ explicit WordCandidateListSettings(QObject *parent = nullptr);
friend class VirtualKeyboardSettingsPrivate;
public: