From 895207be18b84dfd3c13b609a83447d7cac39d26 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Mon, 14 Jul 2014 14:17:07 +0200 Subject: [PATCH] ProjectWindow: Remove unnecessary code Since projects without targets are special, this code apparently tracked if hasTarget() changed due to a kitUpdate. But we are already connected to targetRemoved() and checks whether a project has no target anymore. Thus this code is redundant and can be removed. Change-Id: I245887075509ed4c0ecda383de0227ccbc58b9af Reviewed-by: Tobias Hunger --- .../projectexplorer/projectexplorer.cpp | 2 -- src/plugins/projectexplorer/projectwindow.cpp | 29 ------------------- src/plugins/projectexplorer/projectwindow.h | 4 --- 3 files changed, 35 deletions(-) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 1c816d7837a..84f7da59963 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1253,8 +1253,6 @@ void ProjectExplorerPlugin::closeAllProjects() void ProjectExplorerPlugin::extensionsInitialized() { - d->m_proWindow->extensionsInitialized(); - // Register factories for all project managers QList projectManagers = ExtensionSystem::PluginManager::getObjects(); diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 38eafa4cb4d..ad53ba22d2c 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -92,11 +92,6 @@ ProjectWindow::~ProjectWindow() { } -void ProjectWindow::extensionsInitialized() -{ - connect(KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(handleKitChanges())); -} - void ProjectWindow::aboutToShutdown() { showProperties(-1, -1); // that's a bit stupid, but otherwise stuff is still @@ -122,27 +117,6 @@ void ProjectWindow::projectUpdated(Project *p) m_tabWidget->setCurrentIndex(index); } -void ProjectWindow::handleKitChanges() -{ - bool changed = false; - int index = m_tabWidget->currentIndex(); - QList projects = m_tabIndexToProject; - foreach (ProjectExplorer::Project *project, projects) { - if (m_hasTarget.value(project) != hasTarget(project)) { - changed = true; - if (deregisterProject(project)) - registerProject(project); - } - } - if (changed) - m_tabWidget->setCurrentIndex(index); -} - -bool ProjectWindow::hasTarget(ProjectExplorer::Project *project) -{ - return !project->targets().isEmpty(); -} - void ProjectWindow::registerProject(ProjectExplorer::Project *project) { if (!project || m_tabIndexToProject.contains(project)) @@ -160,9 +134,6 @@ void ProjectWindow::registerProject(ProjectExplorer::Project *project) QStringList subtabs; - bool projectHasTarget = hasTarget(project); - m_hasTarget.insert(project, projectHasTarget); - // Add the project specific pages QList factories = ExtensionSystem::PluginManager::getObjects(); Utils::sort(factories, &IProjectPanelFactory::prioritySort); diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h index 9253d3656d1..1933a6e4036 100644 --- a/src/plugins/projectexplorer/projectwindow.h +++ b/src/plugins/projectexplorer/projectwindow.h @@ -56,13 +56,11 @@ public: ~ProjectWindow(); void aboutToShutdown(); - void extensionsInitialized(); public slots: void projectUpdated(ProjectExplorer::Project *p); private slots: - void handleKitChanges(); void showProperties(int index, int subIndex); void registerProject(ProjectExplorer::Project*); bool deregisterProject(ProjectExplorer::Project*); @@ -70,14 +68,12 @@ private slots: void removedTarget(ProjectExplorer::Target*); private: - bool hasTarget(ProjectExplorer::Project *project); void removeCurrentWidget(); DoubleTabWidget *m_tabWidget; QStackedWidget *m_centralWidget; QWidget *m_currentWidget; QList m_tabIndexToProject; - QMap m_hasTarget; }; } // namespace Internal