[Uml-devel] KDE/kdesdk/umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Mon Nov 28 22:12:22 UTC 2011
SVN commit 1266287 by fischer:
Krazy issues about normalized SIGNAL and SLOT signatures fixed.
U codegenerators/cpp/cppcodegenerationform.cpp
M +7 -2 codeimpwizard/codeimpselectpage.cpp
M +2 -2 codeimpwizard/codeimpthread.cpp
M +2 -2 dialogs/activitypage.cpp
M +4 -4 dialogs/assocpage.cpp
U dialogs/classgenpage.cpp
M +1 -1 dialogs/classifierlistpage.cpp
U dialogs/codeviewerdialog.cpp
U dialogs/constraintlistpage.cpp
M +4 -4 dialogs/pkgcontentspage.cpp
M +1 -1 dialogs/umlattributedialog.cpp
M +1 -1 dialogs/umlentityattributedialog.cpp
M +3 -3 dialogs/umloperationdialog.cpp
U dialogs/umluniqueconstraintdialog.cpp
U dialogs/umlwidgetcolorpage.cpp
M +1 -1 docgenerators/docbookgenerator.cpp
M +2 -2 docgenerators/xhtmlgenerator.cpp
U entity.cpp
U foreignkeyconstraint.cpp
U linepath.cpp
M +2 -2 refactoring/refactoringassistant.cpp
M +3 -3 uml.cpp
U umldoc.cpp
U umllistview.cpp
U umlview.cpp
U widgets/associationwidget.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimpwizard/codeimpselectpage.cpp #1266286:1266287
@@ -33,7 +33,7 @@
/**
* Keep the last clicked directory for setting it the next time.
*/
-QString CodeImpSelectPage::s_recentPath = QString();
+QString CodeImpSelectPage::s_recentPath = "";
/**
* Constructor.
@@ -54,7 +54,7 @@
connect(this, SIGNAL(languageChanged()), this, SLOT(changeLanguage()));
setupTreeView();
- connect(ui_treeView, SIGNAL(clicked(const QModelIndex&)), this, SLOT(treeClicked(const QModelIndex&)));
+ connect(ui_treeView, SIGNAL(clicked(QModelIndex)), this, SLOT(treeClicked(QModelIndex)));
setupFileExtEdit();
connect(ui_fileExtLineEdit, SIGNAL(editingFinished()), this, SLOT(fileExtChanged()));
@@ -241,6 +241,10 @@
if (selectionModel->isSelected(index)) {
// uDebug() << "select all children";
QFileInfo childInfo = indexModel->fileInfo(childIndex);
+ if (childInfo.isDir() && ui_subdirCheckBox->isChecked()) {
+ treeClicked(childIndex);
+ }
+ else {
if (matchFilter(childInfo)) {
selectionModel->select(childIndex, QItemSelectionModel::Select);
}
@@ -248,6 +252,7 @@
selectionModel->select(childIndex, QItemSelectionModel::Deselect);
}
}
+ }
else {
// uDebug() << "deselect all children";
selectionModel->select(childIndex, QItemSelectionModel::Deselect);
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimpwizard/codeimpthread.cpp #1266286:1266287
@@ -33,8 +33,8 @@
: //QThread(parent),
m_file(file)
{
- connect(this, SIGNAL(askQuestion( const QString&, QMessageBox::StandardButton*)),
- this, SLOT(questionAsked( const QString&, QMessageBox::StandardButton*)));
+ connect(this, SIGNAL(askQuestion(QString, QMessageBox::StandardButton*)),
+ this, SLOT(questionAsked(QString, QMessageBox::StandardButton*)));
}
/**
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/activitypage.cpp #1266286:1266287
@@ -119,8 +119,8 @@
//now setup the signals
connect(m_pActivityLW, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(slotClicked(QListWidgetItem *)));
- connect(m_pActivityLW, SIGNAL(customContextMenuRequested(const QPoint &)),
- this, SLOT(slotRightButtonPressed(const QPoint &)));
+ connect(m_pActivityLW, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(slotRightButtonPressed(QPoint)));
connect(m_pTopArrowB, SIGNAL( clicked() ), this, SLOT( slotTopClicked() ) );
connect(m_pUpArrowB, SIGNAL( clicked() ), this, SLOT( slotUpClicked() ) );
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocpage.cpp #1266286:1266287
@@ -51,8 +51,8 @@
connect(m_pAssocLW, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
this, SLOT(slotDoubleClick(QListWidgetItem *)));
- connect(m_pAssocLW, SIGNAL(customContextMenuRequested(const QPoint &)),
- this, SLOT(slotRightButtonPressed(const QPoint &)));
+ connect(m_pAssocLW, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(slotRightButtonPressed(QPoint)));
}
/**
@@ -62,8 +62,8 @@
{
disconnect(m_pAssocLW, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
this, SLOT(slotDoubleClick(QListWidgetItem *)));
- disconnect(m_pAssocLW, SIGNAL(customContextMenuRequested(const QPoint &)),
- this, SLOT(slotRightButtonPressed(const QPoint &)));
+ disconnect(m_pAssocLW, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(slotRightButtonPressed(QPoint)));
}
void AssocPage::slotDoubleClick(QListWidgetItem * item)
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp #1266286:1266287
@@ -91,7 +91,7 @@
connect(m_pItemListLB, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(slotActivateItem(QListWidgetItem*)));
connect(m_pItemListLB, SIGNAL(itemDoubleClicked( QListWidgetItem*)), this, SLOT(slotDoubleClick(QListWidgetItem*)));
- connect(m_pItemListLB, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(slotRightButtonPressed(const QPoint&)));
+ connect(m_pItemListLB, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotRightButtonPressed(QPoint)));
connect(m_pDoc, SIGNAL(sigObjectCreated(UMLObject*)), this, SLOT(slotListItemCreated(UMLObject*)));
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/pkgcontentspage.cpp #1266286:1266287
@@ -53,8 +53,8 @@
connect(m_contentLW, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
this, SLOT(slotDoubleClick(QListWidgetItem*)));
- connect(m_contentLW, SIGNAL(customContextMenuRequested(const QPoint&)),
- this, SLOT(slotShowContextMenu(const QPoint&)));
+ connect(m_contentLW, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(slotShowContextMenu(QPoint)));
}
/**
@@ -64,8 +64,8 @@
{
disconnect(m_contentLW, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
this, SLOT(slotDoubleClick(QListWidgetItem*)));
- disconnect(m_contentLW, SIGNAL(customContextMenuRequested(const QPoint&)),
- this, SLOT(slotShowContextMenu(const QPoint&)));
+ disconnect(m_contentLW, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(slotShowContextMenu(QPoint)));
}
void PkgContentsPage::slotDoubleClick(QListWidgetItem *item)
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp #1266286:1266287
@@ -137,7 +137,7 @@
insertTypesSorted(m_pAttribute->getTypeName());
m_pNameLE->setFocus();
- connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) );
+ connect( m_pNameLE, SIGNAL(textChanged(QString)), SLOT(slotNameChanged(QString)));
slotNameChanged(m_pNameLE->text() );
connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlentityattributedialog.cpp #1266286:1266287
@@ -160,7 +160,7 @@
insertTypesSorted(m_pEntityAttribute->getTypeName());
m_pNameLE->setFocus();
- connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) );
+ connect( m_pNameLE, SIGNAL(textChanged (QString)), SLOT(slotNameChanged(QString)));
connect( m_pAutoIncrementCB, SIGNAL( clicked( bool ) ), this, SLOT( slotAutoIncrementStateChanged( bool) ) );
slotNameChanged(m_pNameLE->text() );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp #1266286:1266287
@@ -223,13 +223,13 @@
connect(m_pParmsLW, SIGNAL(itemClicked(QListWidgetItem*)),
this, SLOT(slotParamsBoxClicked(QListWidgetItem*)));
- connect(m_pParmsLW, SIGNAL(customContextMenuRequested(const QPoint &)),
- this, SLOT(slotParmRightButtonPressed(const QPoint &)));
+ connect(m_pParmsLW, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(slotParmRightButtonPressed(QPoint)));
connect(m_pParmsLW, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
this, SLOT(slotParmDoubleClick(QListWidgetItem *)));
m_pNameLE->setFocus();
- connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) );
+ connect( m_pNameLE, SIGNAL(textChanged(QString)), SLOT(slotNameChanged(QString)));
slotNameChanged( m_pNameLE->text() );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/docgenerators/docbookgenerator.cpp #1266286:1266287
@@ -89,7 +89,7 @@
umlDoc->writeToStatusBar(i18n("Generating Docbook..."));
docbookGeneratorJob = new DocbookGeneratorJob( this );
- connect( docbookGeneratorJob , SIGNAL(docbookGenerated(const QString&)), this, SLOT(slotDocbookGenerationFinished(const QString&)));
+ connect(docbookGeneratorJob, SIGNAL(docbookGenerated(QString)), this, SLOT(slotDocbookGenerationFinished(QString)));
connect( docbookGeneratorJob, SIGNAL( finished() ), this, SLOT( threadFinished() ) );
uDebug()<<"Threading";
docbookGeneratorJob->start();
--- trunk/KDE/kdesdk/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp #1266286:1266287
@@ -107,8 +107,8 @@
m_umlDoc->writeToStatusBar( i18n( "Generating XHTML..." ) );
m_d2xg = new Docbook2XhtmlGeneratorJob( url, this );
- connect(m_d2xg, SIGNAL( xhtmlGenerated( const QString& ) ),
- this, SLOT(slotHtmlGenerated(const QString&) ) );
+ connect(m_d2xg, SIGNAL(xhtmlGenerated(QString)),
+ this, SLOT(slotHtmlGenerated(QString)));
connect(m_d2xg, SIGNAL( finished() ), this, SLOT( threadFinished() ) );
uDebug() << "Threading";
m_d2xg->start();
--- trunk/KDE/kdesdk/umbrello/umbrello/refactoring/refactoringassistant.cpp #1266286:1266287
@@ -53,8 +53,8 @@
connect(this, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
this, SLOT(itemExecuted(QTreeWidgetItem*, int)));
- connect(this, SIGNAL(customContextMenuRequested(const QPoint&)),
- this, SLOT(showContextMenu(const QPoint&)));
+ connect(this, SIGNAL(customContextMenuRequested(QPoint)),
+ this, SLOT(showContextMenu(QPoint)));
resize(300, 400);
refactor(obj);
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #1266286:1266287
@@ -230,8 +230,8 @@
editUndo = m_pUndoStack->createUndoAction(actionCollection());
editRedo = m_pUndoStack->createRedoAction(actionCollection());
- disconnect( m_pUndoStack, SIGNAL( undoTextChanged(const QString& ) ),editUndo, 0 );
- disconnect( m_pUndoStack, SIGNAL( redoTextChanged(const QString& ) ),editRedo, 0 );
+ disconnect( m_pUndoStack, SIGNAL(undoTextChanged(QString)), editUndo, 0 );
+ disconnect( m_pUndoStack, SIGNAL(redoTextChanged(QString)), editRedo, 0 );
editCut = KStandardAction::cut(this, SLOT(slotEditCut()), actionCollection());
editCopy = KStandardAction::copy(this, SLOT(slotEditCopy()), actionCollection());
@@ -676,7 +676,7 @@
*/
void UMLApp::initStatusBar()
{
- connect(m_doc, SIGNAL( sigWriteToStatusBar(const QString &) ), this, SLOT( slotStatusMsg(const QString &) ));
+ connect(m_doc, SIGNAL(sigWriteToStatusBar(QString)), this, SLOT(slotStatusMsg(QString)));
m_statusBarMessage = new QLabel(i18nc("init status bar", "Ready"));
statusBar()->addWidget(m_statusBarMessage);
More information about the umbrello-devel
mailing list