feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Rename Ipc* in ClangCodeModel*

Browse Source 
We want to share more functionality of the IPC mechanism and for what we
need more interface classes. But we use this names already for the
ClangCodeModel implementation. So we rename the them to ClangCodeModel*.

Change-Id: Ie320e0d3b993586a9bcc6a5aa0d32427af41202e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Marco Bubke
2016-06-29 16:49:56 +02:00
parent ee1da81f55
commit d027cab44e
30 changed files with 280 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/clangbackendipc/connectionserver.cpp
View File

@@ -25,7 +25,7 @@
#include "connectionserver.h"
#include <ipcserverinterface.h>
#include <clangcodemodelserverinterface.h>
#include <QCoreApplication>
#include <QLocalSocket>
@@ -62,7 +62,7 @@ void ConnectionServer::start()
localServer.listen(connectionName);
}
void ConnectionServer::setIpcServer(IpcServerInterface *ipcServer)
void ConnectionServer::setClangCodeModelServer(ClangCodeModelServerInterface *ipcServer)
{
this->ipcServer = ipcServer;
@@ -70,7 +70,7 @@ void ConnectionServer::setIpcServer(IpcServerInterface *ipcServer)
int ConnectionServer::clientProxyCount() const
{
return static_cast<int>(ipcClientProxies.size());
return static_cast<int>(ipcServerProxies.size());
}
void ConnectionServer::timerEvent(QTimerEvent *timerEvent)
@@ -83,9 +83,9 @@ void ConnectionServer::handleNewConnection()
{
QLocalSocket *localSocket(nextPendingConnection());
ipcClientProxies.emplace_back(ipcServer, localSocket);
ipcServerProxies.emplace_back(ipcServer, localSocket);
ipcServer->addClient(&ipcClientProxies.back());
ipcServer->addClient(&ipcServerProxies.back());
localSockets.push_back(localSocket);
@@ -111,9 +111,9 @@ void ConnectionServer::handleSocketDisconnect()
void ConnectionServer::removeClientProxyWithLocalSocket(QLocalSocket *localSocket)
{
ipcClientProxies.erase(std::remove_if(ipcClientProxies.begin(),
ipcClientProxies.end(),
[localSocket](const IpcClientProxy &client) { return client.isUsingThatIoDevice(localSocket);}));
ipcServerProxies.erase(std::remove_if(ipcServerProxies.begin(),
ipcServerProxies.end(),
[localSocket](const ClangCodeModelClientProxy &client) { return client.isUsingThatIoDevice(localSocket);}));
}
QLocalSocket *ConnectionServer::nextPendingConnection()