feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

cpptools: use static CppToolsPlugin functions instead of indirect access

Browse Source 
Saves a symbol.

Change-Id: Id949799852560a3e22da9c0a858b399c6ab3d6e1
Reviewed-on: http://codereview.qt.nokia.com/1295
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2011-07-06 17:34:45 +02:00
committed by hjk
parent de789e357b
commit b4b9ba7e2a
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -87,7 +87,7 @@ using namespace CPlusPlus;
enum { debug = 0 };
CppToolsPlugin *CppToolsPlugin::m_instance = 0;
static CppToolsPlugin *m_instance = 0;
CppToolsPlugin::CppToolsPlugin() :
m_modelManager(0),
@@ -310,9 +310,9 @@ QString CppToolsPlugin::correspondingHeaderOrSourceI(const QString &fileName) co
return QString();
}
QString CppToolsPlugin::correspondingHeaderOrSource(const QString &fileName) const
QString CppToolsPlugin::correspondingHeaderOrSource(const QString &fileName)
{
const QString rc = correspondingHeaderOrSourceI(fileName);
const QString rc = m_instance->correspondingHeaderOrSourceI(fileName);
if (debug)
qDebug() << Q_FUNC_INFO << fileName << rc;
return rc;

6
src/plugins/cpptools/cpptoolsplugin.h
View File

@@ -64,8 +64,6 @@ class CppToolsPlugin : public ExtensionSystem::IPlugin
Q_DISABLE_COPY(CppToolsPlugin)
Q_OBJECT
public:
static CppToolsPlugin *instance() { return m_instance; }
CppToolsPlugin();
~CppToolsPlugin();
@@ -73,7 +71,7 @@ public:
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
CppModelManager *cppModelManager() { return m_modelManager; }
QString correspondingHeaderOrSource(const QString &fileName) const;
static QString correspondingHeaderOrSource(const QString &fileName);
private slots:
void switchHeaderSource();
@@ -85,8 +83,6 @@ private:
CppModelManager *m_modelManager;
QSharedPointer<CppFileSettings> m_fileSettings;
CppToolsSettings *m_settings;
static CppToolsPlugin *m_instance;
};
} // namespace Internal

3
src/plugins/cpptools/insertionpointlocator.cpp
View File

@@ -330,8 +330,7 @@ QList<InsertionLocation> InsertionPointLocator::methodDefinition(
declaration->fileNameLength());
QString target = declFileName;
if (!isSourceFile(declFileName)) {
Internal::CppToolsPlugin *cpptools = Internal::CppToolsPlugin::instance();
QString candidate = cpptools->correspondingHeaderOrSource(declFileName);
QString candidate = Internal::CppToolsPlugin::correspondingHeaderOrSource(declFileName);
if (!candidate.isEmpty())
target = candidate;
}