diff --git a/TTKCommon/TTKLibrary/ttkdesktopwrapper.cpp b/TTKCommon/TTKLibrary/ttkdesktopwrapper.cpp index e6a4a75..9f6f27f 100644 --- a/TTKCommon/TTKLibrary/ttkdesktopwrapper.cpp +++ b/TTKCommon/TTKLibrary/ttkdesktopwrapper.cpp @@ -9,7 +9,7 @@ QRect TTKDesktopWrapper::screenGeometry(int index) { #if TTK_QT_VERSION_CHECK(5,0,0) - const QList &screens = QApplication::screens(); + const QList &screens = QApplication::screens(); return (index < 0 || index >= screens.count()) ? QRect() : screens[index]->geometry(); #else QDesktopWidget *widget = QApplication::desktop(); @@ -20,7 +20,7 @@ QRect TTKDesktopWrapper::screenGeometry(int index) QRect TTKDesktopWrapper::geometry() { #if TTK_QT_VERSION_CHECK(5,0,0) - const QList &screens = QApplication::screens(); + const QList &screens = QApplication::screens(); QRegion virtualGeometry; for(int i = 0; i < screens.count(); ++i) { diff --git a/TTKCommon/TTKLibrary/ttksuperenum.cpp b/TTKCommon/TTKLibrary/ttksuperenum.cpp index 847a4b0..2f64298 100644 --- a/TTKCommon/TTKLibrary/ttksuperenum.cpp +++ b/TTKCommon/TTKLibrary/ttksuperenum.cpp @@ -40,11 +40,11 @@ int TTKSuperEnum::stringToKey(const QString &name) const return TTKSuperEnum::Null; } - for(auto itr = m_enumValue.begin(); itr != m_enumValue.end(); ++itr) + for(auto it = m_enumValue.begin(); it != m_enumValue.end(); ++it) { - if(itr->second == name) + if(it->second == name) { - return itr->first; + return it->first; } } return TTKSuperEnum::Null; diff --git a/TTKModule/TTKCore/ocrCoreKits/ocrbackgroundmanager.h b/TTKModule/TTKCore/ocrCoreKits/ocrbackgroundmanager.h index 0ec7fb6..250d10f 100644 --- a/TTKModule/TTKCore/ocrCoreKits/ocrbackgroundmanager.h +++ b/TTKModule/TTKCore/ocrCoreKits/ocrbackgroundmanager.h @@ -79,7 +79,7 @@ class TTK_MODULE_EXPORT OCRBackgroundManager : public QObject QColor m_skinColor; QStringList m_photos; - QList m_observer; + QObjectList m_observer; QString m_background; DECLARE_SINGLETON_CLASS(OCRBackgroundManager)