Switch to unified view

a/src/qtgui/rclmain_w.h b/src/qtgui/rclmain_w.h
...
...
266
    virtual bool containerUpToDate(Rcl::Doc& doc);
266
    virtual bool containerUpToDate(Rcl::Doc& doc);
267
    virtual void setFiltSpec();
267
    virtual void setFiltSpec();
268
    virtual bool checkIdxPaths();
268
    virtual bool checkIdxPaths();
269
};
269
};
270
270
271
272
/* Qt5 moc expands macros when defining signals. The SIGNAL() macro is
273
   a stringification, so it does not expand macros. We have signals
274
   where one of the types is a #define (for the variations on
275
   std::shared_ptr). In qt5, the connection does not work because the
276
   signal string is different between the definition and the connect
277
   call, because of the different macro expansion. We have to use
278
   another level of macro in Qt5 to force macro expansion, but not in
279
   Qt4, so we both define the XSIGNAL and XSLOT macros here, and have
280
   ifdefs in the code. What a mess... */
281
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
282
#define XSIGNAL(X) SIGNAL(X)
283
#define XSLOT(X) SLOT(X)
284
#endif
285
271
#endif // RCLMAIN_W_H
286
#endif // RCLMAIN_W_H