summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-05-25 22:35:51 (UTC)
committer mickeyl <mickeyl>2006-05-25 22:35:51 (UTC)
commit7cfd27c0f29c6d7e2b90ce718d762433b82c1fe3 (patch) (unidiff)
tree817b7d3383348b4654c63b216c31de71e73ef6c9
parentdebf4dfe9a9ca9103aa9f8fa2db5f0b5fed08952 (diff)
downloadopie-7cfd27c0f29c6d7e2b90ce718d762433b82c1fe3.zip
opie-7cfd27c0f29c6d7e2b90ce718d762433b82c1fe3.tar.gz
opie-7cfd27c0f29c6d7e2b90ce718d762433b82c1fe3.tar.bz2
g++ 4.1.1 fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/infowin.h2
-rw-r--r--noncore/apps/opie-sheet/sheet.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/apps/opie-reader/infowin.h b/noncore/apps/opie-reader/infowin.h
index 6f0fb99..c003998 100644
--- a/noncore/apps/opie-reader/infowin.h
+++ b/noncore/apps/opie-reader/infowin.h
@@ -1,39 +1,39 @@
1#ifndef __INFOWIN_H 1#ifndef __INFOWIN_H
2#define __INFOWIN_H 2#define __INFOWIN_H
3 3
4#include <qlabel.h> 4#include <qlabel.h>
5class QString; 5class QString;
6class QMultiLineEdit; 6class QMultiLineEdit;
7 7
8class infowin : public QWidget 8class infowin : public QWidget
9{ 9{
10Q_OBJECT 10Q_OBJECT
11 QLabel* fileSize; 11 QLabel* fileSize;
12 QLabel* textSize; 12 QLabel* textSize;
13 QLabel* ratio; 13 QLabel* ratio;
14 QLabel* location; 14 QLabel* location;
15 QLabel* read; 15 QLabel* read;
16 QLabel* docread; 16 QLabel* docread;
17 QLabel* docSize; 17 QLabel* docSize;
18 QLabel* docLocation; 18 QLabel* docLocation;
19 QLabel* zoom; 19 QLabel* zoom;
20 QMultiLineEdit* aboutbox; 20 QMultiLineEdit* aboutbox;
21public: 21public:
22 infowin::infowin( QWidget *parent=0, const char *name=0, WFlags f = 0); 22 infowin( QWidget *parent=0, const char *name=0, WFlags f = 0);
23 void setFileSize(int sz) { fileSize->setNum(sz); } 23 void setFileSize(int sz) { fileSize->setNum(sz); }
24 void setTextSize(int sz) { textSize->setNum(sz); } 24 void setTextSize(int sz) { textSize->setNum(sz); }
25 void setRatio(int sz) { ratio->setText(QString().setNum(sz)+"%"); } 25 void setRatio(int sz) { ratio->setText(QString().setNum(sz)+"%"); }
26 void setLocation(int sz) { location->setNum(sz); } 26 void setLocation(int sz) { location->setNum(sz); }
27 void setRead(int sz) { read->setText(QString().setNum(sz)+"%"); } 27 void setRead(int sz) { read->setText(QString().setNum(sz)+"%"); }
28 void setDocRead(int sz) { docread->setText(QString().setNum(sz)+"%"); } 28 void setDocRead(int sz) { docread->setText(QString().setNum(sz)+"%"); }
29 void setZoom(int sz) { zoom->setText(QString().setNum(sz)+"%"); } 29 void setZoom(int sz) { zoom->setText(QString().setNum(sz)+"%"); }
30 void setDocSize(int sz) { docSize->setNum(sz); } 30 void setDocSize(int sz) { docSize->setNum(sz); }
31 void setDocLocation(int sz) { docLocation->setNum(sz); } 31 void setDocLocation(int sz) { docLocation->setNum(sz); }
32 void setAbout(const QString& s); 32 void setAbout(const QString& s);
33private slots: 33private slots:
34 void infoClose() { emit Close(); } 34 void infoClose() { emit Close(); }
35 signals: 35 signals:
36 void Close(); 36 void Close();
37}; 37};
38 38
39#endif 39#endif
diff --git a/noncore/apps/opie-sheet/sheet.h b/noncore/apps/opie-sheet/sheet.h
index 92c8061..8938511 100644
--- a/noncore/apps/opie-sheet/sheet.h
+++ b/noncore/apps/opie-sheet/sheet.h
@@ -73,49 +73,49 @@ public:
73 QArray<int> ArgsOfFunc; 73 QArray<int> ArgsOfFunc;
74 int FuncDepth; 74 int FuncDepth;
75 bool ErrorFound; 75 bool ErrorFound;
76 int n; // holds the current parser position 76 int n; // holds the current parser position
77 QString chunk; // the piece in the parser we are on 77 QString chunk; // the piece in the parser we are on
78 int SymbGroup; // the current type 78 int SymbGroup; // the current type
79 79
80 QString InExpr; 80 QString InExpr;
81 81
82 QChar chunk0(void); // retunrs the first char of expression; 82 QChar chunk0(void); // retunrs the first char of expression;
83 Expression(QString expr1);// constructor 83 Expression(QString expr1);// constructor
84 84
85 bool isSymbol(QChar ch); 85 bool isSymbol(QChar ch);
86 bool isMathSymbol(QChar ch); 86 bool isMathSymbol(QChar ch);
87 void GetNext(); 87 void GetNext();
88 void First(); 88 void First();
89 void Third(); 89 void Third();
90 void Fourth(); 90 void Fourth();
91 void Fifth(); 91 void Fifth();
92 void Sixth(); 92 void Sixth();
93 void Seventh(); 93 void Seventh();
94 void Eighth(); 94 void Eighth();
95 void Ninth(); 95 void Ninth();
96 96
97 bool Expression::Parse(); //parses the expression in RPN format; 97 bool Parse(); //parses the expression in RPN format;
98 98
99}; 99};
100 100
101 101
102 102
103class Sheet: public QTable 103class Sheet: public QTable
104{ 104{
105 Q_OBJECT 105 Q_OBJECT
106 106
107 // Variables 107 // Variables
108 bool clicksLocked; 108 bool clicksLocked;
109 int selectionNo; 109 int selectionNo;
110 typeCellBorders defaultBorders; 110 typeCellBorders defaultBorders;
111 typeCellData defaultCellData; 111 typeCellData defaultCellData;
112 112
113 // QT objects 113 // QT objects
114 QList<typeCellData> sheetData, clipboardData; 114 QList<typeCellData> sheetData, clipboardData;
115 QString pressedCell, releasedCell, sheetName; 115 QString pressedCell, releasedCell, sheetName;
116 QStringList listDataParser; 116 QStringList listDataParser;
117 117
118 // Private functions 118 // Private functions
119 bool findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE); 119 bool findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE);
120 QString findCellName(int row, int col); 120 QString findCellName(int row, int col);
121 bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2); 121 bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2);