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

Make SubmitEditorFile dependency on VcsBaseSubmitEditor explicit

Browse Source 
No use trying to hide it.

Change-Id: Id81fdf1eef704dec6d4e83ee69bec10b1244b202
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2013-07-15 10:35:10 +02:00
parent aec9124723
commit 42e0e229af
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -146,7 +146,7 @@ struct VcsBaseSubmitEditorPrivate
{
VcsBaseSubmitEditorPrivate(const VcsBaseSubmitEditorParameters *parameters,
SubmitEditorWidget *editorWidget,
QObject *q);
VcsBaseSubmitEditor *q);
SubmitEditorWidget *m_widget;
QToolBar *m_toolWidget;
@@ -163,7 +163,7 @@ struct VcsBaseSubmitEditorPrivate
VcsBaseSubmitEditorPrivate::VcsBaseSubmitEditorPrivate(const VcsBaseSubmitEditorParameters *parameters,
SubmitEditorWidget *editorWidget,
QObject *q) :
VcsBaseSubmitEditor *q) :
m_widget(editorWidget),
m_toolWidget(0),
m_parameters(parameters),
@@ -194,8 +194,6 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa
d->m_file->setModified(false);
// We are always clean to prevent the editor manager from asking to save.
connect(d->m_file, SIGNAL(saveMe(QString*,QString,bool)),
this, SLOT(save(QString*,QString,bool)));
connect(d->m_widget, SIGNAL(diffSelected(QList<int>)), this, SLOT(slotDiffSelectedVcsFiles(QList<int>)));
connect(d->m_widget->descriptionEdit(), SIGNAL(textChanged()), this, SLOT(slotDescriptionChanged()));
@@ -515,21 +513,6 @@ void VcsBaseSubmitEditor::slotDiffSelectedVcsFiles(const QList<int> &rawList)
emit diffSelectedFiles(rowsToFiles(rawList));
}
bool VcsBaseSubmitEditor::save(QString *errorString, const QString &fileName, bool autoSave)
{
const QString fName = fileName.isEmpty() ? d->m_file->filePath() : fileName;
Utils::FileSaver saver(fName, QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
saver.write(fileContents());
if (!saver.finalize(errorString))
return false;
if (autoSave)
return true;
const QFileInfo fi(fName);
d->m_file->setFilePath(fi.absoluteFilePath());
d->m_file->setModified(false);
return true;
}
QByteArray VcsBaseSubmitEditor::fileContents() const
{
return d->m_widget->descriptionText().toLocal8Bit();