[Uml-devel] KDE/kdesdk/umbrello/umbrello/dialogs (silent)
Andi Fischer
andi.fischer at hispeed.ch
Sat Mar 1 14:46:52 UTC 2008
SVN commit 780885 by fischer:
SVN_SILENT: formatting.
M +15 -17 assocgenpage.cpp
M +28 -19 codegenerationwizard.cpp
M +29 -19 umlentityattributedialog.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocgenpage.cpp #780884:780885
@@ -5,7 +5,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2003-2006 *
+ * copyright (C) 2003-2008 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -13,15 +13,14 @@
#include "assocgenpage.h"
// qt includes
-#include <qlayout.h>
-#include <kcombobox.h>
-//Added by qt3to4:
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QGridLayout>
// kde includes
+#include <kcombobox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kdebug.h>
@@ -31,10 +30,10 @@
#include "../dialog_utils.h"
#include "../assocrules.h"
+
AssocGenPage::AssocGenPage (UMLDoc *d, QWidget *parent, AssociationWidget *assoc)
: QWidget(parent)
{
-
m_pAssociationWidget = assoc;
m_pWidget = 0;
m_pTypeCB = 0;
@@ -42,13 +41,14 @@
m_pUmldoc = d;
constructWidget();
+}
+AssocGenPage::~AssocGenPage()
+{
}
-AssocGenPage::~AssocGenPage() {}
-
-void AssocGenPage::constructWidget() {
-
+void AssocGenPage::constructWidget()
+{
// general configuration of the GUI
int margin = fontMetrics().height();
setMinimumSize(310,330);
@@ -132,12 +132,10 @@
nameLayout->addWidget(m_pTypeCB, 1, 1);
m_pDoc->setWordWrap(Q3MultiLineEdit::WidgetWidth);
-
}
-
-void AssocGenPage::updateObject() {
-
+void AssocGenPage::updateObject()
+{
if (m_pAssociationWidget) {
int comboBoxItem = m_pTypeCB->currentIndex();
Uml::Association_Type newType = m_AssocTypes[comboBoxItem];
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp #780884:780885
@@ -13,7 +13,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2003-2007 *
+ * copyright (C) 2003-2008 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -21,11 +21,11 @@
#include "codegenerationwizard.h"
// qt/kde includes
-#include <QPixmap>
-#include <qdir.h>
+#include <QtCore/QDir>
#include <q3listview.h>
-#include <qfileinfo.h>
-#include <qapplication.h>
+#include <QtCore/QFileInfo>
+#include <QtGui/QApplication>
+#include <QtGui/QPixmap>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -40,9 +40,10 @@
#include "../umlentitylist.h"
#include "../entity.h"
+
CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList)
- : Q3Wizard((QWidget*)UMLApp::app()) {
-
+ : Q3Wizard((QWidget*)UMLApp::app())
+ {
setupUi(this);
m_doc = UMLApp::app()->getDocument();
@@ -98,10 +99,12 @@
}
}
-CodeGenerationWizard::~CodeGenerationWizard() {}
+CodeGenerationWizard::~CodeGenerationWizard()
+{
+}
-
-void CodeGenerationWizard::selectClass() {
+void CodeGenerationWizard::selectClass()
+{
moveSelectedItems(m_availableList, m_selectedList);
if (m_selectedList->childCount() > 0) {
@@ -109,7 +112,8 @@
}
}
-void CodeGenerationWizard::deselectClass() {
+void CodeGenerationWizard::deselectClass()
+{
moveSelectedItems(m_selectedList, m_availableList);
if (m_selectedList->childCount() == 0) {
@@ -117,7 +121,8 @@
}
}
-void CodeGenerationWizard::generateCode() {
+void CodeGenerationWizard::generateCode()
+{
backButton()->setEnabled(false);
CodeGenerator* codeGenerator = m_app->getGenerator();
@@ -140,14 +145,14 @@
finishButton()->setText(i18n("Finish"));
finishButton()->disconnect();
connect(finishButton(),SIGNAL(clicked()),this,SLOT(accept()));
-
}
}
-void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated) {
+void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated)
+{
Q3ListViewItem* item = m_statusList->findItem( concept->getFullyQualifiedName(), 0 );
if( !item ) {
- uError()<<"GenerationStatusPage::Error finding class in list view"<<endl;
+ uError()<<"GenerationStatusPage::Error finding class in list view";
} else if (generated) {
item->setText( 1, i18n("Code Generated") );
} else {
@@ -155,14 +160,16 @@
}
}
-void CodeGenerationWizard::populateStatusList() {
+void CodeGenerationWizard::populateStatusList()
+{
m_statusList->clear();
for(Q3ListViewItem* item = m_selectedList->firstChild(); item; item = item->nextSibling()) {
new Q3ListViewItem(m_statusList,item->text(0),i18n("Not Yet Generated"));
}
}
-void CodeGenerationWizard::showPage(QWidget *page) {
+void CodeGenerationWizard::showPage(QWidget *page)
+{
if (indexOf(page) == 2)
{
// first save the settings to the selected generator policy
@@ -218,7 +225,8 @@
Q3Wizard::showPage(page);
}
-CodeGenerator* CodeGenerationWizard::generator() {
+CodeGenerator* CodeGenerationWizard::generator()
+{
// FIX
/*
KLibLoader* loader = KLibLoader::self();
@@ -246,7 +254,8 @@
return (CodeGenerator*) NULL;
}
-void CodeGenerationWizard::moveSelectedItems(Q3ListView* fromList, Q3ListView* toList) {
+void CodeGenerationWizard::moveSelectedItems(Q3ListView* fromList, Q3ListView* toList)
+{
Q3ListViewItemIterator it(fromList, Q3ListViewItemIterator::Selected);
while (it.current()) {
Q3ListViewItem* selectedItem = it.current();
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlentityattributedialog.cpp #780884:780885
@@ -5,7 +5,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2002-2007 *
+ * copyright (C) 2002-2008 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -13,17 +13,16 @@
#include "umlentityattributedialog.h"
// qt includes
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <QtGui/QLayout>
+#include <QtGui/QCheckBox>
#include <q3groupbox.h>
#include <q3buttongroup.h>
-#include <qradiobutton.h>
-#include <qlabel.h>
-//Added by qt3to4:
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
-#include <QApplication>
+#include <QtGui/QRadioButton>
+#include <QtGui/QLabel>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QGridLayout>
+#include <QtGui/QApplication>
// kde includes
#include <klineedit.h>
#include <kcombobox.h>
@@ -42,8 +41,10 @@
#include "../object_factory.h"
#include "../umlclassifierlist.h"
+
UMLEntityAttributeDialog::UMLEntityAttributeDialog( QWidget * pParent, UMLEntityAttribute * pEntityAttribute )
- : KDialog( pParent) {
+ : KDialog( pParent)
+{
setCaption( i18n("Entity Attribute Properties") );
setButtons( Help | Ok | Cancel );
setDefaultButton( Ok );
@@ -55,9 +56,12 @@
connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
}
-UMLEntityAttributeDialog::~UMLEntityAttributeDialog() {}
+UMLEntityAttributeDialog::~UMLEntityAttributeDialog()
+{
+}
-void UMLEntityAttributeDialog::setupDialog() {
+void UMLEntityAttributeDialog::setupDialog()
+{
UMLDoc * pDoc = UMLApp::app()->getDocument();
int margin = fontMetrics().height();
QFrame *frame = new QFrame( this );
@@ -198,7 +202,8 @@
enableButtonOk( !_text.isEmpty() );
}
-bool UMLEntityAttributeDialog::apply() {
+bool UMLEntityAttributeDialog::apply()
+{
QString name = m_pNameLE->text();
if (name.isEmpty()) {
KMessageBox::error(this, i18n("You have entered an invalid entity attribute name."),
@@ -261,28 +266,33 @@
return true;
}
-void UMLEntityAttributeDialog::slotApply() {
+void UMLEntityAttributeDialog::slotApply()
+{
apply();
}
-void UMLEntityAttributeDialog::slotOk() {
+void UMLEntityAttributeDialog::slotOk()
+{
if ( apply() ) {
accept();
}
}
-void UMLEntityAttributeDialog::insertType( const QString& type, int index ) {
+void UMLEntityAttributeDialog::insertType( const QString& type, int index )
+{
m_pTypeCB->insertItem( index, type );
m_pTypeCB->completionObject()->addItem( type );
}
-void UMLEntityAttributeDialog::insertAttribute( const QString& type, int index ) {
+void UMLEntityAttributeDialog::insertAttribute( const QString& type, int index )
+{
m_pAttributesCB->insertItem( index, type );
m_pAttributesCB->completionObject()->addItem( type );
}
-void UMLEntityAttributeDialog::slotAutoIncrementStateChanged(bool checked) {
+void UMLEntityAttributeDialog::slotAutoIncrementStateChanged(bool checked)
+{
if ( checked == true ) {
m_pNullCB->setChecked( false );
m_pNullCB->setEnabled( false );
More information about the umbrello-devel
mailing list