summaryrefslogtreecommitdiffstats
path: root/src/qalculatefunctionsdialog.cpp
diff options
context:
space:
mode:
authoraneejit1 <aneejit1@gmail.com>2020-11-11 00:22:16 +0000
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-11-14 13:31:00 +0800
commitacc3790c3c38df02937fdfea6b97de2c622b3c0d (patch)
tree298b95fab65d0ed107048b1d0a6940061de28e1e /src/qalculatefunctionsdialog.cpp
parentec5a7752bc558117da4ae0c181109cf67d888a51 (diff)
downloadqalculate-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/qalculatefunctionsdialog.cpp')
-rw-r--r--src/qalculatefunctionsdialog.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qalculatefunctionsdialog.cpp b/src/qalculatefunctionsdialog.cpp
index 4bb53bf..d60c9be 100644
--- a/src/qalculatefunctionsdialog.cpp
+++ b/src/qalculatefunctionsdialog.cpp
@@ -20,6 +20,8 @@
#include "qalculatefunctionsdialog.h"
#include "qalculate_tde_utils.h"
#include "qalculateeditfunctiondialog.h"
+#include <vector>
+#include <string>
#include <kpushbutton.h>
#include <tqsplitter.h>
#include <tqvbox.h>
@@ -33,7 +35,7 @@
#include <kstdguiitem.h>
extern tree_struct function_cats;
-extern vector<void*> ia_functions;
+extern std::vector<void*> ia_functions;
extern PrintOptions printops;
QalculateFunctionsDialog::QalculateFunctionsDialog(TQWidget *parent, const char *name) : KDialog(parent, name, false) {
@@ -510,7 +512,7 @@ void QalculateFunctionsDialog::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->functions.size(); i++) {
if(CALCULATOR->functions[i]->isActive() && CALCULATOR->functions[i]->category().substr(0, selected_category.length() - 1) == str) {
@@ -518,7 +520,7 @@ void QalculateFunctionsDialog::categorySelected() {
}
}
} else {
- string str = selected_category.ascii();
+ std::string str = selected_category.ascii();
for(size_t i = 0; i < CALCULATOR->functions.size(); i++) {
if((b_inactive && !CALCULATOR->functions[i]->isActive()) || (CALCULATOR->functions[i]->isActive() && (b_all || (no_cat && CALCULATOR->functions[i]->category().empty()) || (!b_inactive && CALCULATOR->functions[i]->category() == str)))) {
addFunctionTreeItem(CALCULATOR->functions[i]);