feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
This commit is contained in:
Eike Ziller
2012-03-08 07:48:55 +01:00
parent 3a808b0fd8 62fd2713d0
commit 4b8df15f3d
233 changed files with 1429 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/actionmanager/commandmappings.cpp
View File

@@ -93,8 +93,8 @@ QWidget *CommandMappings::createPage(QWidget *parent)
connect(m_page->filterEdit, SIGNAL(textChanged(QString)),
this, SLOT(filterChanged(QString)));
connect(m_page->commandList, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
this, SLOT(commandChanged(QTreeWidgetItem *)));
connect(m_page->commandList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
this, SLOT(commandChanged(QTreeWidgetItem*)));
connect(m_page->targetEdit, SIGNAL(textChanged(QString)),
this, SLOT(targetIdentifierChanged()));

18
src/plugins/coreplugin/dialogs/newdialog.cpp
View File

@@ -215,16 +215,16 @@ NewDialog::NewDialog(QWidget *parent) :
m_ui->templatesView->setIconSize(QSize(ICON_SIZE, ICON_SIZE));
connect(m_ui->templateCategoryView, SIGNAL(clicked(const QModelIndex&)),
this, SLOT(currentCategoryChanged(const QModelIndex&)));
connect(m_ui->templatesView, SIGNAL(clicked(const QModelIndex&)),
this, SLOT(currentItemChanged(const QModelIndex&)));
connect(m_ui->templateCategoryView, SIGNAL(clicked(QModelIndex)),
this, SLOT(currentCategoryChanged(QModelIndex)));
connect(m_ui->templatesView, SIGNAL(clicked(QModelIndex)),
this, SLOT(currentItemChanged(QModelIndex)));
connect(m_ui->templateCategoryView->selectionModel(),
SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)),
this, SLOT(currentCategoryChanged(const QModelIndex&)));
SIGNAL(currentChanged(QModelIndex,QModelIndex)),
this, SLOT(currentCategoryChanged(QModelIndex)));
connect(m_ui->templatesView,
SIGNAL(doubleClicked(const QModelIndex&)),
SIGNAL(doubleClicked(QModelIndex)),
this, SLOT(okButtonClicked()));
connect(m_okButton, SIGNAL(clicked()), this, SLOT(okButtonClicked()));
@@ -409,8 +409,8 @@ void NewDialog::currentCategoryChanged(const QModelIndex &index)
m_ui->templatesView->setCurrentIndex(m_ui->templatesView->rootIndex().child(0,0));
connect(m_ui->templatesView->selectionModel(),
SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)),
this, SLOT(currentItemChanged(const QModelIndex&)));
SIGNAL(currentChanged(QModelIndex,QModelIndex)),
this, SLOT(currentItemChanged(QModelIndex)));
}
}

2
src/plugins/coreplugin/dialogs/openwithdialog.cpp
View File

@@ -51,7 +51,7 @@ OpenWithDialog::OpenWithDialog(const QString &fileName, QWidget *parent)
this, SLOT(accept()));
connect(buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()),
this, SLOT(reject()));
connect(editorListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
connect(editorListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
this, SLOT(accept()));
connect(editorListWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
this, SLOT(currentItemChanged(QListWidgetItem*,QListWidgetItem*)));

6
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -293,7 +293,7 @@ void DocumentManager::addDocuments(const QList<IDocument *> &documents, bool add
foreach (IDocument *document, documents) {
if (document && !d->m_documentsWithoutWatch.contains(document)) {
connect(document, SIGNAL(destroyed(QObject *)), m_instance, SLOT(documentDestroyed(QObject *)));
connect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*)));
d->m_documentsWithoutWatch.append(document);
}
}
@@ -303,7 +303,7 @@ void DocumentManager::addDocuments(const QList<IDocument *> &documents, bool add
foreach (IDocument *document, documents) {
if (document && !d->m_documentsWithWatch.contains(document)) {
connect(document, SIGNAL(changed()), m_instance, SLOT(checkForNewFileName()));
connect(document, SIGNAL(destroyed(QObject *)), m_instance, SLOT(documentDestroyed(QObject *)));
connect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*)));
addFileInfo(document);
}
}
@@ -437,7 +437,7 @@ bool DocumentManager::removeDocument(IDocument *document)
removeFileInfo(document);
disconnect(document, SIGNAL(changed()), m_instance, SLOT(checkForNewFileName()));
}
disconnect(document, SIGNAL(destroyed(QObject *)), m_instance, SLOT(documentDestroyed(QObject *)));
disconnect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*)));
return addWatcher;
}

8
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -148,8 +148,8 @@ EditorManagerPlaceHolder::EditorManagerPlaceHolder(Core::IMode *mode, QWidget *p
{
setLayout(new QVBoxLayout);
layout()->setMargin(0);
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode *)),
this, SLOT(currentModeChanged(Core::IMode *)));
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
this, SLOT(currentModeChanged(Core::IMode*)));
currentModeChanged(ModeManager::currentMode());
}
@@ -289,8 +289,8 @@ EditorManager::EditorManager(QWidget *parent) :
{
m_instance = this;
connect(ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext *)),
this, SLOT(handleContextChange(Core::IContext *)));
connect(ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext*)),
this, SLOT(handleContextChange(Core::IContext*)));
const Context editManagerContext(Constants::C_EDITORMANAGER);
// combined context for edit & design modes

2
src/plugins/coreplugin/editormanager/openeditorswindow.cpp
View File

@@ -79,7 +79,7 @@ OpenEditorsWindow::OpenEditorsWindow(QWidget *parent) :
layout->setMargin(0);
layout->addWidget(m_editorList);
connect(m_editorList, SIGNAL(itemClicked(QTreeWidgetItem*, int)),
connect(m_editorList, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
this, SLOT(editorClicked(QTreeWidgetItem*)));
}

4
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -71,8 +71,8 @@ NavigationWidgetPlaceHolder::NavigationWidgetPlaceHolder(Core::IMode *mode, QWid
{
setLayout(new QVBoxLayout);
layout()->setMargin(0);
connect(Core::ModeManager::instance(), SIGNAL(currentModeAboutToChange(Core::IMode *)),
this, SLOT(currentModeAboutToChange(Core::IMode *)));
connect(Core::ModeManager::instance(), SIGNAL(currentModeAboutToChange(Core::IMode*)),
this, SLOT(currentModeAboutToChange(Core::IMode*)));
}
NavigationWidgetPlaceHolder::~NavigationWidgetPlaceHolder()

4
src/plugins/coreplugin/outputpane.cpp
View File

@@ -70,8 +70,8 @@ OutputPanePlaceHolder::OutputPanePlaceHolder(Core::IMode *mode, QSplitter* paren
sp.setHorizontalStretch(0);
setSizePolicy(sp);
layout()->setMargin(0);
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode *)),
this, SLOT(currentModeChanged(Core::IMode *)));
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
this, SLOT(currentModeChanged(Core::IMode*)));
}
OutputPanePlaceHolder::~OutputPanePlaceHolder()

4
src/plugins/coreplugin/rightpane.cpp
View File

@@ -57,8 +57,8 @@ RightPanePlaceHolder::RightPanePlaceHolder(Core::IMode *mode, QWidget *parent)
{
setLayout(new QVBoxLayout);
layout()->setMargin(0);
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode *)),
this, SLOT(currentModeChanged(Core::IMode *)));
connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
this, SLOT(currentModeChanged(Core::IMode*)));
}
RightPanePlaceHolder::~RightPanePlaceHolder()