Commit 60f092f6 authored by hjk's avatar hjk

Debugger: Cosmetics

Qt 5 connects, unused declaration, QLatin1Strings, ...

Change-Id: If09929993d750907ee3f4e2fa9f18acfcc28d9c1
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 3b83b8b9
...@@ -33,12 +33,6 @@ ...@@ -33,12 +33,6 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QPointer> #include <QPointer>
//////////////////////////////////////////////////////////////////
//
// BreakHandler
//
//////////////////////////////////////////////////////////////////
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
......
...@@ -36,7 +36,6 @@ QT_BEGIN_NAMESPACE ...@@ -36,7 +36,6 @@ QT_BEGIN_NAMESPACE
class QIcon; class QIcon;
class QMessageBox; class QMessageBox;
class QWidget; class QWidget;
class QTreeView;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace CPlusPlus { class Snapshot; } namespace CPlusPlus { class Snapshot; }
...@@ -51,6 +50,7 @@ class DebuggerEngine; ...@@ -51,6 +50,7 @@ class DebuggerEngine;
class Symbol; class Symbol;
class Section; class Section;
class GlobalDebuggerOptions; class GlobalDebuggerOptions;
class WatchTreeView;
enum TestCases enum TestCases
{ {
...@@ -87,7 +87,7 @@ void setThreadBoxContents(const QStringList &list, int index); ...@@ -87,7 +87,7 @@ void setThreadBoxContents(const QStringList &list, int index);
QSharedPointer<Internal::GlobalDebuggerOptions> globalDebuggerOptions(); QSharedPointer<Internal::GlobalDebuggerOptions> globalDebuggerOptions();
QTreeView *inspectorView(); WatchTreeView *inspectorView();
QVariant sessionValue(const QByteArray &name); QVariant sessionValue(const QByteArray &name);
void setSessionValue(const QByteArray &name, const QVariant &value); void setSessionValue(const QByteArray &name, const QVariant &value);
QVariant configValue(const QByteArray &name); QVariant configValue(const QByteArray &name);
......
...@@ -865,8 +865,8 @@ TypeFormatsDialog::TypeFormatsDialog(QWidget *parent) ...@@ -865,8 +865,8 @@ TypeFormatsDialog::TypeFormatsDialog(QWidget *parent)
m_ui->addPage(tr("Standard Types")); m_ui->addPage(tr("Standard Types"));
m_ui->addPage(tr("Misc Types")); m_ui->addPage(tr("Misc Types"));
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(accept())); connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject())); connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
} }
TypeFormatsDialog::~TypeFormatsDialog() TypeFormatsDialog::~TypeFormatsDialog()
......
...@@ -33,20 +33,14 @@ ...@@ -33,20 +33,14 @@
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QModelIndex;
class QPushButton; class QPushButton;
class QLineEdit; class QLineEdit;
class QDialogButtonBox; class QDialogButtonBox;
class QSettings;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Core { class Id; }
namespace ProjectExplorer { class Kit; }
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
class AttachCoreDialogPrivate;
class AttachToQmlPortDialogPrivate; class AttachToQmlPortDialogPrivate;
class DebuggerRunParameters; class DebuggerRunParameters;
class StartApplicationParameters; class StartApplicationParameters;
...@@ -80,11 +74,9 @@ public: ...@@ -80,11 +74,9 @@ public:
static bool run(QWidget *parent, DebuggerRunParameters *rp, ProjectExplorer::Kit **kit); static bool run(QWidget *parent, DebuggerRunParameters *rp, ProjectExplorer::Kit **kit);
private slots: private:
void historyIndexChanged(int); void historyIndexChanged(int);
void updateState(); void updateState();
private:
StartApplicationParameters parameters() const; StartApplicationParameters parameters() const;
void setParameters(const StartApplicationParameters &p); void setParameters(const StartApplicationParameters &p);
void setHistory(const QList<StartApplicationParameters> &l); void setHistory(const QList<StartApplicationParameters> &l);
...@@ -121,10 +113,8 @@ public: ...@@ -121,10 +113,8 @@ public:
QString connection() const; QString connection() const;
void setConnection(const QString &); void setConnection(const QString &);
private slots:
void textChanged(const QString &);
private: private:
void textChanged(const QString &);
void accept(); void accept();
QPushButton *m_okButton; QPushButton *m_okButton;
...@@ -140,10 +130,8 @@ public: ...@@ -140,10 +130,8 @@ public:
void setAddress(quint64 a); void setAddress(quint64 a);
quint64 address() const; quint64 address() const;
private slots:
void textChanged();
private: private:
void textChanged();
void accept(); void accept();
void setOkButtonEnabled(bool v); void setOkButtonEnabled(bool v);
......
This diff is collapsed.
...@@ -1007,7 +1007,7 @@ public: ...@@ -1007,7 +1007,7 @@ public:
BaseTreeView *m_returnView = 0; BaseTreeView *m_returnView = 0;
BaseTreeView *m_localsView = 0; BaseTreeView *m_localsView = 0;
BaseTreeView *m_watchersView = 0; BaseTreeView *m_watchersView = 0;
BaseTreeView *m_inspectorView = 0; WatchTreeView *m_inspectorView = 0;
BaseTreeView *m_registerView = 0; BaseTreeView *m_registerView = 0;
BaseTreeView *m_modulesView = 0; BaseTreeView *m_modulesView = 0;
BaseTreeView *m_snapshotView = 0; BaseTreeView *m_snapshotView = 0;
...@@ -2809,7 +2809,7 @@ QVariant sessionValue(const QByteArray &key) ...@@ -2809,7 +2809,7 @@ QVariant sessionValue(const QByteArray &key)
return SessionManager::value(QString::fromUtf8(key)); return SessionManager::value(QString::fromUtf8(key));
} }
QTreeView *inspectorView() WatchTreeView *inspectorView()
{ {
return dd->m_inspectorView; return dd->m_inspectorView;
} }
......
...@@ -968,7 +968,7 @@ DebuggerToolTipManager::~DebuggerToolTipManager() ...@@ -968,7 +968,7 @@ DebuggerToolTipManager::~DebuggerToolTipManager()
m_instance = 0; m_instance = 0;
} }
void DebuggerToolTipManager::slotUpdateVisibleToolTips() void DebuggerToolTipManager::updateVisibleToolTips()
{ {
purgeClosedToolTips(); purgeClosedToolTips();
if (m_tooltips.isEmpty()) if (m_tooltips.isEmpty())
...@@ -1010,7 +1010,7 @@ void DebuggerToolTipManager::updateEngine(DebuggerEngine *engine) ...@@ -1010,7 +1010,7 @@ void DebuggerToolTipManager::updateEngine(DebuggerEngine *engine)
// all others release (arguable, this could be more precise?) // all others release (arguable, this could be more precise?)
foreach (DebuggerToolTipHolder *tooltip, m_tooltips) foreach (DebuggerToolTipHolder *tooltip, m_tooltips)
tooltip->updateTooltip(engine); tooltip->updateTooltip(engine);
slotUpdateVisibleToolTips(); // Move tooltip when stepping in same file. updateVisibleToolTips(); // Move tooltip when stepping in same file.
} }
void DebuggerToolTipManager::registerEngine(DebuggerEngine *engine) void DebuggerToolTipManager::registerEngine(DebuggerEngine *engine)
...@@ -1237,7 +1237,7 @@ static void slotEditorOpened(IEditor *e) ...@@ -1237,7 +1237,7 @@ static void slotEditorOpened(IEditor *e)
if (BaseTextEditor *textEditor = qobject_cast<BaseTextEditor *>(e)) { if (BaseTextEditor *textEditor = qobject_cast<BaseTextEditor *>(e)) {
TextEditorWidget *widget = textEditor->editorWidget(); TextEditorWidget *widget = textEditor->editorWidget();
QObject::connect(widget->verticalScrollBar(), &QScrollBar::valueChanged, QObject::connect(widget->verticalScrollBar(), &QScrollBar::valueChanged,
&DebuggerToolTipManager::slotUpdateVisibleToolTips); &DebuggerToolTipManager::updateVisibleToolTips);
QObject::connect(widget, &TextEditorWidget::tooltipOverrideRequested, QObject::connect(widget, &TextEditorWidget::tooltipOverrideRequested,
slotTooltipOverrideRequested); slotTooltipOverrideRequested);
} }
...@@ -1252,14 +1252,14 @@ void DebuggerToolTipManager::debugModeEntered() ...@@ -1252,14 +1252,14 @@ void DebuggerToolTipManager::debugModeEntered()
topLevel->installEventFilter(this); topLevel->installEventFilter(this);
EditorManager *em = EditorManager::instance(); EditorManager *em = EditorManager::instance();
connect(em, &EditorManager::currentEditorChanged, connect(em, &EditorManager::currentEditorChanged,
&DebuggerToolTipManager::slotUpdateVisibleToolTips); &DebuggerToolTipManager::updateVisibleToolTips);
connect(em, &EditorManager::editorOpened, slotEditorOpened); connect(em, &EditorManager::editorOpened, slotEditorOpened);
foreach (IEditor *e, DocumentModel::editorsForOpenedDocuments()) foreach (IEditor *e, DocumentModel::editorsForOpenedDocuments())
slotEditorOpened(e); slotEditorOpened(e);
// Position tooltips delayed once all the editor placeholder layouting is done. // Position tooltips delayed once all the editor placeholder layouting is done.
if (!m_tooltips.isEmpty()) if (!m_tooltips.isEmpty())
QTimer::singleShot(0, this, SLOT(slotUpdateVisibleToolTips())); QTimer::singleShot(0, this, &DebuggerToolTipManager::updateVisibleToolTips);
} }
} }
......
...@@ -94,9 +94,7 @@ public: ...@@ -94,9 +94,7 @@ public:
static void saveSessionData(); static void saveSessionData();
static void closeAllToolTips(); static void closeAllToolTips();
static void resetLocation(); static void resetLocation();
static void updateVisibleToolTips();
public slots:
static void slotUpdateVisibleToolTips();
}; };
} // namespace Internal } // namespace Internal
......
...@@ -262,8 +262,8 @@ void GdbCoreEngine::handleRoundTrip(const DebuggerResponse &response) ...@@ -262,8 +262,8 @@ void GdbCoreEngine::handleRoundTrip(const DebuggerResponse &response)
CHECK_STATE(InferiorUnrunnable); CHECK_STATE(InferiorUnrunnable);
Q_UNUSED(response); Q_UNUSED(response);
loadSymbolsForStack(); loadSymbolsForStack();
handleStop2(); handleStop3();
QTimer::singleShot(1000, this, SLOT(loadAllSymbols())); QTimer::singleShot(1000, this, &GdbEngine::loadAllSymbols);
} }
void GdbCoreEngine::interruptInferior() void GdbCoreEngine::interruptInferior()
......
...@@ -856,8 +856,8 @@ void GdbEngine::interruptInferior() ...@@ -856,8 +856,8 @@ void GdbEngine::interruptInferior()
QTC_ASSERT(!m_signalOperation, notifyInferiorStopFailed()); QTC_ASSERT(!m_signalOperation, notifyInferiorStopFailed());
m_signalOperation = runParameters().device->signalOperation(); m_signalOperation = runParameters().device->signalOperation();
QTC_ASSERT(m_signalOperation, notifyInferiorStopFailed()); QTC_ASSERT(m_signalOperation, notifyInferiorStopFailed());
connect(m_signalOperation.data(), SIGNAL(finished(QString)), connect(m_signalOperation.data(), &DeviceProcessSignalOperation::finished,
SLOT(handleInterruptDeviceInferior(QString))); this, &GdbEngine::handleInterruptDeviceInferior);
m_signalOperation->setDebuggerCommand(runParameters().debuggerCommand); m_signalOperation->setDebuggerCommand(runParameters().debuggerCommand);
m_signalOperation->interruptProcess(inferiorPid()); m_signalOperation->interruptProcess(inferiorPid());
...@@ -1637,10 +1637,10 @@ void GdbEngine::handleStop2(const GdbMi &data) ...@@ -1637,10 +1637,10 @@ void GdbEngine::handleStop2(const GdbMi &data)
// Let the event loop run before deciding whether to update the stack. // Let the event loop run before deciding whether to update the stack.
m_stackNeeded = true; // setTokenBarrier() might reset this. m_stackNeeded = true; // setTokenBarrier() might reset this.
QTimer::singleShot(0, this, SLOT(handleStop2())); QTimer::singleShot(0, this, &GdbEngine::handleStop3);
} }
void GdbEngine::handleStop2() void GdbEngine::handleStop3()
{ {
DebuggerCommand cmd("-thread-info", Discardable); DebuggerCommand cmd("-thread-info", Discardable);
cmd.callback = CB(handleThreadInfo); cmd.callback = CB(handleThreadInfo);
......
...@@ -123,6 +123,7 @@ protected: ////////// Gdb Process Management ////////// ...@@ -123,6 +123,7 @@ protected: ////////// Gdb Process Management //////////
private slots: private slots:
friend class GdbPlainEngine; friend class GdbPlainEngine;
friend class GdbCoreEngine;
void handleInterruptDeviceInferior(const QString &error); void handleInterruptDeviceInferior(const QString &error);
void handleGdbFinished(int exitCode, QProcess::ExitStatus exitStatus); void handleGdbFinished(int exitCode, QProcess::ExitStatus exitStatus);
void handleGdbError(QProcess::ProcessError error); void handleGdbError(QProcess::ProcessError error);
...@@ -170,7 +171,7 @@ private: ////////// Gdb Command Management ////////// ...@@ -170,7 +171,7 @@ private: ////////// Gdb Command Management //////////
void runCommand(const DebuggerCommand &command) override; void runCommand(const DebuggerCommand &command) override;
private: private:
Q_SLOT void commandTimeout(); void commandTimeout();
void setTokenBarrier(); void setTokenBarrier();
// Sets up an "unexpected result" for the following commeand. // Sets up an "unexpected result" for the following commeand.
...@@ -200,13 +201,13 @@ private: ...@@ -200,13 +201,13 @@ private:
private: ////////// Gdb Output, State & Capability Handling ////////// private: ////////// Gdb Output, State & Capability Handling //////////
protected: protected:
Q_SLOT void handleResponse(const QByteArray &buff); void handleResponse(const QByteArray &buff);
void handleAsyncOutput(const QByteArray &asyncClass, const GdbMi &result); void handleAsyncOutput(const QByteArray &asyncClass, const GdbMi &result);
void handleStopResponse(const GdbMi &data); void handleStopResponse(const GdbMi &data);
void handleResultRecord(DebuggerResponse *response); void handleResultRecord(DebuggerResponse *response);
void handleStop1(const GdbMi &data); void handleStop1(const GdbMi &data);
void handleStop2(const GdbMi &data); void handleStop2(const GdbMi &data);
Q_SLOT void handleStop2(); void handleStop3();
void resetCommandQueue(); void resetCommandQueue();
bool isSynchronous() const override { return true; } bool isSynchronous() const override { return true; }
...@@ -289,7 +290,7 @@ private: ////////// View & Data Stuff ////////// ...@@ -289,7 +290,7 @@ private: ////////// View & Data Stuff //////////
// //
protected: protected:
void loadSymbols(const QString &moduleName) override; void loadSymbols(const QString &moduleName) override;
Q_SLOT void loadAllSymbols() override; void loadAllSymbols() override;
void loadSymbolsForStack() override; void loadSymbolsForStack() override;
void requestModuleSymbols(const QString &moduleName) override; void requestModuleSymbols(const QString &moduleName) override;
void requestModuleSections(const QString &moduleName) override; void requestModuleSections(const QString &moduleName) override;
...@@ -309,7 +310,7 @@ private: ////////// View & Data Stuff ////////// ...@@ -309,7 +310,7 @@ private: ////////// View & Data Stuff //////////
// //
// Register specific stuff // Register specific stuff
// //
Q_SLOT void reloadRegisters() override; void reloadRegisters() override;
void setRegisterValue(const QByteArray &name, const QString &value) override; void setRegisterValue(const QByteArray &name, const QString &value) override;
void handleRegisterListNames(const DebuggerResponse &response); void handleRegisterListNames(const DebuggerResponse &response);
void handleRegisterListing(const DebuggerResponse &response); void handleRegisterListing(const DebuggerResponse &response);
...@@ -355,8 +356,8 @@ protected: ...@@ -355,8 +356,8 @@ protected:
void handleThreadInfo(const DebuggerResponse &response); void handleThreadInfo(const DebuggerResponse &response);
void handleThreadNames(const DebuggerResponse &response); void handleThreadNames(const DebuggerResponse &response);
DebuggerCommand stackCommand(int depth); DebuggerCommand stackCommand(int depth);
Q_SLOT void reloadStack(); void reloadStack();
Q_SLOT virtual void reloadFullStack() override; virtual void reloadFullStack() override;
virtual void loadAdditionalQmlStack() override; virtual void loadAdditionalQmlStack() override;
void handleQmlStackTrace(const DebuggerResponse &response); void handleQmlStackTrace(const DebuggerResponse &response);
int currentFrame() const; int currentFrame() const;
...@@ -386,7 +387,7 @@ protected: ...@@ -386,7 +387,7 @@ protected:
void handleThreadGroupCreated(const GdbMi &result); void handleThreadGroupCreated(const GdbMi &result);
void handleThreadGroupExited(const GdbMi &result); void handleThreadGroupExited(const GdbMi &result);
Q_SLOT void createFullBacktrace(); void createFullBacktrace();
void doUpdateLocals(const UpdateParameters &parameters) override; void doUpdateLocals(const UpdateParameters &parameters) override;
void handleFetchVariables(const DebuggerResponse &response); void handleFetchVariables(const DebuggerResponse &response);
......
...@@ -292,8 +292,8 @@ GdbOptionsPageWidget::GdbOptionsPageWidget() ...@@ -292,8 +292,8 @@ GdbOptionsPageWidget::GdbOptionsPageWidget()
//lineEditSelectedPluginBreakpointsPattern-> //lineEditSelectedPluginBreakpointsPattern->
// setEnabled(action(SelectedPluginBreakpoints)->value().toBool()); // setEnabled(action(SelectedPluginBreakpoints)->value().toBool());
//connect(radioButtonSelectedPluginBreakpoints, SIGNAL(toggled(bool)), //connect(radioButtonSelectedPluginBreakpoints, &QRadioButton::toggled,
// lineEditSelectedPluginBreakpointsPattern, SLOT(setEnabled(bool))); // lineEditSelectedPluginBreakpointsPattern, &QLineEdit::setEnabled);
} }
GdbOptionsPage::GdbOptionsPage() GdbOptionsPage::GdbOptionsPage()
......
...@@ -162,9 +162,9 @@ private: ...@@ -162,9 +162,9 @@ private:
QHash<int, DebuggerCommand> m_commandForToken; QHash<int, DebuggerCommand> m_commandForToken;
// Console handling. // Console handling.
Q_SLOT void stubError(const QString &msg); void stubError(const QString &msg);
Q_SLOT void stubExited(); void stubExited();
Q_SLOT void stubStarted(); void stubStarted();
bool prepareCommand(); bool prepareCommand();
Utils::ConsoleProcess m_stubProc; Utils::ConsoleProcess m_stubProc;
}; };
......
...@@ -414,14 +414,14 @@ LogWindow::LogWindow(QWidget *parent) ...@@ -414,14 +414,14 @@ LogWindow::LogWindow(QWidget *parent)
aggregate->add(m_inputText); aggregate->add(m_inputText);
aggregate->add(new Core::BaseTextFind(m_inputText)); aggregate->add(new Core::BaseTextFind(m_inputText));
connect(m_inputText, SIGNAL(statusMessageRequested(QString,int)), connect(m_inputText, &InputPane::statusMessageRequested,
SIGNAL(statusMessageRequested(QString,int))); this, &LogWindow::statusMessageRequested);
connect(m_inputText, SIGNAL(commandSelected(int)), connect(m_inputText, &InputPane::commandSelected,
m_combinedText, SLOT(gotoResult(int))); m_combinedText, &CombinedPane::gotoResult);
connect(m_commandEdit, &QLineEdit::returnPressed, connect(m_commandEdit, &QLineEdit::returnPressed,
this, &LogWindow::sendCommand); this, &LogWindow::sendCommand);
connect(m_inputText, SIGNAL(executeLineRequested()), connect(m_inputText, &InputPane::executeLineRequested,
SLOT(executeLine())); this, &LogWindow::executeLine);
connect(repeatButton, &QAbstractButton::clicked, connect(repeatButton, &QAbstractButton::clicked,
this, &LogWindow::repeatLastCommand); this, &LogWindow::repeatLastCommand);
......
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QCursor; class QCursor;
class QLabel;
class QLineEdit;
class QPlainTextEdit; class QPlainTextEdit;
QT_END_NAMESPACE QT_END_NAMESPACE
...@@ -42,7 +40,8 @@ namespace Utils { class FancyLineEdit; } ...@@ -42,7 +40,8 @@ namespace Utils { class FancyLineEdit; }
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
class DebuggerPane; class CombinedPane;
class InputPane;
class LogWindow : public QWidget class LogWindow : public QWidget
{ {
...@@ -79,8 +78,8 @@ signals: ...@@ -79,8 +78,8 @@ signals:
void statusMessageRequested(const QString &msg, int); void statusMessageRequested(const QString &msg, int);
private: private:
DebuggerPane *m_combinedText; // combined input/output CombinedPane *m_combinedText; // combined input/output
DebuggerPane *m_inputText; // scriptable input alone InputPane *m_inputText; // scriptable input alone
QTimer m_outputTimer; QTimer m_outputTimer;
QString m_queuedOutput; QString m_queuedOutput;
Utils::FancyLineEdit *m_commandEdit; Utils::FancyLineEdit *m_commandEdit;
......
...@@ -75,7 +75,7 @@ bool OutputCollector::listen() ...@@ -75,7 +75,7 @@ bool OutputCollector::listen()
if (m_server) if (m_server)
return m_server->isListening(); return m_server->isListening();
m_server = new QLocalServer(this); m_server = new QLocalServer(this);
connect(m_server, SIGNAL(newConnection()), SLOT(newConnectionAvailable())); connect(m_server, &QLocalServer::newConnection, this, &OutputCollector::newConnectionAvailable);
return m_server->listen(QString::fromLatin1("creator-%1-%2") return m_server->listen(QString::fromLatin1("creator-%1-%2")
.arg(QCoreApplication::applicationPid()) .arg(QCoreApplication::applicationPid())
.arg(rand())); .arg(rand()));
...@@ -111,7 +111,7 @@ bool OutputCollector::listen() ...@@ -111,7 +111,7 @@ bool OutputCollector::listen()
return false; return false;
} }
m_serverNotifier = new QSocketNotifier(m_serverFd, QSocketNotifier::Read, this); m_serverNotifier = new QSocketNotifier(m_serverFd, QSocketNotifier::Read, this);
connect(m_serverNotifier, SIGNAL(activated(int)), SLOT(bytesAvailable())); connect(m_serverNotifier, &QSocketNotifier::activated, this, &OutputCollector::bytesAvailable);
return true; return true;
#endif #endif
} }
...@@ -156,7 +156,7 @@ void OutputCollector::newConnectionAvailable() ...@@ -156,7 +156,7 @@ void OutputCollector::newConnectionAvailable()
if (m_socket) if (m_socket)
return; return;
m_socket = m_server->nextPendingConnection(); m_socket = m_server->nextPendingConnection();
connect(m_socket, SIGNAL(readyRead()), SLOT(bytesAvailable())); connect(m_socket, &QIODevice::readyRead, this, &OutputCollector::bytesAvailable);
} }
#endif #endif
......
...@@ -49,7 +49,7 @@ class OutputCollector : public QObject ...@@ -49,7 +49,7 @@ class OutputCollector : public QObject
public: public:
OutputCollector(QObject *parent = 0); OutputCollector(QObject *parent = 0);
~OutputCollector(); ~OutputCollector() override;
bool listen(); bool listen();
void shutdown(); void shutdown();
QString serverName() const; QString serverName() const;
...@@ -58,14 +58,10 @@ public: ...@@ -58,14 +58,10 @@ public:
signals: signals:
void byteDelivery(const QByteArray &data); void byteDelivery(const QByteArray &data);
private slots: private:
void bytesAvailable(); void bytesAvailable();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
void newConnectionAvailable(); void newConnectionAvailable();
#endif
private:
#ifdef Q_OS_WIN
QLocalServer *m_server; QLocalServer *m_server;
QLocalSocket *m_socket; QLocalSocket *m_socket;
#else #else
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#include <texteditor/texteditor.h> #include <texteditor/texteditor.h>
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <utils/basetreeview.h>