diff options
| author | aneejit1 <aneejit1@gmail.com> | 2020-11-11 00:22:16 +0000 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-11-14 13:31:00 +0800 |
| commit | acc3790c3c38df02937fdfea6b97de2c622b3c0d (patch) | |
| tree | 298b95fab65d0ed107048b1d0a6940061de28e1e /src/qalculateconvertunitsdialog.cpp | |
| parent | ec5a7752bc558117da4ae0c181109cf67d888a51 (diff) | |
| download | qalculate-tde-acc3790c.tar.gz qalculate-tde-acc3790c.zip | |
Fix undeclared declarations of string/vector/list; prefix declarations with 'std::'
Signed-off-by: aneejit1 <aneejit1@gmail.com>
(cherry picked from commit 208f77024e5231bffa800964b1123cbde8fa3f29)
Diffstat (limited to 'src/qalculateconvertunitsdialog.cpp')
| -rw-r--r-- | src/qalculateconvertunitsdialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qalculateconvertunitsdialog.cpp b/src/qalculateconvertunitsdialog.cpp index 25336c4..dde95c3 100644 --- a/src/qalculateconvertunitsdialog.cpp +++ b/src/qalculateconvertunitsdialog.cpp @@ -20,6 +20,8 @@ #include "qalculateconvertunitsdialog.h" #include "qalculate_tde_utils.h" +#include <vector> +#include <string> #include <tqlabel.h> #include <klineedit.h> #include <tdelocale.h> @@ -34,7 +36,7 @@ #include <tqsplitter.h> extern tree_struct unit_cats; -extern vector<void*> ia_units; +extern std::vector<void*> ia_units; extern PrintOptions printops; extern EvaluationOptions evalops; @@ -183,7 +185,7 @@ void QalculateConvertUnitsDialog::categorySelected() { no_cat = true; } if(!b_all && !no_cat && selected_category[0] == '/') { - string str = selected_category.ascii(); + std::string str = selected_category.ascii(); str.erase(str.begin()); for(size_t i = 0; i < CALCULATOR->units.size(); i++) { if(CALCULATOR->units[i]->isActive() && !CALCULATOR->units[i]->isHidden() && CALCULATOR->units[i]->category().substr(0, selected_category.length() - 1) == str) { @@ -191,7 +193,7 @@ void QalculateConvertUnitsDialog::categorySelected() { } } } else { - string str = selected_category.ascii(); + std::string str = selected_category.ascii(); for(size_t i = 0; i < CALCULATOR->units.size(); i++) { if(CALCULATOR->units[i]->isActive() && !CALCULATOR->units[i]->isHidden() && (b_all || (no_cat && CALCULATOR->units[i]->category().empty()) || CALCULATOR->units[i]->category() == str)) { addUnitTreeItem(CALCULATOR->units[i]); |