Skip to content

Commit 52ac8f9

Browse files
riusonriuson
committedAug 28, 2013
Interface method renamed
1 parent 79cbf49 commit 52ac8f9

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed
 

‎classes/action-handlers/actionfilehandlers.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void ActionFileHandlers::newImage_triggered()
5353

5454
name = this->mMainWindow->findAvailableName(name);
5555
ed->document()->setDocumentName(name);
56-
emit this->tabCreated(ed, name, ed->document()->dataFilename());
56+
emit this->tabCreated(ed, name, ed->document()->documentFilename());
5757
}
5858
}
5959
//-----------------------------------------------------------------------------
@@ -89,7 +89,7 @@ void ActionFileHandlers::newFont_triggered()
8989

9090
name = this->mMainWindow->findAvailableName(name);
9191
ed->document()->setDocumentName(name);
92-
emit this->tabCreated(ed, name, ed->document()->dataFilename());
92+
emit this->tabCreated(ed, name, ed->document()->documentFilename());
9393
}
9494
}
9595
}
@@ -139,8 +139,8 @@ void ActionFileHandlers::save_triggered()
139139
IEditor *editor = this->editor();
140140
if (editor != NULL)
141141
{
142-
if (QFile::exists(editor->document()->dataFilename()))
143-
editor->document()->save(editor->document()->dataFilename());
142+
if (QFile::exists(editor->document()->documentFilename()))
143+
editor->document()->save(editor->document()->documentFilename());
144144
else
145145
this->saveAs_triggered();
146146
}
@@ -153,7 +153,7 @@ void ActionFileHandlers::saveAs_triggered()
153153
{
154154
QFileDialog dialog(this->mMainWindow->parentWidget());
155155
dialog.setAcceptMode(QFileDialog::AcceptSave);
156-
dialog.selectFile(editor->document()->dataFilename());
156+
dialog.selectFile(editor->document()->documentFilename());
157157
dialog.setFileMode(QFileDialog::AnyFile);
158158
dialog.setNameFilter(tr("XML Files (*.xml)"));
159159
dialog.setDefaultSuffix(QString("xml"));

‎classes/data/fontdocument.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ FontDocument::FontDocument(QObject *parent) :
4040
this->mContainer = new DataContainer(this);
4141

4242
this->setDocumentName(tr("Font", "new font name"));
43-
this->setDataFilename("");
43+
this->setDocumentFilename("");
4444
this->setOutputFilename("");
4545
this->setChanged(false);
4646
this->setAntialiasing(false);
@@ -147,7 +147,7 @@ bool FontDocument::load(const QString &fileName)
147147
}
148148
file.close();
149149

150-
this->setDataFilename(fileName);
150+
this->setDocumentFilename(fileName);
151151
this->setOutputFilename(converted);
152152
this->setChanged(false);
153153
}
@@ -251,7 +251,7 @@ bool FontDocument::save(const QString &fileName)
251251
QTextStream stream(&file);
252252
doc.save(stream, 4);
253253

254-
this->setDataFilename(fileName);
254+
this->setDocumentFilename(fileName);
255255
file.close();
256256
result = true;
257257
this->setChanged(false);
@@ -266,7 +266,7 @@ bool FontDocument::changed() const
266266
return result;
267267
}
268268
//-----------------------------------------------------------------------------
269-
QString FontDocument::dataFilename() const
269+
QString FontDocument::documentFilename() const
270270
{
271271
QVariant result = this->mContainer->info("filename");
272272
return result.toString();
@@ -296,8 +296,8 @@ void FontDocument::convert(bool request)
296296
{
297297
Tags tags;
298298

299-
if (!this->dataFilename().isEmpty())
300-
tags.setTagValue(Tags::DocumentFilename, this->dataFilename());
299+
if (!this->documentFilename().isEmpty())
300+
tags.setTagValue(Tags::DocumentFilename, this->documentFilename());
301301
else
302302
tags.setTagValue(Tags::DocumentFilename, "unsaved");
303303

@@ -529,9 +529,9 @@ void FontDocument::setFontCharacters(const QString &chars,
529529
this->setChanged(true);
530530
}
531531
//-----------------------------------------------------------------------------
532-
void FontDocument::setDataFilename(const QString &value)
532+
void FontDocument::setDocumentFilename(const QString &value)
533533
{
534-
if (this->dataFilename() != value)
534+
if (this->documentFilename() != value)
535535
{
536536
this->mContainer->setInfo("filename", QVariant(value));
537537
}

‎classes/data/fontdocument.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class FontDocument : public QObject, public IDocument
3737
bool load(const QString &fileName);
3838
bool save(const QString &fileName);
3939
bool changed() const;
40-
QString dataFilename() const;
40+
QString documentFilename() const;
4141
QString documentName() const;
4242
void setDocumentName(const QString &value);
4343
DataContainer *dataContainer();
@@ -66,7 +66,7 @@ class FontDocument : public QObject, public IDocument
6666
private:
6767
DataContainer *mContainer;
6868

69-
void setDataFilename(const QString &value);
69+
void setDocumentFilename(const QString &value);
7070

7171
QString outputFilename() const;
7272
void setOutputFilename(const QString &value);

‎classes/data/imagedocument.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ImageDocument::ImageDocument(QObject *parent) :
3838
{
3939
this->mContainer = new DataContainer(this);
4040
this->setDocumentName(tr("Image", "new image name"));
41-
this->setDataFilename("");
41+
this->setDocumentFilename("");
4242
this->setOutputFilename("");
4343
this->setChanged(false);
4444
}
@@ -91,7 +91,7 @@ bool ImageDocument::load(const QString &fileName)
9191
}
9292
file.close();
9393

94-
this->setDataFilename(fileName);
94+
this->setDocumentFilename(fileName);
9595
this->setOutputFilename(converted);
9696
this->setChanged(false);
9797
}
@@ -137,7 +137,7 @@ bool ImageDocument::save(const QString &fileName)
137137
QTextStream stream(&file);
138138
doc.save(stream, 4);
139139

140-
this->setDataFilename(fileName);
140+
this->setDocumentFilename(fileName);
141141
file.close();
142142
result = true;
143143
this->setChanged(false);
@@ -151,7 +151,7 @@ bool ImageDocument::changed() const
151151
return result;
152152
}
153153
//-----------------------------------------------------------------------------
154-
QString ImageDocument::dataFilename() const
154+
QString ImageDocument::documentFilename() const
155155
{
156156
QVariant result = this->mContainer->info("filename");
157157
return result.toString();
@@ -181,8 +181,8 @@ void ImageDocument::convert(bool request)
181181
{
182182
Tags tags;
183183

184-
if (!this->dataFilename().isEmpty())
185-
tags.setTagValue(Tags::DocumentFilename, this->dataFilename());
184+
if (!this->documentFilename().isEmpty())
185+
tags.setTagValue(Tags::DocumentFilename, this->documentFilename());
186186
else
187187
tags.setTagValue(Tags::DocumentFilename, "unsaved");
188188

@@ -280,9 +280,9 @@ void ImageDocument::redo()
280280
emit this->documentChanged();
281281
}
282282
//-----------------------------------------------------------------------------
283-
void ImageDocument::setDataFilename(const QString &value)
283+
void ImageDocument::setDocumentFilename(const QString &value)
284284
{
285-
if (this->dataFilename() != value)
285+
if (this->documentFilename() != value)
286286
{
287287
this->mContainer->setInfo("filename", QVariant(value));
288288
}

‎classes/data/imagedocument.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ImageDocument : public QObject, public IDocument
3535
bool load(const QString &fileName);
3636
bool save(const QString &fileName);
3737
bool changed() const;
38-
QString dataFilename() const;
38+
QString documentFilename() const;
3939
QString documentName() const;
4040
void setDocumentName(const QString &value);
4141
DataContainer *dataContainer();
@@ -53,7 +53,7 @@ class ImageDocument : public QObject, public IDocument
5353

5454
static const QString DefaultKey;
5555

56-
void setDataFilename(const QString &value);
56+
void setDocumentFilename(const QString &value);
5757

5858
QString outputFilename() const;
5959
void setOutputFilename(const QString &value);

‎controls/main/mainwindow.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ void MainWindow::on_tabWidget_tabCloseRequested(int index)
259259
{
260260
case DialogSaveChanges::Save:
261261
{
262-
if (!editor->document()->save(editor->document()->dataFilename()))
262+
if (!editor->document()->save(editor->document()->documentFilename()))
263263
cancel = true;
264264
}
265265
break;

‎interfaces/idocument.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class IDocument
3333
virtual bool load(const QString &filename) = 0;
3434
virtual bool save(const QString &filename) = 0;
3535
virtual bool changed() const = 0;
36-
virtual QString dataFilename() const = 0;//TODO: rename to documentFilename
36+
virtual QString documentFilename() const = 0;
3737
virtual QString documentName() const = 0;
3838
virtual void setDocumentName(const QString &value) = 0;
3939
virtual DataContainer *dataContainer() = 0;

0 commit comments

Comments
 (0)
Please sign in to comment.