Changeset 647 for trunk/tools

Timestamp:

Mar 7, 2010, 9:20:03 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

tools: assistant: Fixed 100% CPU load/system freeze when controlling the assistant remotely from another application caused by an invalid attempt to create a QSocketNotifier on a non-socket OS/2 file handle.

Location:

trunk/tools/assistant/tools/assistant

Files:

• assistant.pro (modified) (1 diff)
• remotecontrol.cpp (modified) (5 diffs)
• remotecontrol_win.h (modified) (3 diffs)

trunk/tools/assistant/tools/assistant/assistant.pro

@@ -39 +39 @@
            qtdocinstaller.h
 
-win32 {
+win32 {
     HEADERS += remotecontrol_win.h
 }

trunk/tools/assistant/tools/assistant/remotecontrol.cpp

@@ -55 +55 @@
 #include <QtHelp/QHelpIndexWidget>
 
-#ifdef Q_OS_WIN
+#if
 #   include "remotecontrol_win.h"
 #endif
@@ -61 +61 @@
 QT_BEGIN_NAMESPACE
 
-#ifdef Q_OS_WIN
+#if
 
 StdInListenerWin::StdInListenerWin(QObject *parent)
@@ -73 +73 @@
     wait();
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 void StdInListenerWin::run()
@@ -103 +125 @@
     }
 }
-#endif
+
+#endif // defined(Q_OS_OS2)
+
+#endif // defined(Q_OS_WIN) || defined(Q_OS_OS2)
 
 RemoteControl::RemoteControl(MainWindow *mainWindow, QHelpEngine *helpEngine)
@@ -116 +141 @@
 {
     connect(m_mainWindow, SIGNAL(initDone()), this, SLOT(applyCache()));
-#ifdef Q_OS_WIN
+#if
     StdInListenerWin *l = new StdInListenerWin(this);
     connect(l, SIGNAL(receivedCommand(QString)),

trunk/tools/assistant/tools/assistant/remotecontrol_win.h

@@ -43 +43 @@
 #define REMOTECONTROL_WIN_H
 
-#include <windows.h>
+#if defined(Q_OS_WIN)
+# include <windows.h>
+#elif defined(Q_OS_OS2)
+# include <qt_os2.h>
+#endif
 #include <QtCore/QThread>
 
@@ -55 +59 @@
     StdInListenerWin(QObject *parent);
     ~StdInListenerWin();
-    
+
 signals:
     void receivedCommand(const QString &cmd);
@@ -61 +65 @@
 private:
     void run();
-    bool ok;
 };