diff options
Diffstat (limited to 'katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp')
| -rw-r--r-- | katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index c3c5f6d..2781cd2 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -28,10 +28,10 @@ #include <knuminput.h> #include <kcombobox.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qregexp.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqregexp.h> #include <math.h> @@ -127,7 +127,7 @@ const CalculatorCatalog::Function CalculatorCatalog::degreesFunctionTable[] = K_EXPORT_COMPONENT_FACTORY( katapult_calculatorcatalog, KGenericFactory<CalculatorCatalog>( "katapult_calculatorcatalog" ) ) -CalculatorCatalog::CalculatorCatalog(QObject*, const char*, const QStringList&): _result(this, QString::null) +CalculatorCatalog::CalculatorCatalog(TQObject*, const char*, const TQStringList&): _result(this, TQString()) { ActionRegistry::self()->registerAction(new ActionEvaluateExpression()); @@ -141,8 +141,8 @@ CalculatorCatalog::~CalculatorCatalog() void CalculatorCatalog::queryChanged() { - int newStatus = 0; - QString cmd = query(); + int newtqStatus = 0; + TQString cmd = query(); if (cmd.isEmpty()) { reset(); @@ -154,10 +154,10 @@ void CalculatorCatalog::queryChanged() cmd = cmd.lower(); for (i = length - 1; i >= 0 && cmd[i].isLetter(); --i) { } if (i != length - 1) { - QString start = cmd.mid(i + 1); + TQString start = cmd.mid(i + 1); int lengthOfShortest = 9999, shortest = -1; for (int j = 0; radiansFunctionTable[j].name; ++j) { - if (QString(radiansFunctionTable[j].name).startsWith(start)) { + if (TQString(radiansFunctionTable[j].name).startsWith(start)) { if (radiansFunctionTable[j].length < lengthOfShortest) { lengthOfShortest = radiansFunctionTable[j].length; shortest = j; @@ -170,7 +170,7 @@ void CalculatorCatalog::queryChanged() } } //fix parse errors at end of expression, - //ie. close open parentheses, convert operators into NOPs + //ie. close open tqparentheses, convert operators into NOPs for (i = length - 1; i >= 0 && (cmd[i] == '(' || cmd[i] == ' '); --i) { } if (i < 0 || cmd[i] == '+' || cmd[i] == '-') { cmd.append("0"); @@ -203,31 +203,31 @@ void CalculatorCatalog::queryChanged() //set status. //add S_Multiple to make sure katapult doesn't auto-exec and close the window //add S_Active to make sure katapult doesn't start the hideTimer or clearTimer - newStatus = S_HasResults | S_Multiple | S_Active; + newtqStatus = S_HasResults | S_Multiple | S_Active; } else { - newStatus = 0; + newtqStatus = 0; } } - setStatus(newStatus); + settqStatus(newtqStatus); } void CalculatorCatalog::reset() { - _result.setText(QString::null); + _result.setText(TQString()); } -bool CalculatorCatalog::accepts(const QString& str) const +bool CalculatorCatalog::accepts(const TQString& str) const { //Heuristic to determine whether the string is an expression or not. //Accept anything containing [()+\\-/*^=.,0-9]. - return QRegExp("[()+\\-/*^=.,0-9]").search(str) >= 0; + return TQRegExp("[()+\\-/*^=.,0-9]").search(str) >= 0; } int CalculatorCatalog::getVarID(const char* name) { - VarNameToIdMap::iterator it = varNameToId.find(QString(name)); + VarNameToIdMap::iterator it = varNameToId.tqfind(TQString(name)); if (it == varNameToId.end()) { - _pendingVarName = QString(name); + _pendingVarName = TQString(name); return -1; } return *it; @@ -274,26 +274,26 @@ void CalculatorCatalog::writeSettings(KConfigBase* config) config->writeEntry("FormatString", formatString()); } -QWidget * CalculatorCatalog::configure() +TQWidget * CalculatorCatalog::configure() { CalculatorCatalogSettings* settings = new CalculatorCatalogSettings(); settings->fracDigits->setValue(_fracDigits); - connect(settings->fracDigits, SIGNAL(valueChanged(int)), this, SLOT(fracDigitsChanged(int))); + connect(settings->fracDigits, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(fracDigitsChanged(int))); settings->normal->setChecked(!scientific()); settings->scientific->setChecked(scientific()); - connect(settings->scientific, SIGNAL(toggled(bool)), this, SLOT(scientificChanged(bool))); + connect(settings->scientific, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(scientificChanged(bool))); settings->radians->setChecked(!degrees()); settings->degrees->setChecked(degrees()); - connect(settings->degrees, SIGNAL(toggled(bool)), this, SLOT(degreesChanged(bool))); + connect(settings->degrees, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(degreesChanged(bool))); settings->clipboard->setChecked(clipboard()); - connect(settings->clipboard, SIGNAL(toggled(bool)), this, SLOT(clipboardChanged(bool))); + connect(settings->clipboard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clipboardChanged(bool))); settings->formatString->setText(formatString()); - connect(settings->formatString, SIGNAL(textChanged(const QString&)), this, SLOT(formatStringChanged(const QString&))); + connect(settings->formatString, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(formatStringChanged(const TQString&))); return settings; } @@ -328,12 +328,12 @@ bool CalculatorCatalog::degrees() const return _bDegrees; } -void CalculatorCatalog::formatStringChanged(const QString& fmt) +void CalculatorCatalog::formatStringChanged(const TQString& fmt) { _formatString = fmt; } -QString CalculatorCatalog::formatString() const +TQString CalculatorCatalog::formatString() const { return _formatString; } |