From ad2fa94ff194d072fa3103dbfcf972f93c502983 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 31 Mar 2022 13:24:02 +0200 Subject: [PATCH] ProjectExplorer: Regularize namespace setup in appoutputpane.cpp Change-Id: If87fbed5ec054c6180c43ec8190b9993621daa56 Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/appoutputpane.cpp | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index c8ee2003def..d7bba925f13 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -66,11 +66,18 @@ static Q_LOGGING_CATEGORY(appOutputLog, "qtc.projectexplorer.appoutput", QtWarningMsg); -using namespace ProjectExplorer; -using namespace ProjectExplorer::Internal; +namespace ProjectExplorer { +namespace Internal { const char OPTIONS_PAGE_ID[] = "B.ProjectExplorer.AppOutputOptions"; - +const char SETTINGS_KEY[] = "ProjectExplorer/AppOutput/Zoom"; +const char C_APP_OUTPUT[] = "ProjectExplorer.ApplicationOutput"; +const char POP_UP_FOR_RUN_OUTPUT_KEY[] = "ProjectExplorer/Settings/ShowRunOutput"; +const char POP_UP_FOR_DEBUG_OUTPUT_KEY[] = "ProjectExplorer/Settings/ShowDebugOutput"; +const char CLEAN_OLD_OUTPUT_KEY[] = "ProjectExplorer/Settings/CleanOldAppOutput"; +const char MERGE_CHANNELS_KEY[] = "ProjectExplorer/Settings/MergeStdErrAndStdOut"; +const char WRAP_OUTPUT_KEY[] = "ProjectExplorer/Settings/WrapAppOutput"; +const char MAX_LINES_KEY[] = "ProjectExplorer/Settings/MaxAppOutputLines"; static QObject *debuggerPlugin() { @@ -84,20 +91,6 @@ static QString msgAttachDebuggerTooltip(const QString &handleDescription = QStri AppOutputPane::tr("Attach debugger to %1").arg(handleDescription); } -namespace { -const char SETTINGS_KEY[] = "ProjectExplorer/AppOutput/Zoom"; -const char C_APP_OUTPUT[] = "ProjectExplorer.ApplicationOutput"; -const char POP_UP_FOR_RUN_OUTPUT_KEY[] = "ProjectExplorer/Settings/ShowRunOutput"; -const char POP_UP_FOR_DEBUG_OUTPUT_KEY[] = "ProjectExplorer/Settings/ShowDebugOutput"; -const char CLEAN_OLD_OUTPUT_KEY[] = "ProjectExplorer/Settings/CleanOldAppOutput"; -const char MERGE_CHANNELS_KEY[] = "ProjectExplorer/Settings/MergeStdErrAndStdOut"; -const char WRAP_OUTPUT_KEY[] = "ProjectExplorer/Settings/WrapAppOutput"; -const char MAX_LINES_KEY[] = "ProjectExplorer/Settings/MaxAppOutputLines"; -} - -namespace ProjectExplorer { -namespace Internal { - class TabWidget : public QTabWidget { Q_OBJECT