1 files changed, 11 insertions, 11 deletions

diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 61966928e..e3500f974 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -646,11 +646,11 @@ void KisView::setupActions()
 
     m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this),
                                TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask");
-    m_tqmaskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
+    m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotMaskFromSelection()), actionCollection(),
-                                      "tqmask_fromsel");
-    m_tqmaskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotMaskToSelection()), actionCollection(), "tqmask_tosel");
+                                      "mask_fromsel");
+    m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
+                               TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel");
     m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()),
                               actionCollection(), "apply_tqmask");
     m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this),
@@ -3185,7 +3185,7 @@ void KisView::connectCurrentImg()
         connect(m_image, TQT_SIGNAL(sigProfileChanged(KisProfile * )), TQT_SLOT(profileChanged(KisProfile * )));
 
         connect(m_image, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQT_SLOT(layersUpdated()));
-        connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(tqmaskUpdated()));
+        connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(maskUpdated()));
         connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), TQT_SLOT(layersUpdated()));
         connect(m_image, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated()));
         connect(m_image, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated()));
@@ -3198,7 +3198,7 @@ void KisView::connectCurrentImg()
         connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)),
                 TQT_SLOT(handlePartLayerAdded(KisLayerSP)));
 
-        tqmaskUpdated();
+        maskUpdated();
 #ifdef HAVE_GL
         if (m_OpenGLImageContext != 0) {
             connect(m_OpenGLImageContext, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotOpenGLImageUpdated(TQRect)));
@@ -3933,7 +3933,7 @@ void KisView::slotMaskFromSelection() {
     if (!layer)
         return;
 
-    KNamedCommand *cmd = layer->tqmaskFromSelectionCommand();
+    KNamedCommand *cmd = layer->maskFromSelectionCommand();
     cmd->execute();
     if (undoAdapter() && undoAdapter()->undo()) {
         undoAdapter()->addCommand(cmd);
@@ -3945,7 +3945,7 @@ void KisView::slotMaskToSelection() {
     if (!layer)
         return;
 
-    KNamedCommand *cmd = layer->tqmaskToSelectionCommand();
+    KNamedCommand *cmd = layer->maskToSelectionCommand();
     cmd->execute();
     if (undoAdapter() && undoAdapter()->undo()) {
         undoAdapter()->addCommand(cmd);
@@ -3992,7 +3992,7 @@ void KisView::slotShowMask() {
     layer->setRenderMask(m_showMask->isChecked());
 }
 
-void KisView::tqmaskUpdated() {
+void KisView::maskUpdated() {
     KisPaintLayer* layer = dynamic_cast<KisPaintLayer*>(currentImg()->activeLayer().data());
     if (!layer) {
         m_createMask->setEnabled(false);
@@ -4003,8 +4003,8 @@ void KisView::tqmaskUpdated() {
         return;
     }
     m_createMask->setEnabled(!layer->hasMask());
-    m_tqmaskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection?
-    m_tqmaskToSelection->setEnabled(layer->hasMask());
+    m_maskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection?
+    m_maskToSelection->setEnabled(layer->hasMask());
     m_applyMask->setEnabled(layer->hasMask());
     m_removeMask->setEnabled(layer->hasMask());