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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp
View File

@@ -158,7 +158,7 @@ ReadOnlyFilesDialog::~ReadOnlyFilesDialog()
}
/*!
* \brief Set a user defined message in the dialog.
* Sets a user defined message in the dialog.
* \internal
*/
void ReadOnlyFilesDialog::setMessage(const QString &message)
@@ -167,8 +167,8 @@ void ReadOnlyFilesDialog::setMessage(const QString &message)
}
/*!
* \brief Enable the error output to the user via a messageBox.
* \param warning Added to the dialog, should show possible consequences if the file is still read only.
* Enables the error output to the user via a message box. \a warning should
* show the possible consequences if the file is still read only.
* \internal
*/
void ReadOnlyFilesDialog::setShowFailWarning(bool show, const QString &warning)
@@ -178,7 +178,7 @@ void ReadOnlyFilesDialog::setShowFailWarning(bool show, const QString &warning)
}
/*!
* \brief Opens a message box with an error description according to the type.
* Opens a message box with an error description according to the type.
* \internal
*/
void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyResult type) const
@@ -237,12 +237,13 @@ void ReadOnlyFilesDialog::promptFailWarning(const QStringList &files, ReadOnlyRe
}
/*!
* \brief Executes the dialog.
* \return ReadOnlyResult which gives information about the operation which was used to make the files writable.
* Executes the ReadOnlyFilesDialog dialog.
* Returns ReadOnlyResult to provide information about the operation that was
* used to make the files writable.
* \internal
*
* Also displays an error dialog when some operations can't be executed and the function
* setShowFailWarning was called.
* Also displays an error dialog when some operations cannot be executed and the
* function \c setShowFailWarning() was called.
*/
int ReadOnlyFilesDialog::exec()
{
@@ -287,9 +288,9 @@ int ReadOnlyFilesDialog::exec()
}
/*!
* \brief Creates a radio button in the column specified with type.
* \param group the created button will be added to this group.
* \return the created button.
* Creates a radio button in the group \a group and in the column specified by
* \a type.
* Returns the created button.
* \internal
*/
QRadioButton* ReadOnlyFilesDialog::createRadioButtonForItem(QTreeWidgetItem *item, QButtonGroup *group,
@@ -304,7 +305,8 @@ QRadioButton* ReadOnlyFilesDialog::createRadioButtonForItem(QTreeWidgetItem *ite
}
/*!
* \brief Checks the type of the select all combo box and change the user selection per file accordingly.
* Checks the type of the select all combo box and changes the user selection
* per file accordingly.
* \internal
*/
void ReadOnlyFilesDialog::setAll(int index)
@@ -331,7 +333,8 @@ void ReadOnlyFilesDialog::setAll(int index)
}
/*!
* \brief Updates the select all combo box depending on the selection in the tree widget the user made.
* Updates the select all combo box depending on the selection the user made in
* the tree widget.
* \internal
*/
void ReadOnlyFilesDialog::updateSelectAll()
@@ -349,8 +352,10 @@ void ReadOnlyFilesDialog::updateSelectAll()
}
/*!
* \brief Adds files to the dialog and check for possible operation to make the file writable.
* \param fileNames A List of files which should be added to the dialog.
* Adds files to the dialog and checks for a possible operation to make the file
* writable.
* \a fileNames contains the list of the files that should be added to the
* dialog.
* \internal
*/
void ReadOnlyFilesDialog::initDialog(const QStringList &fileNames)