/[svn]/qsampler/trunk/src/qsampler.h
ViewVC logotype

Diff of /qsampler/trunk/src/qsampler.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3495 by capela, Sat Mar 9 21:49:29 2019 UTC revision 3496 by capela, Sun Mar 10 11:06:53 2019 UTC
# Line 41  Line 41 
41  class QWidget;  class QWidget;
42  class QTranslator;  class QTranslator;
43    
44  #ifdef CONFIG_X11  #if QT_VERSION < 0x050000
45  #ifdef CONFIG_XUNIQUE  #ifdef CONFIG_XUNIQUE
46    #ifdef CONFIG_X11
47  #include <QX11Info>  #include <QX11Info>
   
48  typedef unsigned long Window;  typedef unsigned long Window;
49  typedef unsigned long Atom;  typedef unsigned long Atom;
50    #endif  // CONFIG_X11
51  #if QT_VERSION >= 0x050100  #endif  // CONFIG_XUNIQUE
52  class qsamplerXcbEventFilter;  #else
53  #endif  #ifdef CONFIG_XUNIQUE
54    class QSharedMemory;
55  #endif  class QLocalServer;
56    #endif  // CONFIG_XUNIQUE
57  #endif  #endif
58    
59    
# Line 63  class qsamplerXcbEventFilter; Line 63  class qsamplerXcbEventFilter;
63    
64  class qsamplerApplication : public QApplication  class qsamplerApplication : public QApplication
65  {  {
66            Q_OBJECT
67    
68  public:  public:
69    
70          // Constructor.          // Constructor.
# Line 80  public: Line 82  public:
82          // and raise its proper main widget...          // and raise its proper main widget...
83          bool setup();          bool setup();
84    
85  #ifdef CONFIG_X11  #if QT_VERSION < 0x050000
86  #ifdef CONFIG_XUNIQUE  #ifdef CONFIG_XUNIQUE
87    #ifdef CONFIG_X11
88          void x11PropertyNotify(Window w);          void x11PropertyNotify(Window w);
89  #endif  // CONFIG_XUNIQUE          bool x11EventFilter(XEvent *pEv)
90  #endif  // CONFIG_X11  #endif  // CONFIG_X11
91    #endif  // CONFIG_XUNIQUE
92    #else
93    #ifdef CONFIG_XUNIQUE
94    protected slots:
95            // Local server slots.
96            void newConnectionSlot();
97            void readyReadSlot();
98    #endif  // CONFIG_XUNIQUE
99    #endif
100    
101  private:  private:
102    
# Line 95  private: Line 107  private:
107          // Instance variables.          // Instance variables.
108          QWidget *m_pWidget;          QWidget *m_pWidget;
109    
110  #ifdef CONFIG_X11  #if QT_VERSION < 0x050000
111  #ifdef CONFIG_XUNIQUE  #ifdef CONFIG_XUNIQUE
112    #ifdef CONFIG_X11
113          Display *m_pDisplay;          Display *m_pDisplay;
114          Atom     m_aUnique;          Atom     m_aUnique;
115          Window   m_wOwner;          Window   m_wOwner;
 #if QT_VERSION >= 0x050100  
         qsamplerXcbEventFilter *m_pXcbEventFilter;  
 #endif  
 #endif  // CONFIG_XUNIQUE  
116  #endif  // CONFIG_X11  #endif  // CONFIG_X11
117    #endif  // CONFIG_XUNIQUE
118    #else
119    #ifdef CONFIG_XUNIQUE
120            QString        m_sUnique;
121            QSharedMemory *m_pMemory;
122            QLocalServer  *m_pServer;
123    #endif  // CONFIG_XUNIQUE
124    #endif
125  };  };
126    
127    

Legend:
Removed from v.3495  
changed lines
  Added in v.3496

  ViewVC Help
Powered by ViewVC