diff --git a/openbr/gui/faceviewer.h b/openbr/gui/faceviewer.h index c611b76..591590f 100644 --- a/openbr/gui/faceviewer.h +++ b/openbr/gui/faceviewer.h @@ -19,7 +19,7 @@ public: explicit FaceViewer(QWidget *parent = 0); public slots: - void setFile(const File &file_); + void setFile(const br::File &file_); protected slots: void mouseMoveEvent(QMouseEvent *event); diff --git a/openbr/gui/templateviewer.h b/openbr/gui/templateviewer.h index 265c160..5a2b17d 100644 --- a/openbr/gui/templateviewer.h +++ b/openbr/gui/templateviewer.h @@ -24,7 +24,7 @@ public: explicit TemplateViewer(QWidget *parent = 0); public slots: - void setFile(const File &file); + void setFile(const br::File &file); void setEditable(bool enabled); void setMousePoint(const QPointF &mousePoint); void setFormat(const QString &format); @@ -52,10 +52,10 @@ protected slots: void paintEvent(QPaintEvent *event); signals: - void newInput(File); + void newInput(br::File); void newInput(QImage); void newMousePoint(QPointF); - void selectedInput(File); + void selectedInput(br::File); }; } diff --git a/openbr/gui/templateviewergrid.cpp b/openbr/gui/templateviewergrid.cpp index e70c811..d166995 100644 --- a/openbr/gui/templateviewergrid.cpp +++ b/openbr/gui/templateviewergrid.cpp @@ -18,10 +18,10 @@ void TemplateViewerGrid::setFiles(const FileList &files) const int size = std::max(1, (int)ceil(sqrt((float)files.size()))); while (templateViewers.size() < size*size) { templateViewers.append(QSharedPointer(new TemplateViewer())); - connect(templateViewers.last().data(), SIGNAL(newInput(File)), this, SIGNAL(newInput(File))); + connect(templateViewers.last().data(), SIGNAL(newInput(br::File)), this, SIGNAL(newInput(br::File))); connect(templateViewers.last().data(), SIGNAL(newInput(QImage)), this, SIGNAL(newInput(QImage))); connect(templateViewers.last().data(), SIGNAL(newMousePoint(QPointF)), this, SIGNAL(newMousePoint(QPointF))); - connect(templateViewers.last().data(), SIGNAL(selectedInput(File)), this, SIGNAL(selectedInput(File))); + connect(templateViewers.last().data(), SIGNAL(selectedInput(br::File)), this, SIGNAL(selectedInput(br::File))); } { // Clear layout diff --git a/openbr/gui/templateviewergrid.h b/openbr/gui/templateviewergrid.h index 02c94ed..5d5409e 100644 --- a/openbr/gui/templateviewergrid.h +++ b/openbr/gui/templateviewergrid.h @@ -24,15 +24,15 @@ public: explicit TemplateViewerGrid(QWidget *parent = 0); public slots: - void setFiles(const FileList &file); + void setFiles(const br::FileList &file); void setFormat(const QString &format); void setMousePoint(const QPointF &mousePoint); signals: - void newInput(File); + void newInput(br::File); void newInput(QImage); void newMousePoint(QPointF); - void selectedInput(File); + void selectedInput(br::File); }; } // namespace br