diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-15 15:55:52 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-24 15:11:21 +0100 |
commit | 3582edd64a865882923a7c1969b5ab4f226dbc02 (patch) | |
tree | d473286e66259000a3bd9126e2f9c7e017de569f | |
parent | 0304cc0edddde7e0c01d4764aeca3109c557faba (diff) | |
download | qt-creator-3582edd64a865882923a7c1969b5ab4f226dbc02.tar.gz |
Remove debug code
Change-Id: I43a8b56dceaf57014222f1940f5d5a0a608f43a0
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 36 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsbuildstep.h | 12 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbscleanstep.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbscleanstep.h | 4 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 17 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.h | 4 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanager.cpp | 5 |
8 files changed, 0 insertions, 86 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 11cbe32af7..ff7657ea71 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -45,10 +45,6 @@ #include <QInputDialog> -// <debug> -#include <QDebug> -// </debug> - static const char QBS_BC_ID[] = "Qbs.QbsBuildConfiguration"; static const char QBS_BUILD_DIRECTORY_KEY[] = "Qbs.BuildDirectory"; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index d274212c5a..c861b587a0 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -42,10 +42,6 @@ #include <projectexplorer/target.h> #include <utils/qtcassert.h> -// <debug> -#include <QDebug> -// </debug> - static const char QBS_CONFIG[] = "Qbs.Configuration"; static const char QBS_DRY_RUN[] = "Qbs.DryRun"; static const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing"; @@ -109,13 +105,6 @@ void QbsBuildStep::run(QFutureInterface<bool> &fi) { m_fi = &fi; - // <// <debug> - m_progressCount = 0; - m_describeCount = 0; - m_warningCount = 0; - m_resultCount = 0; - // </debug> - QbsProject *pro = static_cast<QbsProject *>(project()); qbs::BuildOptions options(m_qbsBuildOptions); @@ -128,8 +117,6 @@ void QbsBuildStep::run(QFutureInterface<bool> &fi) m_progressBase = 0; - m_timer.start(); - connect(m_job, SIGNAL(finished(bool,qbs::AbstractJob*)), this, SLOT(buildingDone(bool))); connect(m_job, SIGNAL(taskStarted(QString,int,qbs::AbstractJob*)), this, SLOT(handleTaskStarted(QString,int))); @@ -229,17 +216,6 @@ void QbsBuildStep::buildingDone(bool success) m_job->deleteLater(); m_job = 0; - // <debug> -// double elapsed = m_timer.elapsed() / 1000; -// if (elapsed == 0) -// elapsed = 0.001; - -// qDebug() << "QbsCounts:" << success << "in" << elapsed << "s\n" -// << " Progress:" << m_progressCount << "(" << (m_progressCount / elapsed) << "/s)\n" -// << " Warnings:" << m_warningCount << "(" << (m_warningCount / elapsed) << "/s)\n" -// << " Describe:" << m_describeCount << "(" << (m_describeCount / elapsed) << "/s)\n" -// << " Results :" << m_resultCount << "(" << (m_resultCount / elapsed) << "/s)\n"; - // </debug> emit finished(); } @@ -255,34 +231,22 @@ void QbsBuildStep::handleTaskStarted(const QString &desciption, int max) void QbsBuildStep::handleProgress(int value) { QTC_ASSERT(m_fi, return); - // <debug> - ++m_progressCount; - // </debug> m_fi->setProgressValue(m_progressBase + value); } void QbsBuildStep::handleWarningReport(const qbs::CodeLocation &location, const QString &message) { - // <debug> - ++m_warningCount; - // </debug> createTaskAndOutput(ProjectExplorer::Task::Warning, message, location.fileName, location.line); } void QbsBuildStep::handleCommandDescriptionReport(const QString &highlight, const QString &message) { - // <debug> - ++m_describeCount; - // </debug> Q_UNUSED(highlight); emit addOutput(message, NormalOutput); } void QbsBuildStep::handleProcessResultReport(const qbs::ProcessResult &result) { - // <debug> - ++m_resultCount; - // </debug> bool hasOutput = !result.stdOut.isEmpty() || !result.stdErr.isEmpty(); if (result.success && !hasOutput && !m_showCompilerOutput) diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index 59326d5cac..e32bcc8083 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -37,10 +37,6 @@ #include <api/jobs.h> // qbs #include <tools/buildoptions.h> // qbs -// <debug> -#include <QElapsedTimer> -// </debug> - namespace QbsProjectManager { namespace Internal { @@ -107,14 +103,6 @@ private: bool m_showCompilerOutput; ProjectExplorer::IOutputParser *m_parser; - // <debug> - QElapsedTimer m_timer; - quint64 m_progressCount; - quint64 m_warningCount; - quint64 m_describeCount; - quint64 m_resultCount; - // </debug> - friend class QbsBuildStepConfigWidget; }; diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index 9209d33c85..6d6342ea61 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp @@ -41,10 +41,6 @@ #include <projectexplorer/target.h> #include <utils/qtcassert.h> -// <debug> -#include <QDebug> -// </debug> - static const char QBS_CLEAN_ALL[] = "Qbs.CleanAll"; static const char QBS_DRY_RUN[] = "Qbs.DryRun"; static const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing"; diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index 71a6e0cf83..3aee0dfbea 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/src/plugins/qbsprojectmanager/qbscleanstep.h @@ -37,10 +37,6 @@ #include <api/jobs.h> // qbs #include <tools/buildoptions.h> // qbs -// <debug> -#include <QElapsedTimer> -// </debug> - namespace QbsProjectManager { namespace Internal { diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index b8ddc3c03c..1223a9039f 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -63,10 +63,6 @@ #include <QFileInfo> -// <debug> -#include <QDebug> -// </debug> - // -------------------------------------------------------------------- // Constants: // -------------------------------------------------------------------- @@ -170,11 +166,6 @@ QbsProject::QbsProject(QbsManager *manager, const QString &fileName) : connect(this, SIGNAL(addedTarget(ProjectExplorer::Target*)), this, SLOT(targetWasAdded(ProjectExplorer::Target*))); - // <debug> - m_reparseTimer.setInterval(200); - connect(&m_reparseTimer, SIGNAL(timeout()), this, SLOT(parseCurrentBuildConfiguration())); - // </debug> - updateDocuments(0); } @@ -386,19 +377,11 @@ void QbsProject::generateErrors(const qbs::Error &e) void QbsProject::parse(const QVariantMap &config, const QString &dir) { - // <debug> - // if (!m_reparseTimer.isActive()) m_reparseTimer.start(); - // </debug> - QTC_ASSERT(!dir.isNull(), return); prepareForParsing(); m_qbsBuildConfig = config; m_qbsBuildRoot = dir; - // <debug> - qDebug() << "QBS: Buildroot:" << m_qbsBuildRoot; - // </debug> - QTC_ASSERT(!m_qbsSetupProjectJob, return); m_qbsSetupProjectJob = qbs::Project::setupProject(m_fileName, m_qbsBuildConfig, m_qbsBuildRoot, 0); diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index 15354b31f2..c007d1a9b6 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -134,10 +134,6 @@ private: QFuture<void> m_codeModelFuture; QbsBuildConfiguration *m_currentBc; - - // <debug> - QTimer m_reparseTimer; - // </debug> }; } // namespace Internal diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index fc1cb270df..3e5d98ffaa 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -44,9 +44,7 @@ #include <QVariantMap> -// <debug> #include <logging/logger.h> // qbs -// </debug> // qbs settings structure: static const char PROFILE_LIST[] = "preferences/qtcreator/kit/"; @@ -82,9 +80,6 @@ QbsManager::QbsManager(Internal::QbsProjectManagerPlugin *plugin) : setObjectName("QbsProjectManager"); connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(pushKitsToQbs())); - // <debug> - qbs::Logger::instance().setLevel(qbs::LoggerError); - // </debug> qbs::Logger::instance().setLogSink(new Internal::QbsLogSink); } |