[qet] [3774] Fix compilation error on windows: |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 3774
Author: blacksun
Date: 2015-02-28 11:47:26 +0100 (Sat, 28 Feb 2015)
Log Message:
-----------
Fix compilation error on windows:
Replace the variable word interface by event_interface, because interface is already used for a struct in mingw.
Modified Paths:
--------------
branches/Qt5/sources/diagramview.cpp
branches/Qt5/sources/diagramview.h
branches/Qt5/sources/editor/elementscene.cpp
branches/Qt5/sources/editor/elementscene.h
Modified: branches/Qt5/sources/diagramview.cpp
===================================================================
--- branches/Qt5/sources/diagramview.cpp 2015-02-28 04:05:57 UTC (rev 3773)
+++ branches/Qt5/sources/diagramview.cpp 2015-02-28 10:47:26 UTC (rev 3774)
@@ -1105,9 +1105,9 @@
* @brief DiagramView::setEventInterface
* Set an event interface to diagram view.
*/
-void DiagramView::setEventInterface(DVEventInterface *interface) {
+void DiagramView::setEventInterface(DVEventInterface *event_interface) {
if (m_event_interface) delete m_event_interface;
- m_event_interface = interface;
+ m_event_interface = event_interface;
}
/**
Modified: branches/Qt5/sources/diagramview.h
===================================================================
--- branches/Qt5/sources/diagramview.h 2015-02-28 04:05:57 UTC (rev 3773)
+++ branches/Qt5/sources/diagramview.h 2015-02-28 10:47:26 UTC (rev 3774)
@@ -71,7 +71,7 @@
bool hasCopiableItems();
bool hasDeletableItems();
void editSelection();
- void setEventInterface (DVEventInterface *interface);
+ void setEventInterface (DVEventInterface *event_interface);
protected:
virtual void mouseDoubleClickEvent(QMouseEvent *);
Modified: branches/Qt5/sources/editor/elementscene.cpp
===================================================================
--- branches/Qt5/sources/editor/elementscene.cpp 2015-02-28 04:05:57 UTC (rev 3773)
+++ branches/Qt5/sources/editor/elementscene.cpp 2015-02-28 10:47:26 UTC (rev 3774)
@@ -201,14 +201,14 @@
* Set a new event interface
* @param interface
*/
-void ElementScene::setEventInterface(ESEventInterface *interface) {
+void ElementScene::setEventInterface(ESEventInterface *event_interface) {
if (m_event_interface) {
delete m_event_interface;
//We must to re-init because previous interface
//Reset his own init when deleted
- interface->init();
+ event_interface->init();
}
- m_event_interface = interface;
+ m_event_interface = event_interface;
}
/**
Modified: branches/Qt5/sources/editor/elementscene.h
===================================================================
--- branches/Qt5/sources/editor/elementscene.h 2015-02-28 04:05:57 UTC (rev 3773)
+++ branches/Qt5/sources/editor/elementscene.h 2015-02-28 10:47:26 UTC (rev 3774)
@@ -104,7 +104,7 @@
// methods
public:
- void setEventInterface (ESEventInterface *interface);
+ void setEventInterface (ESEventInterface *event_interface);
QPointF snapToGrid(QPointF point);
void setNames(const NamesList &);
NamesList names() const;