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

Diff of /qsampler/trunk/src/qsampler.cpp

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

revision 3496 by capela, Sun Mar 10 11:06:53 2019 UTC revision 3520 by capela, Mon Jul 1 10:53:41 2019 UTC
# Line 56  Line 56 
56    
57  #define QSAMPLER_XUNIQUE "qsamplerApplication"  #define QSAMPLER_XUNIQUE "qsamplerApplication"
58    
59  #if QT_VERSION < 0x050000  #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
60  #ifdef CONFIG_X11  #ifdef CONFIG_X11
61    
62  #include <unistd.h> /* for gethostname() */  #include <unistd.h> /* for gethostname() */
# Line 134  qsamplerApplication::qsamplerApplication Line 134  qsamplerApplication::qsamplerApplication
134                  }                  }
135          }          }
136  #ifdef CONFIG_XUNIQUE  #ifdef CONFIG_XUNIQUE
137  #if QT_VERSION < 0x050000  #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
138  #ifdef CONFIG_X11  #ifdef CONFIG_X11
139          m_pDisplay = NULL;          m_pDisplay = NULL;
140          m_aUnique = 0;          m_aUnique = 0;
# Line 152  qsamplerApplication::qsamplerApplication Line 152  qsamplerApplication::qsamplerApplication
152  qsamplerApplication::~qsamplerApplication (void)  qsamplerApplication::~qsamplerApplication (void)
153  {  {
154  #ifdef CONFIG_XUNIQUE  #ifdef CONFIG_XUNIQUE
155  #if QT_VERSION >= 0x050000  #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
156          if (m_pServer) {          if (m_pServer) {
157                  m_pServer->close();                  m_pServer->close();
158                  delete m_pServer;                  delete m_pServer;
# Line 174  void qsamplerApplication::setMainWidget Line 174  void qsamplerApplication::setMainWidget
174  {  {
175          m_pWidget = pWidget;          m_pWidget = pWidget;
176  #ifdef CONFIG_XUNIQUE  #ifdef CONFIG_XUNIQUE
177  #if QT_VERSION < 0x050000  #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
178  #ifdef CONFIG_X11  #ifdef CONFIG_X11
179          m_wOwner = m_pWidget->winId();          m_wOwner = m_pWidget->winId();
180          if (m_pDisplay && m_wOwner) {          if (m_pDisplay && m_wOwner) {
# Line 193  void qsamplerApplication::setMainWidget Line 193  void qsamplerApplication::setMainWidget
193  bool qsamplerApplication::setup (void)  bool qsamplerApplication::setup (void)
194  {  {
195  #ifdef CONFIG_XUNIQUE  #ifdef CONFIG_XUNIQUE
196  #if QT_VERSION < 0x050000  #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
197  #ifdef CONFIG_X11  #ifdef CONFIG_X11
198          m_pDisplay = QX11Info::display();          m_pDisplay = QX11Info::display();
199          if (m_pDisplay) {          if (m_pDisplay) {
# Line 304  bool qsamplerApplication::setup (void) Line 304  bool qsamplerApplication::setup (void)
304    
305    
306  #ifdef CONFIG_XUNIQUE  #ifdef CONFIG_XUNIQUE
307  #if QT_VERSION < 0x050000  #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
308  #ifdef CONFIG_X11  #ifdef CONFIG_X11
309    
310  void qsamplerApplication::x11PropertyNotify ( Window w )  void qsamplerApplication::x11PropertyNotify ( Window w )
# Line 405  void stacktrace ( int signo ) Line 405  void stacktrace ( int signo )
405          char cmd[80];          char cmd[80];
406    
407          // Reinstall default handler; prevent race conditions...          // Reinstall default handler; prevent race conditions...
408          signal(signo, SIG_DFL);          ::signal(signo, SIG_DFL);
409    
410          static const char *shell  = "/bin/sh";          static const char *shell  = "/bin/sh";
411          static const char *format = "gdb -q --batch --pid=%d"          static const char *format = "gdb -q --batch --pid=%d"
# Line 451  int main ( int argc, char **argv ) Line 451  int main ( int argc, char **argv )
451          Q_INIT_RESOURCE(qsampler);          Q_INIT_RESOURCE(qsampler);
452  #ifdef CONFIG_STACKTRACE  #ifdef CONFIG_STACKTRACE
453  #if defined(__GNUC__) && defined(Q_OS_LINUX)  #if defined(__GNUC__) && defined(Q_OS_LINUX)
454          signal(SIGILL,  stacktrace);          ::signal(SIGILL,  stacktrace);
455          signal(SIGFPE,  stacktrace);          ::signal(SIGFPE,  stacktrace);
456          signal(SIGSEGV, stacktrace);          ::signal(SIGSEGV, stacktrace);
457          signal(SIGABRT, stacktrace);          ::signal(SIGABRT, stacktrace);
458          signal(SIGBUS,  stacktrace);          ::signal(SIGBUS,  stacktrace);
459  #endif  #endif
460  #endif  #endif
461          qsamplerApplication app(argc, argv);          qsamplerApplication app(argc, argv);
462  #if QT_VERSION >= 0x050600  #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
463          app.setAttribute(Qt::AA_EnableHighDpiScaling);          app.setAttribute(Qt::AA_EnableHighDpiScaling);
464  #endif  #endif
465          #if defined(__APPLE__)  //  Toshi Nagata 20080105          #if defined(__APPLE__)  //  Toshi Nagata 20080105
# Line 494  int main ( int argc, char **argv ) Line 494  int main ( int argc, char **argv )
494          // Dark themes grayed/disabled color group fix...          // Dark themes grayed/disabled color group fix...
495          QPalette pal(app.palette());          QPalette pal(app.palette());
496          if (pal.base().color().value() < 0x7f) {          if (pal.base().color().value() < 0x7f) {
497          #if QT_VERSION >= 0x050000          #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
498                  const QColor& color = pal.window().color();                  const QColor& color = pal.window().color();
499                  const int iGroups = int(QPalette::Active | QPalette::Inactive) + 1;                  const int iGroups = int(QPalette::Active | QPalette::Inactive) + 1;
500                  for (int i = 0; i < iGroups; ++i) {                  for (int i = 0; i < iGroups; ++i) {
Legend:
Removed from v.3496  
changed lines
  Added in v.3520
  ViewVC Help
Powered by ViewVC