From 7e1a94e59a8a3d10e4a46cfda4e906828fa27016 Mon Sep 17 00:00:00 2001 From: Kai Koehne <kai.koehne@digia.com> Date: Thu, 28 Mar 2013 12:01:40 +0100 Subject: [PATCH] Remove unneeded typedefs Fix gcc 4.8.0 warnings like warning: typedef 'AvahiSimplePollSetFuncPtr' locally defined but not used [-Wunused-local-typedefs] Change-Id: I5cc2917958dc8e6a4c31031577ecc66575b8d328 Reviewed-by: Eike Ziller <eike.ziller@digia.com> --- src/libs/zeroconf/avahiLib.cpp | 1 - src/plugins/coreplugin/dialogs/newdialog.cpp | 2 -- src/plugins/debugger/watchwindow.cpp | 1 - .../customwizard/customwizardscriptgenerator.cpp | 3 --- src/plugins/qmljseditor/qmljshighlighter.cpp | 2 -- 5 files changed, 9 deletions(-) diff --git a/src/libs/zeroconf/avahiLib.cpp b/src/libs/zeroconf/avahiLib.cpp index 5f79901e474..3d34d35222c 100644 --- a/src/libs/zeroconf/avahiLib.cpp +++ b/src/libs/zeroconf/avahiLib.cpp @@ -334,7 +334,6 @@ public: delete connection; return kDNSServiceErr_Unknown; } - typedef void (*AvahiSimplePollSetFuncPtr)(AvahiSimplePoll *s, AvahiPollFunc func, void *userdata); m_simplePollSetFunc(connection->simple_poll, &cAvahiPollFunction, mainConnection); /* Allocate a new client */ int error; diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index 260aa805250..860b71fb0b7 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -192,8 +192,6 @@ NewDialog::NewDialog(QWidget *parent) : m_ui(new Core::Internal::Ui::NewDialog), m_okButton(0) { - typedef QMap<QString, QStandardItem *> CategoryItemMap; - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_ui->setupUi(this); QPalette p = m_ui->frame->palette(); diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp index daf45c319c4..0f7ff6ae837 100644 --- a/src/plugins/debugger/watchwindow.cpp +++ b/src/plugins/debugger/watchwindow.cpp @@ -405,7 +405,6 @@ static void addVariableMemoryView(DebuggerEngine *engine, bool separateView, static void addStackLayoutMemoryView(DebuggerEngine *engine, bool separateView, const QAbstractItemModel *m, const QPoint &p, QWidget *parent) { - typedef QPair<quint64, QString> RegisterValueNamePair; QTC_ASSERT(engine && m, return); // Determine suitable address range from locals. diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp index 438a20d2045..eee76c3b2aa 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.cpp @@ -88,9 +88,6 @@ static bool const QMap<QString, QString> &fieldMap, QString *stdOut /* = 0 */, QString *errorMessage) { - typedef QSharedPointer<QTemporaryFile> TemporaryFilePtr; - typedef QList<TemporaryFilePtr> TemporaryFilePtrList; - QProcess process; const QString binary = script.front(); QStringList arguments; diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp index 31f4e3cbc42..840f5839aed 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.cpp +++ b/src/plugins/qmljseditor/qmljshighlighter.cpp @@ -296,8 +296,6 @@ int Highlighter::onBlockStart() void Highlighter::onBlockEnd(int state) { - typedef TextEditor::TextBlockUserData TextEditorBlockData; - setCurrentBlockState((m_braceDepth << 8) | state); TextEditor::BaseTextDocumentLayout::setParentheses(currentBlock(), m_currentBlockParentheses); TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), m_foldingIndent); -- GitLab