From: <mrj...@us...> - 2007-10-10 04:42:22
|
Revision: 2245 http://tora.svn.sourceforge.net/tora/?rev=2245&view=rev Author: mrjohnson0 Date: 2007-10-09 21:42:26 -0700 (Tue, 09 Oct 2007) Log Message: ----------- fix a couple compiler warnings, and a runtime warning about 'new connection' Modified Paths: -------------- branches/tora-1.4/tora/src/tomain.cpp Modified: branches/tora-1.4/tora/src/tomain.cpp =================================================================== --- branches/tora-1.4/tora/src/tomain.cpp 2007-10-10 04:30:27 UTC (rev 2244) +++ branches/tora-1.4/tora/src/tomain.cpp 2007-10-10 04:42:26 UTC (rev 2245) @@ -117,7 +117,7 @@ FileMenu = new Q3PopupMenu(this); - FileMenu->insertItem(QPixmap(const_cast<const char**>(connect_xpm)), this, + FileMenu->insertItem(QPixmap(const_cast<const char**>(connect_xpm)), tr("&New Connection..."), TO_NEW_CONNECTION, Qt::CTRL + Qt::Key_G); FileMenu->insertItem(QPixmap(const_cast<const char**>(disconnect_xpm)), tr("&Close Connection"), this, SLOT(delConnection()), 0, TO_CLOSE_CONNECTION); @@ -571,7 +571,7 @@ bool first = true; QRegExp strip(QString::fromLatin1(" <[0-9]+>$")); int id = 0; - unsigned int i; + int i; for (i = 0;i < workspace()->windowList(QWorkspace::CreationOrder).count();i++) { @@ -1241,14 +1241,12 @@ if ((*i).second->canHandle(conn)) { int priority = (*i).second->priority(); - if (priority / 100 != lastPriorityPix / 100 && - pixmap) + if (priority / 100 != lastPriorityPix / 100 && pixmap) { ToolsToolbar->addSeparator(); lastPriorityPix = priority; } - if (priority / 100 != lastPriorityMenu / 100 && - menuName) + if (priority / 100 != lastPriorityMenu / 100 && menuName) { ToolsMenu->insertSeparator(); lastPriorityMenu = priority; @@ -1339,7 +1337,7 @@ } id = 1; - for (unsigned int i = 0;i < workspace()->windowList(QWorkspace::CreationOrder).count();i++) + for (int i = 0;i < workspace()->windowList(QWorkspace::CreationOrder).count();i++) { toToolWidget *tool = dynamic_cast<toToolWidget *>(workspace()->windowList(QWorkspace::CreationOrder).at(i)); @@ -1395,7 +1393,7 @@ QStringList optionlist = QStringList::split(",", data[key + ":Options"]); std::set <QString> options; - for (unsigned int j = 0;j < optionlist.count();j++) + for (int j = 0;j < optionlist.count();j++) if (!optionlist[j].isEmpty()) options.insert(optionlist[j]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |