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

Locator: Clean up LocatorManager interface

Browse Source 
Change-Id: Ib401b6eca8c291526268ccea4d9e7e66f08abe1c
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2013-09-05 18:54:59 +02:00
parent 948a9a05c2
commit 9d1cc97126
3 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/locator/locatormanager.cpp
View File

@@ -33,27 +33,26 @@
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
using namespace Locator;
using namespace Locator::Internal;
namespace Locator {
LocatorManager *LocatorManager::m_instance = 0;
static Internal::LocatorWidget *m_locatorWidget = 0;
LocatorManager::LocatorManager(LocatorWidget *locatorWidget)
: QObject(locatorWidget),
m_locatorWidget(locatorWidget)
LocatorManager::LocatorManager(Internal::LocatorWidget *locatorWidget)
: QObject(locatorWidget)
{
m_instance = this;
m_locatorWidget = locatorWidget;
}
LocatorManager::~LocatorManager()
{
ExtensionSystem::PluginManager::removeObject(this);
m_instance = 0;
}
void LocatorManager::show(const QString &text,
int selectionStart, int selectionLength)
int selectionStart, int selectionLength)
{
QTC_ASSERT(m_locatorWidget, return);
m_locatorWidget->show(text, selectionStart, selectionLength);
}
} // namespace Internal

12
src/plugins/locator/locatormanager.h
View File

@@ -36,9 +36,7 @@
namespace Locator {
namespace Internal {
class LocatorWidget;
}
namespace Internal { class LocatorWidget; }
class LOCATOR_EXPORT LocatorManager : public QObject
{
@@ -48,13 +46,7 @@ public:
LocatorManager(Internal::LocatorWidget *locatorWidget);
~LocatorManager();
static LocatorManager *instance() { return m_instance; }
void show(const QString &text, int selectionStart = -1, int selectionLength = 0);
private:
Internal::LocatorWidget *m_locatorWidget;
static LocatorManager *m_instance;
static void show(const QString &text, int selectionStart = -1, int selectionLength = 0);
};
} // namespace Locator

4
src/plugins/texteditor/texteditoractionhandler.cpp
View File

@@ -448,13 +448,11 @@ void TextEditorActionHandler::updateCopyAction()
void TextEditorActionHandler::gotoAction()
{
Locator::LocatorManager *locatorManager = Locator::LocatorManager::instance();
QTC_ASSERT(locatorManager, return);
QString locatorString = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString();
locatorString += QLatin1Char(' ');
const int selectionStart = locatorString.size();
locatorString += tr("<line>:<column>");
locatorManager->show(locatorString, selectionStart, locatorString.size() - selectionStart);
Locator::LocatorManager::show(locatorString, selectionStart, locatorString.size() - selectionStart);
}
void TextEditorActionHandler::printAction()