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

Debugger: De-slot

Browse Source 
Most Qt4 connects are gone.

Change-Id: Ie74cfb11fc4b4c531f9e22c95a4d18336e1c29e8
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-06-26 22:25:34 +03:00
committed by Orgad Shaneh
parent fc59423f2f
commit 7d31cb0e18
16 changed files with 42 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/analyzer/analyzerrunconfigwidget.h
View File

@@ -48,11 +48,10 @@ public:
QString displayName() const;
private slots:
private:
void chooseSettings(int setting);
void restoreGlobal();
private:
QWidget *m_configWidget;
ProjectExplorer::IRunConfigurationAspect *m_aspect;
ProjectExplorer::ISettingsAspect *m_config;

1
src/plugins/debugger/breakwindow.cpp
View File

@@ -96,7 +96,6 @@ public:
void setParameters(const BreakpointParameters &data);
BreakpointParameters parameters() const;
public slots:
void typeChanged(int index);
private:

3
src/plugins/debugger/cdb/cdbengine.h
View File

@@ -116,7 +116,7 @@ public:
static QString extensionLibraryName(bool is64Bit);
private slots:
private:
void readyReadStandardOut();
void readyReadStandardError();
void processError();
@@ -132,7 +132,6 @@ private slots:
void handleDoInterruptInferior(const QString &errorMessage);
private:
typedef QHash<BreakpointModelId, BreakpointResponse> PendingBreakPointMap;
typedef QPair<QString, QString> SourcePathMapping;
struct NormalizedSourceFileName // Struct for caching mapped/normalized source files.

2
src/plugins/debugger/console/consoleitemdelegate.h
View File

@@ -44,8 +44,6 @@ public:
void emitSizeHintChanged(const QModelIndex &index);
QColor drawBackground(QPainter *painter, const QRect &rect, const QModelIndex &index,
bool selected) const;
public slots:
void currentChanged(const QModelIndex &current, const QModelIndex &previous);
protected:

1
src/plugins/debugger/console/consoleitemmodel.h
View File

@@ -51,7 +51,6 @@ public:
int sizeOfFile(const QFont &font);
int sizeOfLineNumber(const QFont &font);
public slots:
void clear();
signals:

1
src/plugins/debugger/console/consoleproxymodel.h
View File

@@ -39,7 +39,6 @@ class ConsoleProxyModel : public QSortFilterProxyModel
public:
explicit ConsoleProxyModel(QObject *parent);
public slots:
void setShowLogs(bool show);
void setShowWarnings(bool show);
void setShowErrors(bool show);

1
src/plugins/debugger/console/consoleview.h
View File

@@ -39,7 +39,6 @@ class ConsoleView : public Utils::TreeView
public:
ConsoleView(ConsoleItemModel *model, QWidget *parent);
public slots:
void onScrollToBottom();
protected:

4
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -3076,9 +3076,7 @@ void showModuleSections(const QString &moduleName, const Sections &sections)
void DebuggerPluginPrivate::aboutToShutdown()
{
disconnect(SessionManager::instance(),
SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
this, 0);
disconnect(SessionManager::instance(), &SessionManager::startupProjectChanged, this, nullptr);
m_mainWindow->saveCurrentPerspective();
delete m_mainWindow;

3
src/plugins/debugger/debuggersourcepathmappingwidget.h
View File

@@ -62,7 +62,7 @@ public:
static SourcePathMap mergePlatformQtPath(const DebuggerRunParameters &sp,
const SourcePathMap &in);
private slots:
private:
void slotAdd();
void slotAddQt();
void slotRemove();
@@ -70,7 +70,6 @@ private slots:
void slotEditSourceFieldChanged();
void slotEditTargetFieldChanged();
private:
void resizeColumns();
void updateEnabled();
QString editSourceField() const;

3
src/plugins/debugger/gdb/gdbengine.h
View File

@@ -122,7 +122,7 @@ protected: ////////// Gdb Process Management //////////
// Make sure to clean up everything before emitting this signal.
void handleAdapterCrashed(const QString &msg);
private slots:
private:
friend class GdbPlainEngine;
friend class GdbCoreEngine;
void handleInterruptDeviceInferior(const QString &error);
@@ -132,7 +132,6 @@ private slots:
void readGdbStandardError();
void readDebuggeeOutput(const QByteArray &ba);
private:
QTextCodec *m_gdbOutputCodec;
QTextCodec::ConverterState m_gdbOutputCodecState;
QTextCodec *m_inferiorOutputCodec;

3
src/plugins/debugger/gdb/startgdbserverdialog.h
View File

@@ -45,7 +45,7 @@ public:
void run();
private slots:
private:
void handleRemoteError(const QString &errorMessage);
void portGathererError(const QString &errorMessage);
void portListReady();
@@ -56,7 +56,6 @@ private slots:
void handleProcessStarted();
void handleConnectionError();
private:
void attach(int port);
void logMessage(const QString &line);
StartGdbServerDialogPrivate *d;

1
src/plugins/debugger/logwindow.cpp
View File

@@ -310,7 +310,6 @@ public:
(void) new OutputHighlighter(this);
}
public slots:
void gotoResult(int i)
{
QString needle = QString::number(i) + QLatin1Char('^');

1
src/plugins/debugger/logwindow.h
View File

@@ -64,7 +64,6 @@ public:
static QChar charForChannel(int channel);
static LogChannel channelForChar(QChar c);
public slots:
void clearContents();
void sendCommand();
void executeLine();

3
src/plugins/debugger/qml/qmlengine.h
View File

@@ -55,7 +55,7 @@ public:
void expressionEvaluated(quint32 queryId, const QVariant &result);
private slots:
private:
void disconnected();
void errorMessageBoxFinished(int result);
void updateCurrentContext();
@@ -67,7 +67,6 @@ private slots:
void appStartupFailed(const QString &errorMessage);
void appendMessage(const QString &msg, Utils::OutputFormat);
private:
void notifyEngineRemoteServerRunning(const QString &, int pid) override;
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result) override;

1
src/plugins/debugger/registerwindow.h
View File

@@ -37,7 +37,6 @@ class RegisterTreeView : public Utils::BaseTreeView
public:
RegisterTreeView();
public slots:
void reloadRegisters();
private:

70
src/shared/modeltest/modeltest.cpp
View File

@@ -37,44 +37,44 @@ ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(pare
{
Q_ASSERT(model);
connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(columnsInserted(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(layoutAboutToBeChanged()), this, SLOT(runAllTests()));
connect(model, SIGNAL(layoutChanged()), this, SLOT(runAllTests()));
connect(model, SIGNAL(modelReset()), this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SLOT(runAllTests()));
connect(model, &QAbstractItemModel::columnsAboutToBeInserted,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::columnsAboutToBeRemoved,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::columnsInserted,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::columnsRemoved,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::dataChanged,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::headerDataChanged,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::layoutAboutToBeChanged, this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::layoutChanged, this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::modelReset, this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::rowsAboutToBeInserted,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::rowsAboutToBeRemoved,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::rowsInserted,
this, &ModelTest::runAllTests);
connect(model, &QAbstractItemModel::rowsRemoved,
this, &ModelTest::runAllTests);
// Special checks for inserting/removing
connect(model, SIGNAL(layoutAboutToBeChanged()),
this, SLOT(layoutAboutToBeChanged()));
connect(model, SIGNAL(layoutChanged()),
this, SLOT(layoutChanged()));
connect(model, &QAbstractItemModel::layoutAboutToBeChanged,
this, &ModelTest::layoutAboutToBeChanged);
connect(model, &QAbstractItemModel::layoutChanged,
this, &ModelTest::layoutChanged);
connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int)));
connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(rowsInserted(QModelIndex,int,int)));
connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SLOT(rowsRemoved(QModelIndex,int,int)));
connect(model, &QAbstractItemModel::rowsAboutToBeInserted,
this, &ModelTest::rowsAboutToBeInserted);
connect(model, &QAbstractItemModel::rowsAboutToBeRemoved,
this, &ModelTest::rowsAboutToBeRemoved);
connect(model, &QAbstractItemModel::rowsInserted,
this, &ModelTest::rowsInserted);
connect(model, &QAbstractItemModel::rowsRemoved,
this, &ModelTest::rowsRemoved);
runAllTests();
}