Diffstat (limited to 'noncore/apps/opie-sheet/sheet.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-sheet/sheet.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/apps/opie-sheet/sheet.h b/noncore/apps/opie-sheet/sheet.h index f78a684..f4e9d38 100644 --- a/noncore/apps/opie-sheet/sheet.h +++ b/noncore/apps/opie-sheet/sheet.h @@ -38,35 +38,37 @@ class Sheet: public QTable { Q_OBJECT // Variables bool clicksLocked; int selectionNo; typeCellBorders defaultBorders; typeCellData defaultCellData; // QT objects QList<typeCellData> sheetData, clipboardData; QString pressedCell, releasedCell, sheetName; + QStringList listDataParser; // Private functions int getOperatorPriority(char oper); bool findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE); + QString findCellName(int row, int col); bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2); double calculateVariable(const QString &variable); double calculateFunction(const QString &function, const QString ¶meters); QChar popCharStack(QStack<QChar> *stackChars); QString popStringStack(QStack<QString> *stackStrings); QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); - QString dataParser(const QString &data); + QString dataParser(const QString &cell, const QString &data); QString dataParserHelper(const QString &data); typeCellData *createCellData(int row, int col); typeCellData *findCellData(int row, int col); void pushCharStack(QStack<QChar> *stackChars, const QChar &character); void pushStringStack(QStack<QString> *stackStrings, const QString &string); // Sheet/Qt parser functions double functionSum(const QString ¶m1, const QString ¶m2); double functionAvg(const QString ¶m1, const QString ¶m2); double functionMax(const QString ¶m1, const QString ¶m2); double functionMin(const QString ¶m1, const QString ¶m2); double functionCount(const QString ¶m1, const QString ¶m2); |