ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: switched to using wstring for compiler flags

Browse Source 
* removed getter for strings from QtDirectoryListBox because it is not used anymore
* regard encoding of clang error messages
This commit is contained in:
mlangkabel
2018-02-09 13:37:30 +01:00
parent 9773c30fdc
commit 333fc7eea2
25 changed files with 250 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtDirectoryListBox.cpp
+4 -24
View File
@@ -240,7 +240,7 @@ void QtDirectoryListBox::dropEvent(QDropEvent *event)
std::vector<FilePath> QtDirectoryListBox::getList()
{
std::vector<FilePath> list;
for (const std::wstring& s : getWStringList())
for (const std::wstring& s : getStringList())
{
list.push_back(FilePath(s));
}
@@ -254,10 +254,10 @@ void QtDirectoryListBox::setList(const std::vector<FilePath>& list, bool readOnl
{
strList.push_back(path.wstr());
}
setWStringList(strList, readOnly);
setStringList(strList, readOnly);
}
std::vector<std::wstring> QtDirectoryListBox::getWStringList()
std::vector<std::wstring> QtDirectoryListBox::getStringList()
{
std::vector<std::wstring> list;
for (int i = 0; i < m_list->count(); ++i)
@@ -268,7 +268,7 @@ std::vector<std::wstring> QtDirectoryListBox::getWStringList()
return list;
}
void QtDirectoryListBox::setWStringList(const std::vector<std::wstring>& list, bool readOnly)
void QtDirectoryListBox::setStringList(const std::vector<std::wstring>& list, bool readOnly)
{
clear();
@@ -285,26 +285,6 @@ void QtDirectoryListBox::setWStringList(const std::vector<std::wstring>& list, b
m_relativeRootDirectory = root;
}
std::vector<std::string> QtDirectoryListBox::getStringList()
{
std::vector<std::string> list;
for (std::wstring s: getWStringList())
{
list.push_back(utility::encodeToUtf8(s));
}
return list;
}
void QtDirectoryListBox::setStringList(const std::vector<std::string>& list, bool readOnly)
{
std::vector<std::wstring> wlist;
for (std::string s : list)
{
wlist.push_back(utility::decodeFromUtf8(s));
}
setWStringList(wlist);
}
QtListItemWidget* QtDirectoryListBox::addListBoxItemWithText(const QString& text)
{
QtListItemWidget* widget = addListBoxItem();
src/lib_gui/qt/element/QtDirectoryListBox.h
+2 -5
View File
@@ -59,11 +59,8 @@ public:
std::vector<FilePath> getList();
void setList(const std::vector<FilePath>& list, bool readOnly = false);
std::vector<std::wstring> getWStringList();
void setWStringList(const std::vector<std::wstring>& list, bool readOnly = false);
std::vector<std::string> getStringList();
void setStringList(const std::vector<std::string>& list, bool readOnly = false);
std::vector<std::wstring> getStringList();
void setStringList(const std::vector<std::wstring>& list, bool readOnly = false);
QtListItemWidget* addListBoxItemWithText(const QString& text);