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/qalculatevariablesdialog.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/qalculatevariablesdialog.cpp')
| -rw-r--r-- | src/qalculatevariablesdialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qalculatevariablesdialog.cpp b/src/qalculatevariablesdialog.cpp index 57e07ea..86ec001 100644 --- a/src/qalculatevariablesdialog.cpp +++ b/src/qalculatevariablesdialog.cpp @@ -23,6 +23,8 @@ #include "qalculateeditmatrixvectordialog.h" #include "qalculateeditunknownvariabledialog.h" #include "qalculateexportcsvdialog.h" +#include <vector> +#include <string> #include <kpushbutton.h> #include <tqsplitter.h> #include <tqvbox.h> @@ -35,7 +37,7 @@ #include <kstdguiitem.h> extern tree_struct variable_cats; -extern vector<void*> ia_variables; +extern std::vector<void*> ia_variables; QalculateVariablesDialog::QalculateVariablesDialog(TQWidget *parent, const char *name) : KDialog(parent, name, false) { @@ -467,7 +469,7 @@ void QalculateVariablesDialog::categorySelected() { b_inactive = true; } if(!b_all && !no_cat && !b_inactive && 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->variables.size(); i++) { if(CALCULATOR->variables[i]->isActive() && CALCULATOR->variables[i]->category().substr(0, selected_category.length() - 1) == str) { @@ -475,7 +477,7 @@ void QalculateVariablesDialog::categorySelected() { } } } else { - string str = selected_category.ascii(); + std::string str = selected_category.ascii(); for(size_t i = 0; i < CALCULATOR->variables.size(); i++) { if((b_inactive && !CALCULATOR->variables[i]->isActive()) || (CALCULATOR->variables[i]->isActive() && (b_all || (no_cat && CALCULATOR->variables[i]->category().empty()) || (!b_inactive && CALCULATOR->variables[i]->category() == str)))) { addVariableTreeItem(CALCULATOR->variables[i]); |