diff options
| author | George Hazan <ghazan@miranda.im> | 2021-12-26 17:06:04 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-12-26 17:06:04 +0300 |
| commit | 1039b2829a264280493ba0fa979214fe024dc70c (patch) | |
| tree | 8fa6a60eb46627582c372b56a4a1d4754d6732c3 /plugins/Import/src | |
| parent | 62a186697df33c96dc1a6dac0f4dfc38652fb96f (diff) | |
WORD -> uint16_t
Diffstat (limited to 'plugins/Import/src')
| -rw-r--r-- | plugins/Import/src/dbrw/dbevents.cpp | 2 | ||||
| -rw-r--r-- | plugins/Import/src/dbrw/dbsettings.cpp | 4 | ||||
| -rw-r--r-- | plugins/Import/src/patterns.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Import/src/dbrw/dbevents.cpp b/plugins/Import/src/dbrw/dbevents.cpp index fb7f3c66bd..59dccc99ce 100644 --- a/plugins/Import/src/dbrw/dbevents.cpp +++ b/plugins/Import/src/dbrw/dbevents.cpp @@ -82,7 +82,7 @@ STDMETHODIMP_(BOOL) CDbxSQLite::GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbei) dbei->timestamp = (DWORD)sqlite3_column_int(stmt, 1); dbei->flags = (DWORD)sqlite3_column_int(stmt, 2); - dbei->eventType = (WORD)sqlite3_column_int(stmt, 3); + dbei->eventType = (uint16_t)sqlite3_column_int(stmt, 3); dbei->szModule = mir_strdup((char*)sqlite3_column_text(stmt, 7)); DWORD cbBlob = sqlite3_column_int(stmt, 5); diff --git a/plugins/Import/src/dbrw/dbsettings.cpp b/plugins/Import/src/dbrw/dbsettings.cpp index ba9703b127..1002a8ff60 100644 --- a/plugins/Import/src/dbrw/dbsettings.cpp +++ b/plugins/Import/src/dbrw/dbsettings.cpp @@ -100,7 +100,7 @@ STDMETHODIMP_(BOOL) CDbxSQLite::GetContactSettingWorker(MCONTACT contactID, LPCS dbv->bVal = (uint8_t)sqlite3_column_int(set_stmts_prep[SQL_SET_STMT_READ], 1); break; case DBVT_WORD: - dbv->wVal = (WORD)sqlite3_column_int(set_stmts_prep[SQL_SET_STMT_READ], 1); + dbv->wVal = (uint16_t)sqlite3_column_int(set_stmts_prep[SQL_SET_STMT_READ], 1); break; case DBVT_DWORD: dbv->dVal = (DWORD)sqlite3_column_int(set_stmts_prep[SQL_SET_STMT_READ], 1); @@ -130,7 +130,7 @@ STDMETHODIMP_(BOOL) CDbxSQLite::GetContactSettingWorker(MCONTACT contactID, LPCS if (!isStatic) dbv->pbVal = (uint8_t*)mir_alloc(copylen); memcpy(dbv->pbVal, sqlite3_column_blob(set_stmts_prep[SQL_SET_STMT_READ], 1), copylen); - dbv->cpbVal = (WORD)copylen; + dbv->cpbVal = (uint16_t)copylen; } else { dbv = 0; diff --git a/plugins/Import/src/patterns.cpp b/plugins/Import/src/patterns.cpp index eda1d988c8..0d6a40938d 100644 --- a/plugins/Import/src/patterns.cpp +++ b/plugins/Import/src/patterns.cpp @@ -532,7 +532,7 @@ public: T2Utf value(dbcwWork.value.pwszVal); dbcwWork.value.pszVal = NEWSTR_ALLOCA(value); dbcwWork.value.type = DBVT_UTF8; - dbcwWork.value.cchVal = (WORD)strlen(dbcwWork.value.pszVal); + dbcwWork.value.cchVal = (uint16_t)strlen(dbcwWork.value.pszVal); } char* cachedSettingName = m_cache->GetCachedSetting(dbcwWork.szModule, dbcwWork.szSetting, mir_strlen(dbcwWork.szModule), mir_strlen(dbcwWork.szSetting)); |