From da4fcfbaf2b51ddb1205b72f8eec9e77e4925a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 16 Mar 2009 11:17:45 +0100
Subject: [PATCH] Fixed switching header/source with additional dots in the
filename
For example when a file was called test.something.cpp, it would search
for test.h instead of test.something.h.
---
src/plugins/cpptools/cpptoolsplugin.cpp | 2 +-
.../projectexplorer/dependenciespanel.cpp | 24 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 63a1808e3d7..3ca1db88099 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -231,7 +231,7 @@ QString CppToolsPlugin::correspondingHeaderOrSourceI(const QString &fileName) co
return QString();
const QDir absoluteDir = fi.absoluteDir();
- const QString baseName = fi.baseName();
+ const QString baseName = fi.completeBaseName();
const QStringList suffixes = matchingCandidateSuffixes(mimeDatase, type);
const QString privateHeaderSuffix = QLatin1String("_p");
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index 8d88fbfa548..d3eb7d810c5 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -43,9 +43,9 @@
namespace ProjectExplorer {
namespace Internal {
-///
-/// DependenciesModel
-///
+//
+// DependenciesModel
+//
class DependenciesModel : public QAbstractListModel
{
@@ -137,9 +137,9 @@ Qt::ItemFlags DependenciesModel::flags(const QModelIndex &index) const
return rc;
}
-///
-/// DependenciesWidget
-///
+//
+// DependenciesWidget
+//
class DependenciesWidget : public QWidget
{
@@ -165,9 +165,9 @@ DependenciesWidget::DependenciesWidget(SessionManager *session,
m_ui.dependenciesView->setHeaderHidden(true);
}
-///
-/// DependenciesPanel
-///
+//
+// DependenciesPanel
+//
DependenciesPanel::DependenciesPanel(SessionManager *session, Project *project)
: PropertiesPanel()
@@ -190,9 +190,9 @@ QWidget *DependenciesPanel::widget()
return m_widget;
}
-///
-/// DependenciesPanelFactory
-///
+//
+// DependenciesPanelFactory
+//
DependenciesPanelFactory::DependenciesPanelFactory(SessionManager *session)
: m_session(session)
--
GitLab