Update of /cvsroot/tora/tora In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv956 Modified Files: NEWS tobackground.cpp tobackground.h tochartmanager.cpp tochartmanager.h todebug.cpp todebugtext.cpp todebugtext.h toeditextensions.cpp toeditextensions.h tohelp.cpp tohelp.h tohighlightedtext.cpp tolinechart.cpp tolinechart.h tomain.cpp tomain.h tooracleconnection.cpp toprofiler.cpp toqsqlconnection.cpp toreport.cpp toreport.h toresultcontent.cpp toresultcontent.h toresultitem.cpp toresultview.cpp toresultview.h torollback.cpp torollback.h tosqlparse.cpp tosqlparse.h tovisualize.cpp tovisualize.h towaitevents.cpp towaitevents.h toworksheet.cpp utils.cpp utils.h Log Message: apply patch 1186958 Index: toeditextensions.cpp =================================================================== RCS file: /cvsroot/tora/tora/toeditextensions.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** toeditextensions.cpp 19 Apr 2005 10:30:39 -0000 1.34 --- toeditextensions.cpp 21 Apr 2005 02:33:56 -0000 1.35 *************** *** 159,163 **** int chars = 0; int level = toSQLParse::countIndent(t, chars); ! res += toSQLParse::indentString(max(0, level + delta)); if (i < line2) res += t.mid(chars) + "\n"; --- 159,163 ---- int chars = 0; int level = toSQLParse::countIndent(t, chars); ! res += toSQLParse::indentString(std::max(0, level + delta)); if (i < line2) res += t.mid(chars) + "\n"; Index: tolinechart.cpp =================================================================== RCS file: /cvsroot/tora/tora/tolinechart.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** tolinechart.cpp 19 Apr 2005 10:30:41 -0000 1.49 --- tolinechart.cpp 21 Apr 2005 02:33:57 -0000 1.50 *************** *** 204,209 **** p2.setY(Chart.y() + Chart.height()); ! return QRect(min(p1.x(), p2.x()), ! min(p1.y(), p2.y()), abs(p1.x() - p2.x()), abs(p1.y() - p2.y())); --- 204,209 ---- p2.setY(Chart.y() + Chart.height()); ! return QRect(std::min(p1.x(), p2.x()), ! std::min(p1.y(), p2.y()), abs(p1.x() - p2.x()), abs(p1.y() - p2.y())); Index: tochartmanager.cpp =================================================================== RCS file: /cvsroot/tora/tora/tochartmanager.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tochartmanager.cpp 19 Apr 2005 10:30:38 -0000 1.21 --- tochartmanager.cpp 21 Apr 2005 02:33:54 -0000 1.22 *************** *** 677,681 **** } else ! val = max(*i, val); } sig = checkValue(val); --- 677,681 ---- } else ! val = std::max(*i, val); } sig = checkValue(val); *************** *** 694,698 **** } else ! val = min(*i, val); } sig = checkValue(val); --- 694,698 ---- } else ! val = std::min(*i, val); } sig = checkValue(val); Index: todebugtext.h =================================================================== RCS file: /cvsroot/tora/tora/todebugtext.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** todebugtext.h 19 Apr 2005 10:30:39 -0000 1.23 --- todebugtext.h 21 Apr 2005 02:33:56 -0000 1.24 *************** *** 44,47 **** --- 44,49 ---- #include <qlistview.h> + #include <algorithm> + class toConnection; class toDebug; Index: tovisualize.h =================================================================== RCS file: /cvsroot/tora/tora/tovisualize.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tovisualize.h 19 Apr 2005 10:30:38 -0000 1.8 --- tovisualize.h 21 Apr 2005 02:33:58 -0000 1.9 *************** *** 43,46 **** --- 43,48 ---- #include <qvbox.h> + #include <algorithm> + class QComboBox; class QToolButton; Index: tooracleconnection.cpp =================================================================== RCS file: /cvsroot/tora/tora/tooracleconnection.cpp,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** tooracleconnection.cpp 19 Apr 2005 10:30:45 -0000 1.95 --- tooracleconnection.cpp 21 Apr 2005 02:33:57 -0000 1.96 *************** *** 152,156 **** { public: ! class connectionDeleter : public toTask { otl_connect *Connection; --- 152,156 ---- { public: ! class connectionDeleter : public toTask { otl_connect *Connection; *************** *** 164,168 **** } }; ! class oracleSub : public toConnectionSub { public: --- 164,168 ---- } }; ! class oracleSub : public toConnectionSub { public: *************** *** 215,219 **** }; ! class oracleQuery : public toQuery::queryImpl { bool Cancel; --- 215,219 ---- }; ! class oracleQuery : public toQuery::queryImpl { bool Cancel; *************** *** 367,376 **** } break; ! default: // Try using char if all else fails { // The *5 is for raw columns or UTF expanded data, also dates and numbers // are a bit tricky but if someone specifies a dateformat longer than 100 bytes he // deserves everything he gets! ! buffer = new char[max(dsc->elem_size * 5 + 1, 100)]; buffer[0] = 0; (*Query) >> buffer; --- 367,376 ---- } break; ! default: // Try using char if all else fails { // The *5 is for raw columns or UTF expanded data, also dates and numbers // are a bit tricky but if someone specifies a dateformat longer than 100 bytes he // deserves everything he gets! ! buffer = new char[std::max(dsc->elem_size * 5 + 1, 100)]; buffer[0] = 0; (*Query) >> buffer; *************** *** 550,554 **** }; ! class oracleConnection : public toConnection::connectionImpl { QCString connectString(void) --- 550,554 ---- }; ! class oracleConnection : public toConnection::connectionImpl { QCString connectString(void) *************** *** 734,738 **** oracleSub *sub = dynamic_cast<oracleSub *>(query.connectionSub()); sub->Lock.down(); ! sub->Connection->set_stream_pool_size(max(toTool::globalConfig(CONF_OPEN_CURSORS, DEFAULT_OPEN_CURSORS).toInt(), 1)); sub->Lock.up(); --- 734,738 ---- oracleSub *sub = dynamic_cast<oracleSub *>(query.connectionSub()); sub->Lock.down(); ! sub->Connection->set_stream_pool_size(std::max(toTool::globalConfig(CONF_OPEN_CURSORS, DEFAULT_OPEN_CURSORS).toInt(), 1)); sub->Lock.up(); *************** *** 1178,1183 **** #ifdef OTL_STREAM_POOLING_ON ! conn->set_stream_pool_size(max(toTool::globalConfig(CONF_OPEN_CURSORS, ! DEFAULT_OPEN_CURSORS).toInt(), 1)); #endif --- 1178,1183 ---- #ifdef OTL_STREAM_POOLING_ON ! conn->set_stream_pool_size(std::max(toTool::globalConfig(CONF_OPEN_CURSORS, ! DEFAULT_OPEN_CURSORS).toInt(), 1)); #endif Index: utils.cpp =================================================================== RCS file: /cvsroot/tora/tora/utils.cpp,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** utils.cpp 19 Apr 2005 10:30:47 -0000 1.152 --- utils.cpp 21 Apr 2005 02:33:59 -0000 1.153 *************** *** 770,773 **** --- 770,775 ---- + + { // MacOS char resourcePath[MAXPATHLEN]; *************** *** 1159,1165 **** color += offset; ! return QBrush(QColor(min(255, r*color*256 / (COLORS)), ! min(255, g*color*256 / (COLORS)), ! min(255, b*color*256 / (COLORS))), rets); } --- 1161,1167 ---- color += offset; ! return QBrush(QColor(std::min(255, r*color*256 / (COLORS)), ! std::min(255, g*color*256 / (COLORS)), ! std::min(255, b*color*256 / (COLORS))), rets); } Index: todebug.cpp =================================================================== RCS file: /cvsroot/tora/tora/todebug.cpp,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** todebug.cpp 19 Apr 2005 10:30:46 -0000 1.129 --- todebug.cpp 21 Apr 2005 02:33:55 -0000 1.130 *************** *** 947,951 **** bool Declaration; } ! TypeMap[] = { { "FUNCTION", "Function", true , true }, // Must be first in list { "PROCEDURE", "Procedure", true , true }, { "PACKAGE", "Package", true , true }, --- 947,951 ---- bool Declaration; } ! TypeMap[] = { { "FUNCTION", "Function", true , true }, // Must be first in list { "PROCEDURE", "Procedure", true , true }, { "PACKAGE", "Package", true , true }, Index: toqsqlconnection.cpp =================================================================== RCS file: /cvsroot/tora/tora/toqsqlconnection.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** toqsqlconnection.cpp 19 Apr 2005 10:30:39 -0000 1.35 --- toqsqlconnection.cpp 21 Apr 2005 02:33:57 -0000 1.36 *************** *** 971,975 **** static bool OnlyForward; ! class qSqlSetting : public QWidget, public toSettingTab { QCheckBox *OnlyForward; --- 971,975 ---- static bool OnlyForward; ! class qSqlSetting : public QWidget, public toSettingTab { QCheckBox *OnlyForward; *************** *** 1033,1037 **** } ! class mySQLAnalyzer : public toSyntaxAnalyzer { public: --- 1033,1037 ---- } ! class mySQLAnalyzer : public toSyntaxAnalyzer { public: *************** *** 1049,1053 **** }; ! class qSqlSub : public toConnectionSub { toSemaphore Lock; --- 1049,1053 ---- }; ! class qSqlSub : public toConnectionSub { toSemaphore Lock; *************** *** 1089,1093 **** }; ! class qSqlQuery : public toQuery::queryImpl { QSqlQuery *Query; --- 1089,1093 ---- }; ! class qSqlQuery : public toQuery::queryImpl { QSqlQuery *Query; *************** *** 1160,1165 **** } catch (...) ! { ! } } } --- 1160,1164 ---- } catch (...) ! {} } } *************** *** 1345,1349 **** }; ! class qSqlConnection : public toConnection::connectionImpl { bool Multiple; --- 1344,1348 ---- }; ! class qSqlConnection : public toConnection::connectionImpl { bool Multiple; Index: tobackground.cpp =================================================================== RCS file: /cvsroot/tora/tora/tobackground.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** tobackground.cpp 19 Apr 2005 10:30:38 -0000 1.20 --- tobackground.cpp 21 Apr 2005 02:33:54 -0000 1.21 *************** *** 379,383 **** Animation->unpause(); } ! Animation->setSpeed(min(Running, 1)*100); if (Running > 1) QToolTip::add --- 379,383 ---- Animation->unpause(); } ! Animation->setSpeed(std::min(Running, 1)*100); if (Running > 1) QToolTip::add Index: torollback.cpp =================================================================== RCS file: /cvsroot/tora/tora/torollback.cpp,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** torollback.cpp 19 Apr 2005 10:30:42 -0000 1.74 --- torollback.cpp 21 Apr 2005 02:33:57 -0000 1.75 *************** *** 218,223 **** } catch (...) ! { ! } connect(Tablespace, SIGNAL(textChanged(const QString &)), this, SLOT(valueChanged(const QString &))); --- 218,222 ---- } catch (...) ! {} connect(Tablespace, SIGNAL(textChanged(const QString &)), this, SLOT(valueChanged(const QString &))); *************** *** 378,382 **** { public: ! class rollbackItem : public toResultViewItem { public: --- 377,381 ---- { public: ! class rollbackItem : public toResultViewItem { public: *************** *** 415,419 **** for (i = TRANSCOL;!text(i).isEmpty();i++) ; ! setHeight(max(toResultViewItem::height(), MIN_HEIGHT*(i - TRANSCOL))); } }; --- 414,418 ---- for (i = TRANSCOL;!text(i).isEmpty();i++) ; ! setHeight(std::max(toResultViewItem::height(), MIN_HEIGHT*(i - TRANSCOL))); } }; *************** *** 504,508 **** std::list<double> MaxExt; public: ! class openItem : public toResultViewItem { toRollbackOpen *parent(void) --- 503,507 ---- std::list<double> MaxExt; public: ! class openItem : public toResultViewItem { toRollbackOpen *parent(void) *************** *** 540,544 **** statementData &data = parent()->Statements[address]; toResultViewItem::setup(); ! setHeight(max(toResultViewItem::height(), int(MIN_HEIGHT*data.OpenExt.size()))); } }; --- 539,543 ---- statementData &data = parent()->Statements[address]; toResultViewItem::setup(); ! setHeight(std::max(toResultViewItem::height(), int(MIN_HEIGHT*data.OpenExt.size()))); } }; Index: tovisualize.cpp =================================================================== RCS file: /cvsroot/tora/tora/tovisualize.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tovisualize.cpp 19 Apr 2005 10:30:38 -0000 1.14 --- tovisualize.cpp 21 Apr 2005 02:33:57 -0000 1.15 *************** *** 127,131 **** int add = 0; ! int tit = max(1, Title->currentText().toInt()); if (Source->columnText(0) == QString::fromLatin1("#")) add --- 127,131 ---- int add = 0; ! int tit = std::max(1, Title->currentText().toInt()); if (Source->columnText(0) == QString::fromLatin1("#")) add *************** *** 171,175 **** int add = 0; ! int tit = max(1, Title->currentText().toInt()); if (Source->columnText(0) == QString::fromLatin1("#")) add --- 171,175 ---- int add = 0; ! int tit = std::max(1, Title->currentText().toInt()); if (Source->columnText(0) == QString::fromLatin1("#")) add *************** *** 215,219 **** int add = 0; ! int tit = max(1, Title->currentText().toInt()); if (Source->columnText(0) == QString::fromLatin1("#")) add --- 215,219 ---- int add = 0; ! int tit = std::max(1, Title->currentText().toInt()); if (Source->columnText(0) == QString::fromLatin1("#")) add Index: tomain.h =================================================================== RCS file: /cvsroot/tora/tora/tomain.h,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** tomain.h 19 Apr 2005 10:30:45 -0000 1.98 --- tomain.h 21 Apr 2005 02:33:57 -0000 1.99 *************** *** 50,53 **** --- 50,54 ---- #include <list> #include <map> + #include <algorithm> #include <qtimer.h> Index: tohelp.h =================================================================== RCS file: /cvsroot/tora/tora/tohelp.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** tohelp.h 19 Apr 2005 10:30:39 -0000 1.29 --- tohelp.h 21 Apr 2005 02:33:56 -0000 1.30 *************** *** 44,47 **** --- 44,48 ---- #include <map> + #include <algorithm> class toListView; Index: towaitevents.h =================================================================== RCS file: /cvsroot/tora/tora/towaitevents.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** towaitevents.h 19 Apr 2005 10:30:37 -0000 1.6 --- towaitevents.h 21 Apr 2005 02:33:59 -0000 1.7 *************** *** 44,47 **** --- 44,48 ---- #include <list> #include <map> + #include <algorithm> #include <qvbox.h> Index: tohelp.cpp =================================================================== RCS file: /cvsroot/tora/tora/tohelp.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** tohelp.cpp 19 Apr 2005 10:30:41 -0000 1.50 --- tohelp.cpp 21 Apr 2005 02:33:56 -0000 1.51 *************** *** 377,381 **** splitter->setResizeMode(tabs, QSplitter::KeepSize); ! setGeometry(x(), y(), max(width(), 640), max(height(), 480)); QListViewItem *lastParent = NULL; --- 377,381 ---- splitter->setResizeMode(tabs, QSplitter::KeepSize); ! setGeometry(x(), y(), std::max(width(), 640), std::max(height(), 480)); QListViewItem *lastParent = NULL; Index: tobackground.h =================================================================== RCS file: /cvsroot/tora/tora/tobackground.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tobackground.h 19 Apr 2005 10:30:38 -0000 1.10 --- tobackground.h 21 Apr 2005 02:33:54 -0000 1.11 *************** *** 43,46 **** --- 43,48 ---- #include <qtimer.h> + #include <algorithm> + class QLabel; class QMovie; Index: todebugtext.cpp =================================================================== RCS file: /cvsroot/tora/tora/todebugtext.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** todebugtext.cpp 20 Apr 2005 02:28:17 -0000 1.39 --- todebugtext.cpp 21 Apr 2005 02:33:56 -0000 1.40 *************** *** 353,357 **** if (hasBreakpoint(row)) { ! int h = max((cellHeight() - toBreakpointPixmap->height()) / 2, 0); if (CurrentItem->text(4) == "DISABLED") painter->drawPixmap(0, h, *toDisBreakpointPixmap); --- 353,357 ---- if (hasBreakpoint(row)) { ! int h = std::max((cellHeight() - toBreakpointPixmap->height()) / 2, 0); if (CurrentItem->text(4) == "DISABLED") painter->drawPixmap(0, h, *toDisBreakpointPixmap); Index: tolinechart.h =================================================================== RCS file: /cvsroot/tora/tora/tolinechart.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** tolinechart.h 19 Apr 2005 10:30:39 -0000 1.29 --- tolinechart.h 21 Apr 2005 02:33:57 -0000 1.30 *************** *** 43,46 **** --- 43,47 ---- #include <list> #include <map> + #include <algorithm> #include <qwidget.h> Index: toreport.cpp =================================================================== RCS file: /cvsroot/tora/tora/toreport.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** toreport.cpp 19 Apr 2005 10:30:38 -0000 1.11 --- toreport.cpp 21 Apr 2005 02:33:57 -0000 1.12 *************** *** 181,185 **** { cols[col].Order = toExtract::partDescribe(*i, level + 2); ! maxCol = max(maxCol, cols[col].Order.toInt()); } else if (extra == QString::fromLatin1("COMMENT")) --- 181,185 ---- { cols[col].Order = toExtract::partDescribe(*i, level + 2); ! maxCol = std::max(maxCol, cols[col].Order.toInt()); } else if (extra == QString::fromLatin1("COMMENT")) Index: towaitevents.cpp =================================================================== RCS file: /cvsroot/tora/tora/towaitevents.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** towaitevents.cpp 19 Apr 2005 10:30:38 -0000 1.11 --- towaitevents.cpp 21 Apr 2005 02:33:58 -0000 1.12 *************** *** 440,446 **** { item->setColor(col); ! item->setText(2, QString::number((*i - item->text(3).toDouble()) / max(int(now - LastTime), 1))); item->setText(3, QString::number(*i)); ! item->setText(4, QString::number((*j - item->text(5).toDouble()) / max(int(now - LastTime), 1))); item->setText(5, QString::number(*j)); break; --- 440,446 ---- { item->setColor(col); ! item->setText(2, QString::number((*i - item->text(3).toDouble()) / std::max(int(now - LastTime), 1))); item->setText(3, QString::number(*i)); ! item->setText(4, QString::number((*j - item->text(5).toDouble()) / std::max(int(now - LastTime), 1))); item->setText(5, QString::number(*j)); break; *************** *** 461,465 **** while (i != Current.end() && j != LastCurrent.end()) { ! Relative.insert(Relative.end(), ((*i) - (*j)) / max(int(now - LastTime), 1)); i++; j++; --- 461,465 ---- while (i != Current.end() && j != LastCurrent.end()) { ! Relative.insert(Relative.end(), ((*i) - (*j)) / std::max(int(now - LastTime), 1)); i++; j++; *************** *** 470,474 **** while (i != CurrentTimes.end() && j != LastTimes.end()) { ! RelativeTimes.insert(RelativeTimes.end(), ((*i) - (*j)) / max(int(now - LastTime), 1)); i++; j++; --- 470,474 ---- while (i != CurrentTimes.end() && j != LastTimes.end()) { ! RelativeTimes.insert(RelativeTimes.end(), ((*i) - (*j)) / std::max(int(now - LastTime), 1)); i++; j++; Index: tosqlparse.cpp =================================================================== RCS file: /cvsroot/tora/tora/tosqlparse.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** tosqlparse.cpp 19 Apr 2005 10:30:41 -0000 1.53 --- tosqlparse.cpp 21 Apr 2005 02:33:57 -0000 1.54 *************** *** 1177,1181 **** for (i = ret.length() - 1;i >= 0 && ret[i].isSpace();i--) ; ! ret = ret.mid(0, max(i + 1, 0)); ret += ("\n"); ret += indentString(level + exc); --- 1177,1181 ---- for (i = ret.length() - 1;i >= 0 && ret[i].isSpace();i--) ; ! ret = ret.mid(0, std::max(i + 1, 0)); ret += ("\n"); ret += indentString(level + exc); *************** *** 1364,1368 **** ret += QString("%1").arg(word, Settings.RightSeparator ? maxlev - 1 : 1 - maxlev); ! current = level + max(int(word.length()), maxlev - 1); } else --- 1364,1368 ---- ret += QString("%1").arg(word, Settings.RightSeparator ? maxlev - 1 : 1 - maxlev); ! current = level + std::max(int(word.length()), maxlev - 1); } else Index: toworksheet.cpp =================================================================== RCS file: /cvsroot/tora/tora/toworksheet.cpp,v retrieving revision 1.203 retrieving revision 1.204 diff -C2 -d -r1.203 -r1.204 *** toworksheet.cpp 19 Apr 2005 10:30:48 -0000 1.203 --- toworksheet.cpp 21 Apr 2005 02:33:59 -0000 1.204 *************** *** 193,197 **** Tool->setConfig(CONF_AUTO_LOAD, DefaultFile->text()); } ! public slots: void chooseFile(void) { --- 193,197 ---- Tool->setConfig(CONF_AUTO_LOAD, DefaultFile->text()); } ! public slots: void chooseFile(void) { Index: tochartmanager.h =================================================================== RCS file: /cvsroot/tora/tora/tochartmanager.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tochartmanager.h 19 Apr 2005 10:30:38 -0000 1.10 --- tochartmanager.h 21 Apr 2005 02:33:55 -0000 1.11 *************** *** 47,50 **** --- 47,51 ---- #include <list> #include <map> + #include <algorithm> class toChartManager; Index: tohighlightedtext.cpp =================================================================== RCS file: /cvsroot/tora/tora/tohighlightedtext.cpp,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** tohighlightedtext.cpp 19 Apr 2005 10:30:44 -0000 1.93 --- tohighlightedtext.cpp 21 Apr 2005 02:33:56 -0000 1.94 *************** *** 489,492 **** --- 489,494 ---- painter->fillRect(LeftIgnore, 0, posx - LeftIgnore, height, painter->backgroundColor()); + rect.setWidth(rect.width() + 1); + #if 0 && defined (WIN32) *************** *** 501,505 **** painter->fillRect(posx, rect.height(), rect.width(), height - rect.height(), painter->backgroundColor()); ! posx = rect.right() + 1; } wasCol = col; --- 503,507 ---- painter->fillRect(posx, rect.height(), rect.width(), height - rect.height(), painter->backgroundColor()); ! posx = rect.right(); } wasCol = col; Index: toeditextensions.h =================================================================== RCS file: /cvsroot/tora/tora/toeditextensions.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** toeditextensions.h 19 Apr 2005 10:30:38 -0000 1.11 --- toeditextensions.h 21 Apr 2005 02:33:56 -0000 1.12 *************** *** 43,46 **** --- 43,48 ---- #include "toeditextensiongotoui.h" + #include <algorithm> + class toMarkedText; Index: toresultitem.cpp =================================================================== RCS file: /cvsroot/tora/tora/toresultitem.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** toresultitem.cpp 20 Apr 2005 02:16:03 -0000 1.44 --- toresultitem.cpp 21 Apr 2005 02:33:57 -0000 1.45 *************** *** 168,172 **** { NumWidgets += ALLOC_SIZE; ! Widgets.resize(NumWidgets,0); } QString t; --- 168,172 ---- { NumWidgets += ALLOC_SIZE; ! Widgets.resize(NumWidgets, 0); } QString t; Index: NEWS =================================================================== RCS file: /cvsroot/tora/tora/NEWS,v retrieving revision 1.983 retrieving revision 1.984 diff -C2 -d -r1.983 -r1.984 *** NEWS 20 Apr 2005 02:28:15 -0000 1.983 --- NEWS 21 Apr 2005 02:33:45 -0000 1.984 *************** *** 12,15 **** --- 12,16 ---- 2005-05-19: Applied patch 1186247 to convert more code to STL. 2005-05-19: Applied patch 1180569 to allow removing breakpoints. + 2005-05-20: Applied patch 1186958 to convert min/max to std routines 1.3.16: 2005-03-04 Index: toresultview.h =================================================================== RCS file: /cvsroot/tora/tora/toresultview.h,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** toresultview.h 19 Apr 2005 10:30:42 -0000 1.68 --- toresultview.h 21 Apr 2005 02:33:57 -0000 1.69 *************** *** 47,50 **** --- 47,51 ---- #include <map> + #include <algorithm> class QListViewItem; Index: utils.h =================================================================== RCS file: /cvsroot/tora/tora/utils.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** utils.h 19 Apr 2005 10:30:38 -0000 1.18 --- utils.h 21 Apr 2005 02:34:00 -0000 1.19 *************** *** 43,46 **** --- 43,47 ---- #include <list> #include <map> + #include <algorithm> #include <qmainwindow.h> *************** *** 68,73 **** */ class TOPrinter : public QPrinter ! { ! } ; /** --- 69,73 ---- */ class TOPrinter : public QPrinter ! {} ; /** *************** *** 75,80 **** */ class TODock : public QWidget ! { ! } ; /** --- 75,79 ---- */ class TODock : public QWidget ! {} ; /** *************** *** 82,87 **** */ class TOFileDialog : public QFileDialog ! { ! } ; /** --- 81,85 ---- */ class TOFileDialog : public QFileDialog ! {} ; /** *************** *** 89,94 **** */ class TOMessageBox : public QMessageBox ! { ! } ; #endif --- 87,91 ---- */ class TOMessageBox : public QMessageBox ! {} ; #endif *************** *** 457,478 **** QString toTranslateMayby(const QString &context, const QString &text); - /** - * Get maximum number of a and b. - */ - template <class T> - T max(T a, T b) - { - return a > b ? a : b ; - } - - /** - * Get minimum number of a and b. - */ - template <class T> - T min(T a, T b) - { - return a < b ? a : b ; - } - /** Popup toolbutton that works like I think they should under Qt 3.0 as well. * this means they will pop up a tool menu when you click on the button as well. --- 454,457 ---- Index: torollback.h =================================================================== RCS file: /cvsroot/tora/tora/torollback.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** torollback.h 19 Apr 2005 10:30:39 -0000 1.25 --- torollback.h 21 Apr 2005 02:33:57 -0000 1.26 *************** *** 45,48 **** --- 45,50 ---- #include <qdialog.h> + #include <algorithm> + class QComboBox; class QPopupMenu; Index: tomain.cpp =================================================================== RCS file: /cvsroot/tora/tora/tomain.cpp,v retrieving revision 1.186 retrieving revision 1.187 diff -C2 -d -r1.186 -r1.187 *** tomain.cpp 19 Apr 2005 10:30:47 -0000 1.186 --- tomain.cpp 21 Apr 2005 02:33:57 -0000 1.187 *************** *** 1071,1075 **** ConnectionSelection->removeItem(pos); if (ConnectionSelection->count()) ! ConnectionSelection->setCurrentItem(max(pos - 1, 0)); delete conn; break; --- 1071,1075 ---- ConnectionSelection->removeItem(pos); if (ConnectionSelection->count()) ! ConnectionSelection->setCurrentItem(std::max(pos - 1, 0)); delete conn; break; Index: toresultcontent.cpp =================================================================== RCS file: /cvsroot/tora/tora/toresultcontent.cpp,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** toresultcontent.cpp 19 Apr 2005 10:30:45 -0000 1.117 --- toresultcontent.cpp 21 Apr 2005 02:33:57 -0000 1.118 *************** *** 120,124 **** int col = cnt->currentColumn(); if (col == 0) ! cnt->setCurrentCell(max(cnt->currentRow() - 1, 0), 0); else cnt->setCurrentCell(cnt->currentRow(), 0); --- 120,124 ---- int col = cnt->currentColumn(); if (col == 0) ! cnt->setCurrentCell(std::max(cnt->currentRow() - 1, 0), 0); else cnt->setCurrentCell(cnt->currentRow(), 0); *************** *** 134,138 **** int maxCol = cnt->numCols() - 1; if (col == maxCol) ! cnt->setCurrentCell(min(cnt->numRows() - 1, cnt->currentRow() + 1), maxCol); else cnt->setCurrentCell(cnt->currentRow(), maxCol); --- 134,138 ---- int maxCol = cnt->numCols() - 1; if (col == maxCol) ! cnt->setCurrentCell(std::min(cnt->numRows() - 1, cnt->currentRow() + 1), maxCol); else cnt->setCurrentCell(cnt->currentRow(), maxCol); *************** *** 147,151 **** int col = cnt->currentColumn(); if (col == 0) ! cnt->setCurrentCell(max(cnt->currentRow() - 1, 0), cnt->numCols() - 1); else cnt->setCurrentCell(cnt->currentRow(), col - 1); --- 147,151 ---- int col = cnt->currentColumn(); if (col == 0) ! cnt->setCurrentCell(std::max(cnt->currentRow() - 1, 0), cnt->numCols() - 1); else cnt->setCurrentCell(cnt->currentRow(), col - 1); *************** *** 161,165 **** int maxCol = cnt->numCols() - 1; if (col == maxCol) ! cnt->setCurrentCell(min(cnt->numRows() - 1, cnt->currentRow() + 1), 0); else cnt->setCurrentCell(cnt->currentRow(), col + 1); --- 161,165 ---- int maxCol = cnt->numCols() - 1; if (col == maxCol) ! cnt->setCurrentCell(std::min(cnt->numRows() - 1, cnt->currentRow() + 1), 0); else cnt->setCurrentCell(cnt->currentRow(), col + 1); *************** *** 540,544 **** { QRect bounds = fontMetrics().boundingRect(text(k, j)); ! int cw = min(bounds.width(), MaxColDisp); if (cw > width) width = cw; --- 540,544 ---- { QRect bounds = fontMetrics().boundingRect(text(k, j)); ! int cw = std::min(bounds.width(), MaxColDisp); if (cw > width) width = cw; *************** *** 613,617 **** { int height = verticalHeader()->sectionSize(0); ! MaxNumber += max(height + 1, 20); } else --- 613,617 ---- { int height = verticalHeader()->sectionSize(0); ! MaxNumber += std::max(height + 1, 20); } else *************** *** 740,749 **** void toResultContentEditor::gotoPreviousRecord() { ! setCurrentCellFocus(max(0, currentRow() - 1), currentColumn()); } void toResultContentEditor::gotoNextRecord() { ! setCurrentCellFocus(min(numRows() - 1, currentRow() + 1), currentColumn()); } --- 740,749 ---- void toResultContentEditor::gotoPreviousRecord() { ! setCurrentCellFocus(std::max(0, currentRow() - 1), currentColumn()); } void toResultContentEditor::gotoNextRecord() { ! setCurrentCellFocus(std::min(numRows() - 1, currentRow() + 1), currentColumn()); } Index: toprofiler.cpp =================================================================== RCS file: /cvsroot/tora/tora/toprofiler.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** toprofiler.cpp 19 Apr 2005 10:30:39 -0000 1.22 --- toprofiler.cpp 21 Apr 2005 02:33:57 -0000 1.23 *************** *** 274,278 **** double Total; public: ! class unitsItem : public toResultViewItem { public: --- 274,278 ---- double Total; public: ! class unitsItem : public toResultViewItem { public: *************** *** 338,342 **** double MinTime; public: ! class listItem : public toResultViewItem { public: --- 338,342 ---- double MinTime; public: ! class listItem : public toResultViewItem { public: Index: toresultcontent.h =================================================================== RCS file: /cvsroot/tora/tora/toresultcontent.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** toresultcontent.h 19 Apr 2005 10:30:41 -0000 1.61 --- toresultcontent.h 21 Apr 2005 02:33:57 -0000 1.62 *************** *** 47,50 **** --- 47,51 ---- #include <list> + #include <algorithm> #include <qtable.h> Index: toresultview.cpp =================================================================== RCS file: /cvsroot/tora/tora/toresultview.cpp,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** toresultview.cpp 19 Apr 2005 10:30:46 -0000 1.139 --- toresultview.cpp 21 Apr 2005 02:33:57 -0000 1.140 *************** *** 113,117 **** { toResultViewItem::paintCell(pnt, cg, column, ! max(QListViewItem::width(pnt->fontMetrics(), listView(), column), width), alignment); if (Gridlines) --- 113,117 ---- { toResultViewItem::paintCell(pnt, cg, column, ! std::max(QListViewItem::width(pnt->fontMetrics(), listView(), column), width), alignment); if (Gridlines) *************** *** 150,154 **** if (t.isNull()) t = txt; ! return min(TextWidth(fm, t), MaxColDisp) + top->itemMargin()*2 - fm.minLeftBearing() - fm.minRightBearing() + 1; } --- 150,154 ---- if (t.isNull()) t = txt; ! return std::min(TextWidth(fm, t), MaxColDisp) + top->itemMargin()*2 - fm.minLeftBearing() - fm.minRightBearing() + 1; } *************** *** 184,188 **** t = txt; QRect bounds = fm.boundingRect(t); ! return min(bounds.width(), MaxColDisp) + top->itemMargin()*2 - fm.minLeftBearing() - fm.minRightBearing() + 1; } --- 184,188 ---- t = txt; QRect bounds = fm.boundingRect(t); ! return std::min(bounds.width(), MaxColDisp) + top->itemMargin()*2 - fm.minLeftBearing() - fm.minRightBearing() + 1; } *************** *** 395,399 **** { toResultViewCheck::paintCell(pnt, cg, column, ! max(QCheckListItem::width(pnt->fontMetrics(), listView(), column), width), alignment); } --- 395,399 ---- { toResultViewCheck::paintCell(pnt, cg, column, ! std::max(QCheckListItem::width(pnt->fontMetrics(), listView(), column), width), alignment); } *************** *** 419,423 **** #endif ! return min(TextWidth(fm, t), MaxColDisp) + wx; } --- 419,423 ---- #endif ! return std::min(TextWidth(fm, t), MaxColDisp) + wx; } *************** *** 443,447 **** #endif ! return min(bounds.width(), MaxColDisp) + wx; } --- 443,447 ---- #endif ! return std::min(bounds.width(), MaxColDisp) + wx; } *************** *** 648,652 **** painter->save(); QFont font = painter->font(); ! font.setPointSizeFloat(font.pointSizeFloat() / max(wpscalex, wpscaley)); painter->setFont(font); --- 648,652 ---- painter->save(); QFont font = painter->font(); ! font.setPointSizeFloat(font.pointSizeFloat() / std::max(wpscalex, wpscaley)); painter->setFont(font); *************** *** 674,678 **** } font = toListView::font(); ! font.setPointSizeFloat(font.pointSizeFloat() / max(wpscalex, wpscaley)); painter->setFont(font); --- 674,678 ---- } font = toListView::font(); ! font.setPointSizeFloat(font.pointSizeFloat() / std::max(wpscalex, wpscaley)); painter->setFont(font); Index: tosqlparse.h =================================================================== RCS file: /cvsroot/tora/tora/tosqlparse.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tosqlparse.h 19 Apr 2005 10:30:38 -0000 1.17 --- tosqlparse.h 21 Apr 2005 02:33:57 -0000 1.18 *************** *** 42,45 **** --- 42,46 ---- #include <list> + #include <algorithm> #include <qstring.h> Index: toreport.h =================================================================== RCS file: /cvsroot/tora/tora/toreport.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** toreport.h 19 Apr 2005 10:30:37 -0000 1.5 --- toreport.h 21 Apr 2005 02:33:57 -0000 1.6 *************** *** 42,45 **** --- 42,46 ---- #include <list> + #include <algorithm> #include <qstring.h> |