[Uml-devel] branches/work/soc-umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Sun May 1 20:33:14 UTC 2011
SVN commit 1230047 by fischer:
Fix warnings as in trunk by commit 1229860 by mlaurent.
M +1 -1 dialogs/activitydialog.cpp
M +1 -1 dialogs/assocpropdlg.cpp
M +3 -3 dialogs/classgenpage.cpp
M +1 -1 dialogs/classpropdlg.cpp
M +1 -1 dialogs/objectnodedialog.cpp
M +1 -1 dialogs/parmpropdlg.cpp
M +1 -1 dialogs/settingsdlg.cpp
M +1 -1 dialogs/statedialog.cpp
M +2 -2 dialogs/umlattributedialog.cpp
M +2 -2 dialogs/umlentityattributedialog.cpp
M +4 -4 dialogs/umloperationdialog.cpp
M +2 -2 dialogs/umltemplatedialog.cpp
M +1 -1 dialogs/umluniqueconstraintdialog.cpp
M +3 -3 dialogs/umlviewdialog.cpp
M +2 -2 refactoring/refactoringassistant.cpp
M +2 -2 widgets/associationwidget.cpp
M +1 -1 widgets/floatingtextwidget.cpp
M +1 -1 widgets/widgetbase.cpp
--- branches/work/soc-umbrello/umbrello/dialogs/activitydialog.cpp #1230046:1230047
@@ -224,7 +224,7 @@
pageItemFont->setHeader( i18n("Font Settings") );
pageItemFont->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
addPage( pageItemFont );
- m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
+ m_pChooser = new KFontChooser( (QWidget*)page, KFontChooser::NoDisplayFlags, QStringList(), 0);
m_pChooser->setFont( m_pActivityWidget->font() );
}
--- branches/work/soc-umbrello/umbrello/dialogs/assocpropdlg.cpp #1230046:1230047
@@ -124,7 +124,7 @@
pageItem->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
addPage( pageItem );
- m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
+ m_pChooser = new KFontChooser( (QWidget*)page, KFontChooser::NoDisplayFlags, QStringList(), false);
m_pChooser->setFont( m_pAssoc->font());
m_pChooser->setSampleText(i18n("Association font"));
}
--- branches/work/soc-umbrello/umbrello/dialogs/classgenpage.cpp #1230046:1230047
@@ -443,7 +443,7 @@
UMLObject *o = m_pUmldoc->findUMLObject(name);
if (o && m_pObject != o) {
KMessageBox::sorry(this, i18n("The name you have chosen\nis already being used.\nThe name has been reset."),
- i18n("Name is Not Unique"), false);
+ i18n("Name is Not Unique"), 0);
m_pClassNameLE->setText( m_pObject->name() );
} else {
m_pObject->setName(name);
@@ -494,7 +494,7 @@
UMLObject * old = m_pUmldoc->findUMLObject(name);
if (old && o != old) {
KMessageBox::sorry(this, i18n("The name you have chosen\nis already being used.\nThe name has been reset."),
- i18n("Name is Not Unique"), false);
+ i18n("Name is Not Unique"), 0);
} else {
o->setName(name);
}
@@ -507,7 +507,7 @@
UMLObject* old = m_pUmldoc->findUMLObject(name);
if (old && o != old) {
KMessageBox::sorry(this, i18n("The name you have chosen\nis already being used.\nThe name has been reset."),
- i18n("Name is Not Unique"), false);
+ i18n("Name is Not Unique"), 0);
} else {
o->setName(name);
}
--- branches/work/soc-umbrello/umbrello/dialogs/classpropdlg.cpp #1230046:1230047
@@ -403,7 +403,7 @@
pageItem->setHeader( i18n("Font Settings") );
pageItem->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
addPage( pageItem );
- m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
+ m_pChooser = new KFontChooser( (QWidget*)page, KFontChooser::NoDisplayFlags, QStringList(), 0);
m_pChooser->setFont( m_pWidget->font() );
}
--- branches/work/soc-umbrello/umbrello/dialogs/objectnodedialog.cpp #1230046:1230047
@@ -221,7 +221,7 @@
pageItemFont->setHeader( i18n("Font Settings") );
pageItemFont->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
addPage( pageItemFont );
- m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
+ m_pChooser = new KFontChooser( (QWidget*)page, KFontChooser::NoDisplayFlags, QStringList(), 0);
m_pChooser->setFont( m_pObjectNodeWidget->font() );
}
--- branches/work/soc-umbrello/umbrello/dialogs/parmpropdlg.cpp #1230046:1230047
@@ -262,7 +262,7 @@
// currently only validates whether the name is not null.
if ( getName().trimmed().length() == 0 ) {
KMessageBox::error(this, i18n("You have entered an invalid parameter name."),
- i18n("Parameter Name Invalid"), false);
+ i18n("Parameter Name Invalid"), 0);
return false;
}
return true;
--- branches/work/soc-umbrello/umbrello/dialogs/settingsdlg.cpp #1230046:1230047
@@ -355,7 +355,7 @@
pageFont->setHeader( i18n("Font Settings") );
pageFont->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
addPage( pageFont );
- m_FontWidgets.chooser = new KFontChooser( page, false, QStringList(), false);
+ m_FontWidgets.chooser = new KFontChooser( page, KFontChooser::NoDisplayFlags, QStringList(), 0);
m_FontWidgets.chooser->setFont( m_pOptionState->uiState.font );
}
--- branches/work/soc-umbrello/umbrello/dialogs/statedialog.cpp #1230046:1230047
@@ -167,7 +167,7 @@
pageFont->setHeader( i18n("Font Settings") );
pageFont->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
addPage( pageFont );
- m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
+ m_pChooser = new KFontChooser( (QWidget*)page, KFontChooser::NoDisplayFlags, QStringList(), 0);
m_pChooser->setFont( m_pStateWidget->font() );
}
--- branches/work/soc-umbrello/umbrello/dialogs/umlattributedialog.cpp #1230046:1230047
@@ -158,7 +158,7 @@
QString name = m_pNameLE->text();
if (name.isEmpty()) {
KMessageBox::error(this, i18n("You have entered an invalid attribute name."),
- i18n("Attribute Name Invalid"), false);
+ i18n("Attribute Name Invalid"), 0);
m_pNameLE->setText( m_pAttribute->name() );
return false;
}
@@ -166,7 +166,7 @@
UMLObject *o = pConcept->findChildObject(name);
if (o && o != m_pAttribute) {
KMessageBox::error(this, i18n("The attribute name you have chosen is already being used in this operation."),
- i18n("Attribute Name Not Unique"), false);
+ i18n("Attribute Name Not Unique"), 0);
m_pNameLE->setText( m_pAttribute->name() );
return false;
}
--- branches/work/soc-umbrello/umbrello/dialogs/umlentityattributedialog.cpp #1230046:1230047
@@ -180,7 +180,7 @@
QString name = m_pNameLE->text();
if (name.isEmpty()) {
KMessageBox::error(this, i18n("You have entered an invalid entity attribute name."),
- i18n("Entity Attribute Name Invalid"), false);
+ i18n("Entity Attribute Name Invalid"), 0);
m_pNameLE->setText( m_pEntityAttribute->name() );
return false;
}
@@ -188,7 +188,7 @@
UMLObject *o = pConcept->findChildObject(name);
if (o && o != m_pEntityAttribute) {
KMessageBox::error(this, i18n("The entity attribute name you have chosen is already being used in this operation."),
- i18n("Entity Attribute Name Not Unique"), false);
+ i18n("Entity Attribute Name Not Unique"), 0);
m_pNameLE->setText( m_pEntityAttribute->name() );
return false;
}
--- branches/work/soc-umbrello/umbrello/dialogs/umloperationdialog.cpp #1230046:1230047
@@ -303,7 +303,7 @@
m_doc->setModified( true );
} else {
KMessageBox::sorry(this, i18n("The parameter name you have chosen\nis already being used in this operation."),
- i18n("Parameter Name Not Unique"), false);
+ i18n("Parameter Name Not Unique"), 0);
delete newAttribute;
}
} else {
@@ -349,7 +349,7 @@
pAtt = m_operation->findParm( newName ); // search whether a parameter with this name already exists
if( pAtt && pAtt != pOldAtt ) {
KMessageBox::error(this, i18n("The parameter name you have chosen is already being used in this operation."),
- i18n("Parameter Name Not Unique"), false);
+ i18n("Parameter Name Not Unique"), 0);
namingConflict = true;
}
@@ -434,7 +434,7 @@
QString name = m_pNameLE->text();
if( name.length() == 0 ) {
KMessageBox::error(this, i18n("You have entered an invalid operation name."),
- i18n("Operation Name Invalid"), false);
+ i18n("Operation Name Invalid"), 0);
m_pNameLE->setText( m_operation->name() );
return false;
}
@@ -446,7 +446,7 @@
QString msg = i18n("An operation with that signature already exists in %1.\n", classifier->name())
+
i18n("Choose a different name or parameter list.");
- KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
+ KMessageBox::error(this, msg, i18n("Operation Name Invalid"), 0);
return false;
}
m_operation->setName( name );
--- branches/work/soc-umbrello/umbrello/dialogs/umltemplatedialog.cpp #1230046:1230047
@@ -147,7 +147,7 @@
QString name = m_pNameLE->text();
if( name.length() == 0 ) {
KMessageBox::error(this, i18n("You have entered an invalid template name."),
- i18n("Template Name Invalid"), false);
+ i18n("Template Name Invalid"), 0);
m_pNameLE->setText( m_pTemplate->name() );
return false;
}
@@ -157,7 +157,7 @@
UMLObject *o = pClass->findChildObject(name);
if (o && o != m_pTemplate) {
KMessageBox::error(this, i18n("The template parameter name you have chosen is already being used in this operation."),
- i18n("Template Name Not Unique"), false);
+ i18n("Template Name Not Unique"), 0);
m_pNameLE->setText( m_pTemplate->name() );
return false;
}
--- branches/work/soc-umbrello/umbrello/dialogs/umluniqueconstraintdialog.cpp #1230046:1230047
@@ -239,7 +239,7 @@
QString name = m_pNameLE->text();
if ( name.length() == 0 ) {
KMessageBox::error(this, i18n("You have entered an invalid constraint name."),
- i18n("Constraint Name Invalid"), false);
+ i18n("Constraint Name Invalid"), 0);
m_pNameLE->setText( m_pUniqueConstraint->name() );
return false;
}
--- branches/work/soc-umbrello/umbrello/dialogs/umlviewdialog.cpp #1230046:1230047
@@ -155,7 +155,7 @@
m_pageFontItem->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
addPage(m_pageFontItem);
- m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
+ m_pChooser = new KFontChooser( (QWidget*)page, KFontChooser::NoDisplayFlags, QStringList(), 0);
m_pChooser->setFont( m_pScene->optionState().uiState.font );
}
@@ -218,7 +218,7 @@
QString newName = m_diagramProperties->ui_diagramName->text();
if ( newName.length() == 0 ) {
KMessageBox::sorry(this, i18n("The name you have entered is invalid."),
- i18n("Invalid Name"), false);
+ i18n("Invalid Name"), 0);
m_diagramProperties->ui_diagramName->setText( m_pScene->name() );
return;
}
@@ -228,7 +228,7 @@
UMLView* view = doc->findView( m_pScene->type(), newName);
if (view) {
KMessageBox::sorry(this, i18n("The name you have entered is not unique."),
- i18n("Name Not Unique"), false);
+ i18n("Name Not Unique"), 0);
m_diagramProperties->ui_diagramName->setText( m_pScene->name() );
}
else {
--- branches/work/soc-umbrello/umbrello/refactoring/refactoringassistant.cpp #1230046:1230047
@@ -805,7 +805,7 @@
QString msg = i18n("An operation with that signature already exists in %1.\n", newClassifier->name())
+
i18n("Choose a different name or parameter list.");
- KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
+ KMessageBox::error(this, msg, i18n("Operation Name Invalid"), 0);
return;
}
UMLOperation* newOp = static_cast<UMLOperation*>(op->clone());
@@ -826,7 +826,7 @@
QString msg = i18n("An attribute with that name already exists in %1.\n", newClassifier->name())
+
i18n("Choose a different name.");
- KMessageBox::error(this, msg, i18n("Attribute Name Invalid"), false);
+ KMessageBox::error(this, msg, i18n("Attribute Name Invalid"), 0);
return;
}
UMLAttribute* newAtt = static_cast<UMLAttribute*>(att->clone());
--- branches/work/soc-umbrello/umbrello/widgets/associationwidget.cpp #1230046:1230047
@@ -1470,14 +1470,14 @@
case ListPopupMenu::mt_Change_Font:
font = this->font();
- if (KFontDialog::getFont(font, false, view)) {
+ if (KFontDialog::getFont(font, KFontChooser::NoDisplayFlags, view)) {
lwSetFont(font);
}
break;
case ListPopupMenu::mt_Change_Font_Selection:
font = this->font();
- if (KFontDialog::getFont(font, false, view)) {
+ if (KFontDialog::getFont(font, KFontChooser::NoDisplayFlags, view)) {
if (scene) {
scene->selectionSetFont(font);
}
--- branches/work/soc-umbrello/umbrello/widgets/floatingtextwidget.cpp #1230046:1230047
@@ -682,7 +682,7 @@
case ListPopupMenu::mt_Change_Font:
{
QFont fnt = font();
- if(KFontDialog::getFont(fnt, false, umlScene()->activeView())) {
+ if(KFontDialog::getFont(fnt, KFontChooser::NoDisplayFlags, umlScene()->activeView())) {
if(m_textRole == Uml::TextRole::Floating || m_textRole == Uml::TextRole::Seq_Message) {
setFont(fnt);
} else if (m_linkWidget) {
--- branches/work/soc-umbrello/umbrello/widgets/widgetbase.cpp #1230046:1230047
@@ -982,7 +982,7 @@
case ListPopupMenu::mt_Change_Font:
case ListPopupMenu::mt_Change_Font_Selection: {
QFont newFont = font();
- if (KFontDialog::getFont(newFont, false, 0) == KFontDialog::Accepted) {
+ if (KFontDialog::getFont(newFont, KFontChooser::NoDisplayFlags, 0) == KFontDialog::Accepted) {
setFont(newFont);
//UMLApp::app()->executeCommand(new CmdChangeFontSelection(m_pDoc, m_pView, font));
}
More information about the umbrello-devel
mailing list