diff options
Diffstat (limited to 'krita/ui/kis_tool_manager.cc')
-rw-r--r-- | krita/ui/kis_tool_manager.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/krita/ui/kis_tool_manager.cc b/krita/ui/kis_tool_manager.cc index 66390740..21143472 100644 --- a/krita/ui/kis_tool_manager.cc +++ b/krita/ui/kis_tool_manager.cc @@ -32,8 +32,8 @@ #include "kis_input_device.h" -KisToolManager::KisToolManager(KisCanvasSubject * parent, KisCanvasController * controller) - : m_subject(parent), +KisToolManager::KisToolManager(KisCanvasSubject * tqparent, KisCanvasController * controller) + : m_subject(tqparent), m_controller(controller) { m_toolBox = 0; @@ -65,9 +65,9 @@ void KisToolManager::setUp(KoToolBox * toolbox, KoPaletteManager * paletteManage if (!m_dummyTool) m_dummyTool = KisToolDummyFactory().createTool(actionCollection); - QValueVector<KisInputDevice> inputDevices = KisInputDevice::inputDevices(); + TQValueVector<KisInputDevice> inputDevices = KisInputDevice::inputDevices(); - for (Q_UINT32 inputDevice = 0; inputDevice < inputDevices.count(); inputDevice++) { + for (TQ_UINT32 inputDevice = 0; inputDevice < inputDevices.count(); inputDevice++) { m_inputDeviceToolSetMap[inputDevices[inputDevice]] = KisToolRegistry::instance()->createTools(actionCollection, m_subject); } @@ -126,7 +126,7 @@ void KisToolManager::updateGUI() { Q_ASSERT(m_subject); if (m_subject == 0) { - // "Eek, no parent! + // "Eek, no tqparent! return; } @@ -194,7 +194,7 @@ void KisToolManager::setCurrentTool(KisTool *tool) if (!tool->optionWidget()) { tool->createOptionWidget(0); } - QWidget * w = tool->optionWidget(); + TQWidget * w = tool->optionWidget(); if (w) m_paletteManager->addWidget(w, krita::TOOL_OPTION_WIDGET, krita::CONTROL_PALETTE ); @@ -216,14 +216,14 @@ void KisToolManager::setCurrentTool(KisTool *tool) } -void KisToolManager::setCurrentTool( const QString & toolName ) +void KisToolManager::setCurrentTool( const TQString & toolName ) { setCurrentTool(findTool(toolName)); } KisTool * KisToolManager::currentTool() const { - InputDeviceToolMap::const_iterator it = m_inputDeviceToolMap.find(m_controller->currentInputDevice()); + InputDeviceToolMap::const_iterator it = m_inputDeviceToolMap.tqfind(m_controller->currentInputDevice()); if (it != m_inputDeviceToolMap.end()) { return (*it).second; @@ -235,14 +235,14 @@ KisTool * KisToolManager::currentTool() const void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDevice newDevice) { - InputDeviceToolSetMap::iterator vit = m_inputDeviceToolSetMap.find(oldDevice); + InputDeviceToolSetMap::iterator vit = m_inputDeviceToolSetMap.tqfind(oldDevice); if (vit != m_inputDeviceToolSetMap.end()) { vKisTool& oldTools = (*vit).second; for (vKisTool::iterator it = oldTools.begin(); it != oldTools.end(); ++it) { KisTool *tool = *it; KAction *toolAction = tool->action(); - toolAction->disconnect(SIGNAL(activated()), tool, SLOT(activate())); + toolAction->disconnect(TQT_SIGNAL(activated()), tool, TQT_SLOT(activate())); } } KisTool *oldTool = currentTool(); @@ -253,7 +253,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev } - vit = m_inputDeviceToolSetMap.find(newDevice); + vit = m_inputDeviceToolSetMap.tqfind(newDevice); Q_ASSERT(vit != m_inputDeviceToolSetMap.end()); @@ -262,7 +262,7 @@ void KisToolManager::setToolForInputDevice(KisInputDevice oldDevice, KisInputDev for (vKisTool::iterator it = tools.begin(); it != tools.end(); ++it) { KisTool *tool = *it; KAction *toolAction = tool->action(); - connect(toolAction, SIGNAL(activated()), tool, SLOT(activate())); + connect(toolAction, TQT_SIGNAL(activated()), tool, TQT_SLOT(activate())); } } @@ -274,7 +274,7 @@ void KisToolManager::activateCurrentTool() } } -KisTool * KisToolManager::findTool(const QString &toolName, KisInputDevice inputDevice) const +KisTool * KisToolManager::findTool(const TQString &toolName, KisInputDevice inputDevice) const { if (inputDevice == KisInputDevice::unknown()) { inputDevice = m_controller->currentInputDevice(); @@ -282,7 +282,7 @@ KisTool * KisToolManager::findTool(const QString &toolName, KisInputDevice input KisTool *tool = 0; - InputDeviceToolSetMap::const_iterator vit = m_inputDeviceToolSetMap.find(inputDevice); + InputDeviceToolSetMap::const_iterator vit = m_inputDeviceToolSetMap.tqfind(inputDevice); Q_ASSERT(vit != m_inputDeviceToolSetMap.end()); |