diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-05 03:07:02 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 02:49:48 +0200 |
commit | 934ddb1cf13906e53fec3b6b072f0e45622290a7 (patch) | |
tree | 6eb7d9641f75e086b70e1527a181fa9c568249aa | |
parent | add TODO (diff) | |
download | core-934ddb1cf13906e53fec3b6b072f0e45622290a7.tar.gz core-934ddb1cf13906e53fec3b6b072f0e45622290a7.zip |
extract string typedefs to a shared file
Change-Id: I6e5d7c828f56b6a3f562ed8a9dd5f63a9d603ce0
-rw-r--r-- | onlineupdate/inc/types.hxx | 25 | ||||
-rw-r--r-- | onlineupdate/source/update/common/readstrings.h | 7 | ||||
-rw-r--r-- | onlineupdate/source/update/updater/archivereader.h | 7 | ||||
-rw-r--r-- | onlineupdate/source/update/updater/progressui.h | 3 |
4 files changed, 28 insertions, 14 deletions
diff --git a/onlineupdate/inc/types.hxx b/onlineupdate/inc/types.hxx new file mode 100644 index 000000000000..3e83a19c7d78 --- /dev/null +++ b/onlineupdate/inc/types.hxx @@ -0,0 +1,25 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_ONLINEUPDATE_TYPES_HXX +#define INCLUDED_ONLINEUPDATE_TYPES_HXX + +#include <string> + +#if defined(_WIN32) +typedef std::wstring tstring; +typedef WCHAR NS_tchar; +#else +typedef std::string tstring; +typedef char NS_tchar; +#endif + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/onlineupdate/source/update/common/readstrings.h b/onlineupdate/source/update/common/readstrings.h index bc837ef326b5..747081394c10 100644 --- a/onlineupdate/source/update/common/readstrings.h +++ b/onlineupdate/source/update/common/readstrings.h @@ -11,14 +11,9 @@ #ifdef _WIN32 # include <windows.h> -typedef WCHAR NS_tchar; -#else -typedef char NS_tchar; #endif -#ifndef NULL -#define NULL 0 -#endif +#include "types.hxx" struct StringTable { diff --git a/onlineupdate/source/update/updater/archivereader.h b/onlineupdate/source/update/updater/archivereader.h index 9b7885dc0103..090b787f9cf5 100644 --- a/onlineupdate/source/update/updater/archivereader.h +++ b/onlineupdate/source/update/updater/archivereader.h @@ -9,12 +9,7 @@ #include <stdio.h> #include <onlineupdate/mar.h> - -#ifdef _WIN32 -typedef WCHAR NS_tchar; -#else -typedef char NS_tchar; -#endif +#include "types.hxx" // This class provides an API to extract files from an update archive. class ArchiveReader diff --git a/onlineupdate/source/update/updater/progressui.h b/onlineupdate/source/update/updater/progressui.h index 455ae125180a..cb1468d3949c 100644 --- a/onlineupdate/source/update/updater/progressui.h +++ b/onlineupdate/source/update/updater/progressui.h @@ -8,12 +8,11 @@ #define PROGRESSUI_H__ #include "updatedefines.h" +#include "types.hxx" #if defined(_WIN32) -typedef WCHAR NS_tchar; #define NS_main wmain #else -typedef char NS_tchar; #define NS_main main #endif |