diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-28 18:03:09 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-28 18:03:09 +0000 |
commit | 98d15d90b6a83e2df32d678013847e18b8a8c7e8 (patch) | |
tree | 02a588c0979fe1a40ae6216d1f831bb24de91a9f /katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h | |
parent | e0974f69b7603e3d8f2d936301e05535af25346e (diff) | |
download | katapult-98d15d90b6a83e2df32d678013847e18b8a8c7e8.tar.gz katapult-98d15d90b6a83e2df32d678013847e18b8a8c7e8.zip |
TQt4 port Katapult
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/katapult@1233929 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h')
-rw-r--r-- | katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h index 88f03cc..e5f7d00 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h @@ -25,15 +25,15 @@ #include <kgenericfactory.h> -#include <qmap.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qvaluevector.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqvaluevector.h> #include "expression.h" #include "katapultcatalog.h" -class QWidget; +class TQWidget; typedef double (*FunPtr)(double); @@ -43,6 +43,7 @@ typedef double (*FunPtr)(double); class CalculatorCatalog : public KatapultCatalog { Q_OBJECT + TQ_OBJECT public: @@ -59,13 +60,13 @@ class CalculatorCatalog : public KatapultCatalog FunPtr fptr; }; - CalculatorCatalog(QObject*, const char*, const QStringList&); + CalculatorCatalog(TQObject*, const char*, const TQStringList&); virtual ~CalculatorCatalog(); //virtual void initialize(); virtual void readSettings(KConfigBase*); virtual void writeSettings(KConfigBase*); - virtual QWidget* configure(); + virtual TQWidget* configure(); int getVarID(const char*); double getVar(int) const; @@ -75,7 +76,7 @@ class CalculatorCatalog : public KatapultCatalog bool scientific() const; bool degrees() const; bool clipboard() const; - QString formatString() const; + TQString formatString() const; const Function* functionTable() const; protected: @@ -84,26 +85,26 @@ class CalculatorCatalog : public KatapultCatalog private: - typedef QMap<QString, int> VarNameToIdMap; - typedef QValueVector<double> VarIdToValueVector; + typedef TQMap<TQString, int> VarNameToIdMap; + typedef TQValueVector<double> VarIdToValueVector; static const Function radiansFunctionTable[]; static const Function degreesFunctionTable[]; void reset(); - bool accepts(const QString&) const; + bool accepts(const TQString&) const; Expression _result; // The one result (there's always one). VarNameToIdMap varNameToId; // Maps strings to IDs. VarIdToValueVector varIdToValue; // Maps IDs to values. - QString _pendingVarName; // Pending while rest of assignment is parsed. + TQString _pendingVarName; // Pending while rest of assignment is parsed. int _fracDigits; // Number of fractional digits. bool _bScientific; // Normal or scientific mode? bool _bDegrees; // Radians or degrees? bool _bClipboard; // Copy to clipboard? - QString _formatString; // for clipboard copy + TQString _formatString; // for clipboard copy private slots: @@ -111,7 +112,7 @@ class CalculatorCatalog : public KatapultCatalog void scientificChanged(bool); void degreesChanged(bool); void clipboardChanged(bool); - void formatStringChanged(const QString&); + void formatStringChanged(const TQString&); }; |