[PR #717] [MERGED] lib/platform: Use std::string directly instead of String typedef #1687

New issue

Closed

opened 2026-05-05 07:59:27 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 07:59:27 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/debauchee/barrier/pull/717
Author: @p12tic
Created: 5/30/2020
Status: ✅ Merged
Merged: 5/30/2020
Merged by: @shymega

Base: master ← Head: use-std-string

📝 Commits (2)

a626f24 lib/net: Add missing include
5eafd30 lib/platform: Use std::string directly instead of String typedef

📊 Changes

58 files changed (+275 additions, -358 deletions)

View changed files

📝 src/lib/net/IDataSocket.h (+1 -0)
📝 src/lib/platform/MSWindowsClipboard.cpp (+4 -5)
📝 src/lib/platform/MSWindowsClipboard.h (+7 -7)
📝 src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp (+9 -15)
📝 src/lib/platform/MSWindowsClipboardAnyTextConverter.h (+7 -7)
📝 src/lib/platform/MSWindowsClipboardBitmapConverter.cpp (+5 -7)
📝 src/lib/platform/MSWindowsClipboardBitmapConverter.h (+2 -2)
📝 src/lib/platform/MSWindowsClipboardHTMLConverter.cpp (+19 -22)
📝 src/lib/platform/MSWindowsClipboardHTMLConverter.h (+3 -3)
📝 src/lib/platform/MSWindowsClipboardTextConverter.cpp (+5 -7)
📝 src/lib/platform/MSWindowsClipboardTextConverter.h (+2 -2)
📝 src/lib/platform/MSWindowsClipboardUTF16Converter.cpp (+5 -7)
📝 src/lib/platform/MSWindowsClipboardUTF16Converter.h (+2 -2)
📝 src/lib/platform/MSWindowsDesks.cpp (+5 -7)
📝 src/lib/platform/MSWindowsDesks.h (+6 -6)
📝 src/lib/platform/MSWindowsKeyState.h (+0 -1)
📝 src/lib/platform/MSWindowsScreen.cpp (+5 -8)
📝 src/lib/platform/MSWindowsScreen.h (+4 -5)
📝 src/lib/platform/MSWindowsScreenSaver.h (+0 -1)
📝 src/lib/platform/MSWindowsSession.cpp (+2 -3)

...and 38 more files

📄 Description

Having a String typedef that points to std::string does not serve any benefit and is just confusing. This PR should not result in any functionality changes, I would expect the produced binary to be exactly the same.

This PR also fixes a build problem on master due to missing include which got introduced due to interaction of all of these PRs that have been submitted.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/debauchee/barrier/pull/717 **Author:** [@p12tic](https://github.com/p12tic) **Created:** 5/30/2020 **Status:** ✅ Merged **Merged:** 5/30/2020 **Merged by:** [@shymega](https://github.com/shymega) **Base:** `master` ← **Head:** `use-std-string` --- ### 📝 Commits (2) - [`a626f24`](https://github.com/debauchee/barrier/commit/a626f245a97d7776eae22f64295bf8c0f5d20980) lib/net: Add missing include - [`5eafd30`](https://github.com/debauchee/barrier/commit/5eafd30de423f79fab56ba042b4c18b545bda75a) lib/platform: Use std::string directly instead of String typedef ### 📊 Changes **58 files changed** (+275 additions, -358 deletions) <details> <summary>View changed files</summary> 📝 `src/lib/net/IDataSocket.h` (+1 -0) 📝 `src/lib/platform/MSWindowsClipboard.cpp` (+4 -5) 📝 `src/lib/platform/MSWindowsClipboard.h` (+7 -7) 📝 `src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp` (+9 -15) 📝 `src/lib/platform/MSWindowsClipboardAnyTextConverter.h` (+7 -7) 📝 `src/lib/platform/MSWindowsClipboardBitmapConverter.cpp` (+5 -7) 📝 `src/lib/platform/MSWindowsClipboardBitmapConverter.h` (+2 -2) 📝 `src/lib/platform/MSWindowsClipboardHTMLConverter.cpp` (+19 -22) 📝 `src/lib/platform/MSWindowsClipboardHTMLConverter.h` (+3 -3) 📝 `src/lib/platform/MSWindowsClipboardTextConverter.cpp` (+5 -7) 📝 `src/lib/platform/MSWindowsClipboardTextConverter.h` (+2 -2) 📝 `src/lib/platform/MSWindowsClipboardUTF16Converter.cpp` (+5 -7) 📝 `src/lib/platform/MSWindowsClipboardUTF16Converter.h` (+2 -2) 📝 `src/lib/platform/MSWindowsDesks.cpp` (+5 -7) 📝 `src/lib/platform/MSWindowsDesks.h` (+6 -6) 📝 `src/lib/platform/MSWindowsKeyState.h` (+0 -1) 📝 `src/lib/platform/MSWindowsScreen.cpp` (+5 -8) 📝 `src/lib/platform/MSWindowsScreen.h` (+4 -5) 📝 `src/lib/platform/MSWindowsScreenSaver.h` (+0 -1) 📝 `src/lib/platform/MSWindowsSession.cpp` (+2 -3) _...and 38 more files_ </details> ### 📄 Description Having a `String` typedef that points to `std::string` does not serve any benefit and is just confusing. This PR should not result in any functionality changes, I would expect the produced binary to be exactly the same. This PR also fixes a build problem on master due to missing include which got introduced due to interaction of all of these PRs that have been submitted. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>