diff options
Diffstat (limited to 'src/qalculateunitsdialog.cpp')
| -rw-r--r-- | src/qalculateunitsdialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qalculateunitsdialog.cpp b/src/qalculateunitsdialog.cpp index 8710f2f..c5c74e1 100644 --- a/src/qalculateunitsdialog.cpp +++ b/src/qalculateunitsdialog.cpp @@ -20,6 +20,8 @@ #include "qalculateunitsdialog.h" #include "qalculate_tde_utils.h" #include "qalculateeditunitdialog.h" +#include <vector> +#include <string> #include <kpushbutton.h> #include <tqsplitter.h> #include <tqvbox.h> @@ -37,7 +39,7 @@ #include <kstdguiitem.h> extern tree_struct unit_cats; -extern vector<void*> ia_units; +extern std::vector<void*> ia_units; extern PrintOptions printops; extern EvaluationOptions evalops; @@ -421,7 +423,7 @@ void QalculateUnitsDialog::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->units.size(); i++) { if(CALCULATOR->units[i]->isActive() && CALCULATOR->units[i]->category().substr(0, selected_category.length() - 1) == str) { @@ -429,7 +431,7 @@ void QalculateUnitsDialog::categorySelected() { } } } else { - string str = selected_category.ascii(); + std::string str = selected_category.ascii(); for(size_t i = 0; i < CALCULATOR->units.size(); i++) { if((b_inactive && !CALCULATOR->units[i]->isActive()) || (CALCULATOR->units[i]->isActive() && (b_all || (no_cat && CALCULATOR->units[i]->category().empty()) || (!b_inactive && CALCULATOR->units[i]->category() == str)))) { addUnitTreeItem(CALCULATOR->units[i]); |