[Uml-devel] KDE/kdesdk/umbrello/umbrello
Oliver Kellogg
okellogg at users.sourceforge.net
Sat Jan 27 14:07:09 UTC 2007
SVN commit 627637 by okellogg:
remove a few signed/unsigned warnings
M +2 -2 codeimport/adaimport.cpp
M +1 -1 codeimport/idlimport.cpp
M +3 -3 codeimport/javaimport.cpp
M +3 -3 codeimport/nativeimportbase.cpp
M +1 -1 codeimport/nativeimportbase.h
M +2 -2 codeimport/pascalimport.cpp
M +1 -1 codeimport/pythonimport.cpp
M +1 -1 dialogs/assocgenpage.cpp
M +1 -1 dialogs/overwritedialogue.cpp
M +1 -1 dialogs/overwritedialogue.h
M +5 -5 petaltree2uml.cpp
M +3 -4 umllistviewitem.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/adaimport.cpp #627636:627637
@@ -143,7 +143,7 @@
if (stems.isEmpty())
return;
QString base = stems.first();
- uint i = 0;
+ int i = 0;
while (1) {
QString filename = base + ".ads";
if (! m_parsedFiles.contains(filename)) {
@@ -166,7 +166,7 @@
}
bool AdaImport::parseStmt() {
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
const QString& keyword = m_source[m_srcIndex];
UMLDoc *umldoc = UMLApp::app()->getDocument();
//kDebug() << '"' << keyword << '"' << endl;
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/idlimport.cpp #627636:627637
@@ -118,7 +118,7 @@
// Parse the QStringList m_source.
m_scopeIndex = 0;
m_scope[0] = NULL;
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
for (m_srcIndex = 0; m_srcIndex < srcLength; m_srcIndex++) {
const QString& keyword = m_source[m_srcIndex];
//kDebug() << '"' << keyword << '"' << endl;
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/javaimport.cpp #627636:627637
@@ -48,10 +48,10 @@
QString JavaImport::joinTypename(QString typeName) {
if (m_source[m_srcIndex + 1] == "<" ||
m_source[m_srcIndex + 1] == "[") {
- uint start = ++m_srcIndex;
+ int start = ++m_srcIndex;
if (! skipToClosing(m_source[start][0]))
return typeName;
- for (uint i = start; i <= m_srcIndex; i++) {
+ for (int i = start; i <= m_srcIndex; i++) {
typeName += m_source[i];
}
}
@@ -222,7 +222,7 @@
bool JavaImport::parseStmt() {
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
const QString& keyword = m_source[m_srcIndex];
//kDebug() << '"' << keyword << '"' << endl;
if (keyword == "package") {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/nativeimportbase.cpp #627636:627637
@@ -45,7 +45,7 @@
}
void NativeImportBase::skipStmt(QString until /* = ";" */) {
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
while (m_srcIndex < srcLength && m_source[m_srcIndex] != until)
m_srcIndex++;
}
@@ -72,7 +72,7 @@
}
const QString opening(opener);
skipStmt(opening);
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
int nesting = 0;
while (m_srcIndex < srcLength) {
QString nextToken = advance();
@@ -319,7 +319,7 @@
m_currentAccess = Uml::Visibility::Public;
m_scopeIndex = 0;
m_scope[0] = NULL; // index 0 is reserved for global scope
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
for (m_srcIndex = 0; m_srcIndex < srcLength; m_srcIndex++) {
const QString& firstToken = m_source[m_srcIndex];
//kDebug() << '"' << firstToken << '"' << endl;
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/nativeimportbase.h #627636:627637
@@ -169,7 +169,7 @@
/**
* Used for indexing m_source.
*/
- uint m_srcIndex;
+ int m_srcIndex;
/**
* Stack of scopes for use by the specific importer.
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/pascalimport.cpp #627636:627637
@@ -66,7 +66,7 @@
}
void PascalImport::checkModifiers(bool& isVirtual, bool& isAbstract) {
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
while (m_srcIndex < srcLength - 1) {
QString lookAhead = m_source[m_srcIndex + 1].lower();
if (lookAhead != "virtual" && lookAhead != "abstract" &&
@@ -86,7 +86,7 @@
}
bool PascalImport::parseStmt() {
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
QString keyword = m_source[m_srcIndex].lower();
//kDebug() << '"' << keyword << '"' << endl;
if (keyword == "uses") {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/pythonimport.cpp #627636:627637
@@ -130,7 +130,7 @@
}
bool PythonImport::parseStmt() {
- const uint srcLength = m_source.count();
+ const int srcLength = m_source.count();
const QString& keyword = m_source[m_srcIndex];
if (keyword == "class") {
const QString& name = advance();
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocgenpage.cpp #627636:627637
@@ -93,7 +93,7 @@
bool found=false;
m_AssocTypeStrings.clear();
- for (uint i=0; i<m_AssocTypes.size(); ++i) {
+ for (int i = 0; i < m_AssocTypes.size(); ++i) {
if (m_AssocTypes[i] == currentType) found=true;
QString typeStr = UMLAssociation::typeAsString(m_AssocTypes[i]);
m_AssocTypeStrings << typeStr;
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/overwritedialogue.cpp #627636:627637
@@ -23,7 +23,7 @@
OverwriteDialogue::OverwriteDialogue(
const QString& fileName,
const QString& outputDirectory,
- bool applyToAllRemaining, QWidget* parent, const char* name)
+ bool applyToAllRemaining, QWidget* parent)
:KDialog(parent) {
setCaption( i18n("Destination File Already Exists") );
setButtons( Help | Ok | Cancel );
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/overwritedialogue.h #627636:627637
@@ -35,7 +35,7 @@
* constructor sets up the dialog, adding checkbox and label
*/
OverwriteDialogue(const QString& fileName, const QString& outputDirectory,
- bool applyToAllRemaining, QWidget* parent=0, const char* name=0);
+ bool applyToAllRemaining, QWidget* parent=0);
/**
* destrictor doesn't do anything
--- trunk/KDE/kdesdk/umbrello/umbrello/petaltree2uml.cpp #627636:627637
@@ -157,7 +157,7 @@
return;
}
PetalNode::NameValueList attributeList = attributes->attributes();
- for (uint i = 0; i < attributeList.count(); i++) {
+ for (int i = 0; i < attributeList.count(); i++) {
PetalNode *attNode = attributeList[i].second.node;
QStringList initialArgs = attNode->initialArgs();
if (attNode->name() != m_elementName) {
@@ -330,7 +330,7 @@
}
UMLPackage *localParent = static_cast<UMLPackage*>(o);
PetalNode::NameValueList atts = logical_models->attributes();
- for (uint i = 0; i < atts.count(); i++) {
+ for (int i = 0; i < atts.count(); i++) {
umbrellify(atts[i].second.node, localParent);
}
@@ -520,7 +520,7 @@
PetalNode *models = node->findAttribute(modelsName).node;
if (models) {
PetalNode::NameValueList atts = models->attributes();
- for (uint i = 0; i < atts.count(); i++) {
+ for (int i = 0; i < atts.count(); i++) {
if (! umbrellify(atts[i].second.node, modelsName, item))
return false;
}
@@ -552,7 +552,7 @@
return false;
}
PetalNode::NameValueList atts = models->attributes();
- for (uint i = 0; i < atts.count(); i++) {
+ for (int i = 0; i < atts.count(); i++) {
umbrellify(atts[i].second.node, modelsName, lvParent);
}
return true;
@@ -587,7 +587,7 @@
umldoc->setCurrentRoot(Uml::mt_Logical);
Import_Utils::assignUniqueIdOnCreation(false);
PetalNode::NameValueList atts = logical_models->attributes();
- for (uint i = 0; i < atts.count(); i++) {
+ for (int i = 0; i < atts.count(); i++) {
umbrellify(atts[i].second.node);
}
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistviewitem.cpp #627636:627637
@@ -338,16 +338,16 @@
op->setName( od.m_name );
op->setType( od.m_pReturnType );
UMLAttributeList parmList = op->getParmList();
- const unsigned newParmListCount = parmList.count();
+ const int newParmListCount = parmList.count();
if (newParmListCount > od.m_args.count()) {
// Remove parameters at end of of list that no longer exist.
- for (unsigned i = od.m_args.count(); i < newParmListCount; i++) {
+ for (int i = od.m_args.count(); i < newParmListCount; i++) {
UMLAttribute *a = parmList.at(i);
op->removeParm(a, false);
}
}
Model_Utils::NameAndType_ListIt lit = od.m_args.begin();
- for (unsigned i = 0; lit != od.m_args.end(); ++lit, ++i) {
+ for (int i = 0; lit != od.m_args.end(); ++lit, ++i) {
const Model_Utils::NameAndType& nm_tp = *lit;
UMLAttribute *a;
if (i < newParmListCount) {
@@ -632,7 +632,6 @@
if (id != Uml::id_None)
itemElement.setAttribute( "id", idStr );
itemElement.setAttribute( "type", m_Type );
- UMLDoc *umldoc = s_pListView->getDocument();
UMLFolder *extFolder = NULL;
if (m_pObject == NULL) {
if (! Model_Utils::typeIsDiagram(m_Type) && m_Type != Uml::lvt_View)
More information about the umbrello-devel
mailing list