Peter M. Groen / openbr

Commit df055a7feb06054212ce3b86328877011a192582

Authored by Scott Klum
1 parent 53da2b10

Replaced namespace designations in gui classes so that signals work properly wit… 

…hout using namespace br
Inline Side-by-side
Showing 4 changed files with 9 additions and 9 deletions
openbr/gui/faceviewer.h
  View file @df055a7
@@ -19,7 +19,7 @@ public: @@ -19,7 +19,7 @@ public:
19 explicit FaceViewer(QWidget *parent = 0); 19 explicit FaceViewer(QWidget *parent = 0);
20 20
21 public slots: 21 public slots:
22 - void setFile(const File &file_); 22 + void setFile(const br::File &file_);
23 23
24 protected slots: 24 protected slots:
25 void mouseMoveEvent(QMouseEvent *event); 25 void mouseMoveEvent(QMouseEvent *event);
openbr/gui/templateviewer.h
  View file @df055a7
@@ -24,7 +24,7 @@ public: @@ -24,7 +24,7 @@ public:
24 explicit TemplateViewer(QWidget *parent = 0); 24 explicit TemplateViewer(QWidget *parent = 0);
25 25
26 public slots: 26 public slots:
27 - void setFile(const File &file); 27 + void setFile(const br::File &file);
28 void setEditable(bool enabled); 28 void setEditable(bool enabled);
29 void setMousePoint(const QPointF &mousePoint); 29 void setMousePoint(const QPointF &mousePoint);
30 void setFormat(const QString &format); 30 void setFormat(const QString &format);
@@ -52,10 +52,10 @@ protected slots: @@ -52,10 +52,10 @@ protected slots:
52 void paintEvent(QPaintEvent *event); 52 void paintEvent(QPaintEvent *event);
53 53
54 signals: 54 signals:
55 - void newInput(File); 55 + void newInput(br::File);
56 void newInput(QImage); 56 void newInput(QImage);
57 void newMousePoint(QPointF); 57 void newMousePoint(QPointF);
58 - void selectedInput(File); 58 + void selectedInput(br::File);
59 }; 59 };
60 60
61 } 61 }
openbr/gui/templateviewergrid.cpp
  View file @df055a7
@@ -18,10 +18,10 @@ void TemplateViewerGrid::setFiles(const FileList &files) @@ -18,10 +18,10 @@ void TemplateViewerGrid::setFiles(const FileList &files)
18 const int size = std::max(1, (int)ceil(sqrt((float)files.size()))); 18 const int size = std::max(1, (int)ceil(sqrt((float)files.size())));
19 while (templateViewers.size() < size*size) { 19 while (templateViewers.size() < size*size) {
20 templateViewers.append(QSharedPointer<TemplateViewer>(new TemplateViewer())); 20 templateViewers.append(QSharedPointer<TemplateViewer>(new TemplateViewer()));
21 - connect(templateViewers.last().data(), SIGNAL(newInput(File)), this, SIGNAL(newInput(File))); 21 + connect(templateViewers.last().data(), SIGNAL(newInput(br::File)), this, SIGNAL(newInput(br::File)));
22 connect(templateViewers.last().data(), SIGNAL(newInput(QImage)), this, SIGNAL(newInput(QImage))); 22 connect(templateViewers.last().data(), SIGNAL(newInput(QImage)), this, SIGNAL(newInput(QImage)));
23 connect(templateViewers.last().data(), SIGNAL(newMousePoint(QPointF)), this, SIGNAL(newMousePoint(QPointF))); 23 connect(templateViewers.last().data(), SIGNAL(newMousePoint(QPointF)), this, SIGNAL(newMousePoint(QPointF)));
24 - connect(templateViewers.last().data(), SIGNAL(selectedInput(File)), this, SIGNAL(selectedInput(File))); 24 + connect(templateViewers.last().data(), SIGNAL(selectedInput(br::File)), this, SIGNAL(selectedInput(br::File)));
25 } 25 }
26 26
27 { // Clear layout 27 { // Clear layout
openbr/gui/templateviewergrid.h
  View file @df055a7
@@ -24,15 +24,15 @@ public: @@ -24,15 +24,15 @@ public:
24 explicit TemplateViewerGrid(QWidget *parent = 0); 24 explicit TemplateViewerGrid(QWidget *parent = 0);
25 25
26 public slots: 26 public slots:
27 - void setFiles(const FileList &file); 27 + void setFiles(const br::FileList &file);
28 void setFormat(const QString &format); 28 void setFormat(const QString &format);
29 void setMousePoint(const QPointF &mousePoint); 29 void setMousePoint(const QPointF &mousePoint);
30 30
31 signals: 31 signals:
32 - void newInput(File); 32 + void newInput(br::File);
33 void newInput(QImage); 33 void newInput(QImage);
34 void newMousePoint(QPointF); 34 void newMousePoint(QPointF);
35 - void selectedInput(File); 35 + void selectedInput(br::File);
36 }; 36 };
37 37
38 } // namespace br 38 } // namespace br