Fix typo which prevented help from being refreshed on a Mac if the context changed while the viewer was open. Also update from Qt3 to 4.

telwertowski · telwertowski · commit 0d2c1e8e9c44 · 2007-12-14T02:52:14.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@7781 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgscontexthelp.cpp b/src/core/qgscontexthelp.cpp
@@ -52,7 +52,7 @@ QgsContextHelp::QgsContextHelp(int contextId)
 #ifdef QGSCONTEXTHELP_REUSE
   // Create socket to communicate with process
   mSocket = new QTcpSocket(this);
-  connect(mProcess, SIGNAL(readyReadStandardoutput()), SLOT(readPort()));
+  connect(mProcess, SIGNAL(readyReadStandardOutput()), SLOT(readPort()));
 #else
   // Placeholder for new process if terminating and restarting
   mNextProcess = NULL;
diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp
@@ -34,7 +34,7 @@ int main( int argc, char ** argv )
   {
     context = argv[1];
   }
-#ifdef Q_OS_MACX
+#ifdef Q_WS_MAC
   // If we're on Mac, we have the resource library way above us...
   a.setPkgDataPath(QgsApplication::prefixPath()+"/../../../../share/qgis");
 #endif
@@ -78,7 +78,7 @@ int main( int argc, char ** argv )
   // an additional viewer if one is already running.
   QgsHelpContextServer *helpServer = new QgsHelpContextServer();
   // Make port number available to client
-  std::cout << helpServer->port() << std::endl; 
+  std::cout << helpServer->serverPort() << std::endl; 
   // Pass context request from socket to viewer widget
   QObject::connect(helpServer, SIGNAL(setContext(const QString&)),
       &w, SLOT(setContext(const QString&)));
diff --git a/src/helpviewer/qgshelpserver.cpp b/src/helpviewer/qgshelpserver.cpp
@@ -22,30 +22,31 @@
 // See qt/tools/assistant/ main.cpp and lib/qassistantclient.cpp (Qt 3.3.4).
 
 QgsHelpContextServer::QgsHelpContextServer(QObject *parent) :
-   Q3ServerSocket(0x7f01, 0, parent)
+  QTcpServer(parent)
 {
-  // Superclass listens for localhost connection
+  listen(QHostAddress::LocalHost, 0);
 }
 
 QgsHelpContextServer::~QgsHelpContextServer()
 {
   // Socket is automatically deleted here because it is a QQbject child
 }
 
-void QgsHelpContextServer::newConnection(int socket)
+void QgsHelpContextServer::incomingConnection(int socket)
 {
   // Create socket in response to new connection
   QgsHelpContextSocket *helpSocket = new QgsHelpContextSocket(socket, this);
   // Pass context from socket upwards
   connect(helpSocket, SIGNAL(setContext(const QString&)),
     SIGNAL(setContext(const QString&)));
+  emit newConnection();
 }
 
 QgsHelpContextSocket::QgsHelpContextSocket(int socket, QObject *parent) :
-  Q3Socket(parent, 0)
+  QTcpSocket(parent)
 {
   connect(this, SIGNAL(readyRead()), SLOT(readClient()));
-  setSocket(socket);
+  setSocketDescriptor(socket);
 }
 
 QgsHelpContextSocket::~QgsHelpContextSocket()
diff --git a/src/helpviewer/qgshelpserver.h b/src/helpviewer/qgshelpserver.h
@@ -18,20 +18,22 @@
 /* $Id$ */
 #ifndef QGSHELPSERVER_H
 #define QGSHELPSERVER_H
-#include <q3serversocket.h>
-#include <q3socket.h>
+#include <QTcpServer>
+#include <QTcpSocket>
 
 /*!
  * \class QgsHelpContextServer
  * \brief Listens for localhost connection and creates socket.
  */
-class QgsHelpContextServer : public Q3ServerSocket
+class QgsHelpContextServer : public QTcpServer
 {
   Q_OBJECT
 public:
-  QgsHelpContextServer(QObject* parent = 0);
+  QgsHelpContextServer(QObject *parent = 0);
   ~QgsHelpContextServer();
-  virtual void newConnection(int socket);
+
+public slots:
+  void incomingConnection(int socket);
 
 signals:
   void setContext(const QString&);
@@ -41,7 +43,7 @@ class QgsHelpContextServer : public Q3ServerSocket
  * \class QgsHelpContextSocket
  * \brief Receives and passes context numbers to viewer.
  */
-class QgsHelpContextSocket : public Q3Socket
+class QgsHelpContextSocket : public QTcpSocket
 {
   Q_OBJECT
 public:

Original file line number	Diff line number	Diff line change
`@@ -22,30 +22,31 @@`
`22`	`22`	`// See qt/tools/assistant/ main.cpp and lib/qassistantclient.cpp (Qt 3.3.4).`
`23`	`23`
`24`	`24`	`QgsHelpContextServer::QgsHelpContextServer(QObject *parent) :`
`25`		`- Q3ServerSocket(0x7f01, 0, parent)`
	`25`	`+ QTcpServer(parent)`
`26`	`26`	`{`
`27`		`- // Superclass listens for localhost connection`
	`27`	`+ listen(QHostAddress::LocalHost, 0);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`QgsHelpContextServer::~QgsHelpContextServer()`
`31`	`31`	`{`
`32`	`32`	`// Socket is automatically deleted here because it is a QQbject child`
`33`	`33`	`}`
`34`	`34`
`35`		`-void QgsHelpContextServer::newConnection(int socket)`
	`35`	`+void QgsHelpContextServer::incomingConnection(int socket)`
`36`	`36`	`{`
`37`	`37`	`// Create socket in response to new connection`
`38`	`38`	`QgsHelpContextSocket *helpSocket = new QgsHelpContextSocket(socket, this);`
`39`	`39`	`// Pass context from socket upwards`
`40`	`40`	`connect(helpSocket, SIGNAL(setContext(const QString&)),`
`41`	`41`	`SIGNAL(setContext(const QString&)));`
	`42`	`+ emit newConnection();`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`QgsHelpContextSocket::QgsHelpContextSocket(int socket, QObject *parent) :`
`45`		`- Q3Socket(parent, 0)`
	`46`	`+ QTcpSocket(parent)`
`46`	`47`	`{`
`47`	`48`	`connect(this, SIGNAL(readyRead()), SLOT(readClient()));`
`48`		`- setSocket(socket);`
	`49`	`+ setSocketDescriptor(socket);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`QgsHelpContextSocket::~QgsHelpContextSocket()`